Przeglądaj źródła

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 <[email protected]>
Link: https://github.com/openwrt/openwrt/pull/21078
Signed-off-by: Robert Marko <[email protected]>
Mieczyslaw Nalewaj 4 miesięcy temu
rodzic
commit
7f97b2665c

+ 4 - 4
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);

+ 8 - 8
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);

+ 1 - 1
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);

+ 3 - 3
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);

+ 3 - 3
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);