summaryrefslogtreecommitdiff
path: root/include/net
diff options
context:
space:
mode:
authorAndrew Lunn <andrew@lunn.ch>2016-05-11 00:27:23 +0300
committerDavid S. Miller <davem@davemloft.net>2016-05-12 02:36:28 +0300
commitc33063d6a0d83a553faacf32f3cb834e63d8ecd7 (patch)
tree789e0ef5e0cea80f757419483c3275a0990e048a /include/net
parent52638f71fcff9386fe64c83a18a129b122333fdf (diff)
downloadlinux-c33063d6a0d83a553faacf32f3cb834e63d8ecd7.tar.xz
dsa: Remove master_dev from switch structure
The switch drivers only use the master_dev member for dev_info() messages. Now that the device is passed to the old style probe, and new style drivers are probed as true linux drivers, this is no longer needed. Signed-off-by: Andrew Lunn <andrew@lunn.ch> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net')
-rw-r--r--include/net/dsa.h7
1 files changed, 2 insertions, 5 deletions
diff --git a/include/net/dsa.h b/include/net/dsa.h
index ecb52e265cc3..f4c0bff8d9d6 100644
--- a/include/net/dsa.h
+++ b/include/net/dsa.h
@@ -120,6 +120,8 @@ struct dsa_switch_tree {
};
struct dsa_switch {
+ struct device *dev;
+
/*
* Parent switch tree, and switch index.
*/
@@ -142,11 +144,6 @@ struct dsa_switch {
*/
struct dsa_switch_driver *drv;
- /*
- * Reference to host device to use.
- */
- struct device *master_dev;
-
#ifdef CONFIG_NET_DSA_HWMON
/*
* Hardware monitoring information