net: phy: replace phy_drivers_register calls

Replace module init/exit which only calls phy_drivers_register with
module_phy_driver macro.

Tested using Micrel driver, and otherwise compile-tested only.

Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/phy/amd-xgbe-phy.c b/drivers/net/phy/amd-xgbe-phy.c
index 37b9f3f..903dc3d 100644 (file)
--- a/drivers/net/phy/amd-xgbe-phy.c
+++ b/drivers/net/phy/amd-xgbe-phy.c
@@ -1468,20 +1468,7 @@ static struct phy_driver amd_xgbe_phy_driver[] = {
        },
 };
 
-static int __init amd_xgbe_phy_init(void)
-{
-       return phy_drivers_register(amd_xgbe_phy_driver,
-                                   ARRAY_SIZE(amd_xgbe_phy_driver));
-}
-
-static void __exit amd_xgbe_phy_exit(void)
-{
-       phy_drivers_unregister(amd_xgbe_phy_driver,
-                              ARRAY_SIZE(amd_xgbe_phy_driver));
-}
-
-module_init(amd_xgbe_phy_init);
-module_exit(amd_xgbe_phy_exit);
+module_phy_driver(amd_xgbe_phy_driver);
 
 static struct mdio_device_id __maybe_unused amd_xgbe_phy_ids[] = {
        { XGBE_PHY_ID, XGBE_PHY_MASK },

diff --git a/drivers/net/phy/at803x.c b/drivers/net/phy/at803x.c
index fdc1b41..f80e19a 100644 (file)
--- a/drivers/net/phy/at803x.c
+++ b/drivers/net/phy/at803x.c
@@ -352,19 +352,7 @@ static struct phy_driver at803x_driver[] = {
        },
 } };
 
-static int __init atheros_init(void)
-{
-       return phy_drivers_register(at803x_driver,
-                                   ARRAY_SIZE(at803x_driver));
-}
-
-static void __exit atheros_exit(void)
-{
-       phy_drivers_unregister(at803x_driver, ARRAY_SIZE(at803x_driver));
-}
-
-module_init(atheros_init);
-module_exit(atheros_exit);
+module_phy_driver(at803x_driver);
 
 static struct mdio_device_id __maybe_unused atheros_tbl[] = {
        { ATH8030_PHY_ID, 0xffffffef },

diff --cc drivers/net/phy/bcm63xx.c
Simple merge

diff --cc drivers/net/phy/bcm7xxx.c
Simple merge

diff --cc drivers/net/phy/bcm87xx.c
Simple merge

diff --cc drivers/net/phy/broadcom.c
Simple merge

diff --cc drivers/net/phy/cicada.c
Simple merge

diff --cc drivers/net/phy/davicom.c
Simple merge

diff --cc drivers/net/phy/icplus.c
Simple merge

diff --cc drivers/net/phy/lxt.c
Simple merge

diff --cc drivers/net/phy/marvell.c
Simple merge

diff --cc drivers/net/phy/micrel.c
Simple merge

diff --cc drivers/net/phy/realtek.c
Simple merge

diff --cc drivers/net/phy/smsc.c
Simple merge

diff --cc drivers/net/phy/ste10Xp.c
Simple merge

diff --cc drivers/net/phy/vitesse.c
Simple merge