net: dsa: mv88e6060: Remove support for legacy probing

Now that the driver can be probed as an mdio device, remove the legacy
DSA platform device probing.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/dsa/Kconfig b/drivers/net/dsa/Kconfig
index 71bb3aebded4e46bb4d54e2aef2fc0951f1c8658..82560b7106816f8fc04986edea8e147250d185ea 100644 (file)
--- a/drivers/net/dsa/Kconfig
+++ b/drivers/net/dsa/Kconfig
@@ -41,7 +41,7 @@ config NET_DSA_MT7530
 
 config NET_DSA_MV88E6060
        tristate "Marvell 88E6060 ethernet switch chip support"
-       depends on NET_DSA && NET_DSA_LEGACY
+       depends on NET_DSA
        select NET_DSA_TAG_TRAILER
        ---help---
          This enables support for the Marvell 88E6060 ethernet switch

diff --git a/drivers/net/dsa/mv88e6060.c b/drivers/net/dsa/mv88e6060.c
index 93ed23c5b31f73e987f7ac8990840f4bf19ab46a..2a2489b5196d7c52dada2543ef1a62ea69abfbcf 100644 (file)
--- a/drivers/net/dsa/mv88e6060.c
+++ b/drivers/net/dsa/mv88e6060.c
@@ -48,27 +48,6 @@ static enum dsa_tag_protocol mv88e6060_get_tag_protocol(struct dsa_switch *ds,
        return DSA_TAG_PROTO_TRAILER;
 }
 
-static const char *mv88e6060_drv_probe(struct device *dsa_dev,
-                                      struct device *host_dev, int sw_addr,
-                                      void **_priv)
-{
-       struct mii_bus *bus = dsa_host_dev_to_mii_bus(host_dev);
-       struct mv88e6060_priv *priv;
-       const char *name;
-
-       name = mv88e6060_get_name(bus, sw_addr);
-       if (name) {
-               priv = devm_kzalloc(dsa_dev, sizeof(*priv), GFP_KERNEL);
-               if (!priv)
-                       return NULL;
-               *_priv = priv;
-               priv->bus = bus;
-               priv->sw_addr = sw_addr;
-       }
-
-       return name;
-}
-
 static int mv88e6060_switch_reset(struct mv88e6060_priv *priv)
 {
        int i;
@@ -266,16 +245,11 @@ mv88e6060_phy_write(struct dsa_switch *ds, int port, int regnum, u16 val)
 
 static const struct dsa_switch_ops mv88e6060_switch_ops = {
        .get_tag_protocol = mv88e6060_get_tag_protocol,
-       .probe          = mv88e6060_drv_probe,
        .setup          = mv88e6060_setup,
        .phy_read       = mv88e6060_phy_read,
        .phy_write      = mv88e6060_phy_write,
 };
 
-static struct dsa_switch_driver mv88e6060_switch_drv = {
-       .ops            = &mv88e6060_switch_ops,
-};
-
 static int mv88e6060_probe(struct mdio_device *mdiodev)
 {
        struct device *dev = &mdiodev->dev;
@@ -332,19 +306,7 @@ static struct mdio_driver mv88e6060_driver = {
        },
 };
 
-static int __init mv88e6060_init(void)
-{
-       register_switch_driver(&mv88e6060_switch_drv);
-       return mdio_driver_register(&mv88e6060_driver);
-}
-module_init(mv88e6060_init);
-
-static void __exit mv88e6060_cleanup(void)
-{
-       mdio_driver_unregister(&mv88e6060_driver);
-       unregister_switch_driver(&mv88e6060_switch_drv);
-}
-module_exit(mv88e6060_cleanup);
+mdio_module_driver(mv88e6060_driver);
 
 MODULE_AUTHOR("Lennert Buytenhek <buytenh@wantstofly.org>");
 MODULE_DESCRIPTION("Driver for Marvell 88E6060 ethernet switch chip");