generic: net: phy: adapt to kernel 6.18

 - change phy_driver_register and phy_driver_unregister function calls
   to phy_drivers_register and phy_drivers_unregister for compatibility
   with kernel 6.18
 - replace PHY_ANY_ID with "MATCH ANY PHY"

Signed-off-by: Mieczyslaw Nalewaj <namiltd@yahoo.com>
Link: https://github.com/openwrt/openwrt/pull/21078
Signed-off-by: Robert Marko <robimarko@gmail.com>

diff --git a/target/linux/generic/files/drivers/net/phy/adm6996.c b/target/linux/generic/files/drivers/net/phy/adm6996.c
index 367dbbb970c388e1cf2b824185ad746833aaa38a..7394cb6e0c804866aa3c094a2ffa5c2172761eba 100644 (file)
--- a/target/linux/generic/files/drivers/net/phy/adm6996.c
+++ b/target/linux/generic/files/drivers/net/phy/adm6996.c
@@ -1219,14 +1219,14 @@ static int __init adm6996_init(void)
 {
        int err;
 
-       phy_register_fixup_for_id(PHY_ANY_ID, adm6996_fixup);
-       err = phy_driver_register(&adm6996_phy_driver, THIS_MODULE);
+       phy_register_fixup_for_id("MATCH ANY PHY", adm6996_fixup);
+       err = phy_drivers_register(&adm6996_phy_driver, 1, THIS_MODULE);
        if (err)
                return err;
 
        err = platform_driver_register(&adm6996_gpio_driver);
        if (err)
-               phy_driver_unregister(&adm6996_phy_driver);
+               phy_drivers_unregister(&adm6996_phy_driver, 1);
 
        return err;
 }
@@ -1234,7 +1234,7 @@ static int __init adm6996_init(void)
 static void __exit adm6996_exit(void)
 {
        platform_driver_unregister(&adm6996_gpio_driver);
-       phy_driver_unregister(&adm6996_phy_driver);
+       phy_drivers_unregister(&adm6996_phy_driver, 1);
 }
 
 module_init(adm6996_init);

diff --git a/target/linux/generic/files/drivers/net/phy/b53/b53_mdio.c b/target/linux/generic/files/drivers/net/phy/b53/b53_mdio.c
index fdcebc703ff4cfb0f46528891e76f3eb80726156..ad3f3083211928bd2cc630aee8b19ccc992302e0 100644 (file)
--- a/target/linux/generic/files/drivers/net/phy/b53/b53_mdio.c
+++ b/target/linux/generic/files/drivers/net/phy/b53/b53_mdio.c
@@ -404,29 +404,29 @@ static int __init b53_phy_driver_register(void)
 {
        int ret;
 
-       ret = phy_driver_register(&b53_phy_driver_id1, THIS_MODULE);
+       ret = phy_drivers_register(&b53_phy_driver_id1, 1, THIS_MODULE);
        if (ret)
                return ret;
 
-       ret = phy_driver_register(&b53_phy_driver_id2, THIS_MODULE);
+       ret = phy_drivers_register(&b53_phy_driver_id2, 1, THIS_MODULE);
        if (ret)
                goto err1;
 
-       ret = phy_driver_register(&b53_phy_driver_id3, THIS_MODULE);
+       ret = phy_drivers_register(&b53_phy_driver_id3, 1, THIS_MODULE);
        if (!ret)
                return 0;
 
-       phy_driver_unregister(&b53_phy_driver_id2);
+       phy_drivers_unregister(&b53_phy_driver_id2, 1);
 err1:
-       phy_driver_unregister(&b53_phy_driver_id1);
+       phy_drivers_unregister(&b53_phy_driver_id1, 1);
        return ret;
 }
 
 static void __exit b53_phy_driver_unregister(void)
 {
-       phy_driver_unregister(&b53_phy_driver_id3);
-       phy_driver_unregister(&b53_phy_driver_id2);
-       phy_driver_unregister(&b53_phy_driver_id1);
+       phy_drivers_unregister(&b53_phy_driver_id3, 1);
+       phy_drivers_unregister(&b53_phy_driver_id2, 1);
+       phy_drivers_unregister(&b53_phy_driver_id1, 1);
 }
 
 module_init(b53_phy_driver_register);

diff --git a/target/linux/generic/files/drivers/net/phy/b53/b53_phy_fixup.c b/target/linux/generic/files/drivers/net/phy/b53/b53_phy_fixup.c
index 5a415071b8f775f58512db7f9b2fa69206bb2b6b..3059d3964d1ef500a82061c6c7ad64ede40e54e2 100644 (file)
--- a/target/linux/generic/files/drivers/net/phy/b53/b53_phy_fixup.c
+++ b/target/linux/generic/files/drivers/net/phy/b53/b53_phy_fixup.c
@@ -49,7 +49,7 @@ static int b53_phy_fixup(struct phy_device *dev)
 
 static int __init b53_phy_fixup_register(void)
 {
-       return phy_register_fixup_for_id(PHY_ANY_ID, b53_phy_fixup);
+       return phy_register_fixup_for_id("MATCH ANY PHY", b53_phy_fixup);
 }
 
 subsys_initcall(b53_phy_fixup_register);

diff --git a/target/linux/generic/files/drivers/net/phy/psb6970.c b/target/linux/generic/files/drivers/net/phy/psb6970.c
index e8b1b06f636532efaa452db5b95366b63af679b9..97af7843946af792bbfc0ceaa423fe836376c5bc 100644 (file)
--- a/target/linux/generic/files/drivers/net/phy/psb6970.c
+++ b/target/linux/generic/files/drivers/net/phy/psb6970.c
@@ -425,15 +425,15 @@ static struct phy_driver psb6970_driver = {
 
 static int __init psb6970_init(void)
 {
-       phy_register_fixup_for_id(PHY_ANY_ID, psb6970_fixup);
-       return phy_driver_register(&psb6970_driver, THIS_MODULE);
+       phy_register_fixup_for_id("MATCH ANY PHY", psb6970_fixup);
+       return phy_drivers_register(&psb6970_driver, 1, THIS_MODULE);
 }
 
 module_init(psb6970_init);
 
 static void __exit psb6970_exit(void)
 {
-       phy_driver_unregister(&psb6970_driver);
+       phy_drivers_unregister(&psb6970_driver, 1);
 }
 
 module_exit(psb6970_exit);

diff --git a/target/linux/generic/files/drivers/net/phy/rtl8306.c b/target/linux/generic/files/drivers/net/phy/rtl8306.c
index 9bd1735f67b78862b7088390a20dee3da300881c..a4b26642e269c0b1f5a523b4d78437a2672f8e59 100644 (file)
--- a/target/linux/generic/files/drivers/net/phy/rtl8306.c
+++ b/target/linux/generic/files/drivers/net/phy/rtl8306.c
@@ -1047,14 +1047,14 @@ static struct phy_driver rtl8306_driver = {
 static int __init
 rtl_init(void)
 {
-       phy_register_fixup_for_id(PHY_ANY_ID, rtl8306_fixup);
-       return phy_driver_register(&rtl8306_driver, THIS_MODULE);
+       phy_register_fixup_for_id("MATCH ANY PHY", rtl8306_fixup);
+       return phy_drivers_register(&rtl8306_driver, 1, THIS_MODULE);
 }
 
 static void __exit
 rtl_exit(void)
 {
-       phy_driver_unregister(&rtl8306_driver);
+       phy_drivers_unregister(&rtl8306_driver, 1);
 }
 
 module_init(rtl_init);