diff options
author | Florian Fainelli <f.fainelli@gmail.com> | 2016-08-18 18:30:16 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2016-08-19 20:15:36 -0400 |
commit | 731410b76e86f72ae18a3a4018cdc30258b10beb (patch) | |
tree | 259622b3b3c89d210bfe12ee9edd1a97ae4505a8 /drivers/net/dsa | |
parent | 4bd11675cf0d39e912b55e4d8fa91c85a82d946a (diff) |
net: dsa: bcm_sf2: Remove probing through old DSA binding
Remove our dsa_switch_driver::drv_probe callback to prevent probing
through the old DSA binding, not that this could happen anymore now that
we have moved the matching compatible string from net/dsa/dsa.c to
drivers/net/dsa/bcm_sf2.c, so this is essentially dead code.
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/dsa')
-rw-r--r-- | drivers/net/dsa/bcm_sf2.c | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/drivers/net/dsa/bcm_sf2.c b/drivers/net/dsa/bcm_sf2.c index 9f8e007b01d6..8e6fe13dbec3 100644 --- a/drivers/net/dsa/bcm_sf2.c +++ b/drivers/net/dsa/bcm_sf2.c | |||
@@ -136,20 +136,6 @@ static int bcm_sf2_sw_get_sset_count(struct dsa_switch *ds) | |||
136 | return BCM_SF2_STATS_SIZE; | 136 | return BCM_SF2_STATS_SIZE; |
137 | } | 137 | } |
138 | 138 | ||
139 | static const char *bcm_sf2_sw_drv_probe(struct device *dsa_dev, | ||
140 | struct device *host_dev, int sw_addr, | ||
141 | void **_priv) | ||
142 | { | ||
143 | struct bcm_sf2_priv *priv; | ||
144 | |||
145 | priv = devm_kzalloc(dsa_dev, sizeof(*priv), GFP_KERNEL); | ||
146 | if (!priv) | ||
147 | return NULL; | ||
148 | *_priv = priv; | ||
149 | |||
150 | return "Broadcom Starfighter 2"; | ||
151 | } | ||
152 | |||
153 | static void bcm_sf2_imp_vlan_setup(struct dsa_switch *ds, int cpu_port) | 139 | static void bcm_sf2_imp_vlan_setup(struct dsa_switch *ds, int cpu_port) |
154 | { | 140 | { |
155 | struct bcm_sf2_priv *priv = ds_to_priv(ds); | 141 | struct bcm_sf2_priv *priv = ds_to_priv(ds); |
@@ -1592,7 +1578,6 @@ static int bcm_sf2_sw_setup(struct dsa_switch *ds) | |||
1592 | 1578 | ||
1593 | static struct dsa_switch_driver bcm_sf2_switch_driver = { | 1579 | static struct dsa_switch_driver bcm_sf2_switch_driver = { |
1594 | .tag_protocol = DSA_TAG_PROTO_BRCM, | 1580 | .tag_protocol = DSA_TAG_PROTO_BRCM, |
1595 | .probe = bcm_sf2_sw_drv_probe, | ||
1596 | .setup = bcm_sf2_sw_setup, | 1581 | .setup = bcm_sf2_sw_setup, |
1597 | .set_addr = bcm_sf2_sw_set_addr, | 1582 | .set_addr = bcm_sf2_sw_set_addr, |
1598 | .get_phy_flags = bcm_sf2_sw_get_phy_flags, | 1583 | .get_phy_flags = bcm_sf2_sw_get_phy_flags, |