[PATCH net-next] net: phy: change of_phy_leds() to fwnode_phy_leds()

[PATCH net-next] net: phy: change of_phy_leds() to fwnode_phy_leds()

[Jijie Shao]

Change of_phy_leds() to fwnode_phy_leds(), to support
of node, acpi node, and software node together.

Signed-off-by: Jijie Shao <shaojijie@huawei.com>
---
RFC -> V1:
  using fwnode_for_each_available_child_node_scoped(), suggested by Jonathan Cameron.
  RFC: https://lore.kernel.org/all/20251215125705.1567527-2-shaojijie@huawei.com/
---
 drivers/net/phy/phy_device.c | 37 +++++++++++++++++-------------------
 1 file changed, 17 insertions(+), 20 deletions(-)

diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
index 81984d4ebb7c..bb55caa5798f 100644
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -3208,8 +3208,8 @@ static void phy_leds_unregister(struct phy_device *phydev)
 	}
 }
 
-static int of_phy_led(struct phy_device *phydev,
-		      struct device_node *led)
+static int fwnode_phy_led(struct phy_device *phydev,
+			  struct fwnode_handle *led)
 {
 	struct device *dev = &phydev->mdio.dev;
 	struct led_init_data init_data = {};
@@ -3226,17 +3226,17 @@ static int of_phy_led(struct phy_device *phydev,
 	cdev = &phyled->led_cdev;
 	phyled->phydev = phydev;
 
-	err = of_property_read_u32(led, "reg", &index);
+	err = fwnode_property_read_u32(led, "reg", &index);
 	if (err)
 		return err;
 	if (index > U8_MAX)
 		return -EINVAL;
 
-	if (of_property_read_bool(led, "active-high"))
+	if (fwnode_property_read_bool(led, "active-high"))
 		set_bit(PHY_LED_ACTIVE_HIGH, &modes);
-	if (of_property_read_bool(led, "active-low"))
+	if (fwnode_property_read_bool(led, "active-low"))
 		set_bit(PHY_LED_ACTIVE_LOW, &modes);
-	if (of_property_read_bool(led, "inactive-high-impedance"))
+	if (fwnode_property_read_bool(led, "inactive-high-impedance"))
 		set_bit(PHY_LED_INACTIVE_HIGH_IMPEDANCE, &modes);
 
 	if (WARN_ON(modes & BIT(PHY_LED_ACTIVE_LOW) &&
@@ -3273,7 +3273,7 @@ static int of_phy_led(struct phy_device *phydev,
 #endif
 	cdev->max_brightness = 1;
 	init_data.devicename = dev_name(&phydev->mdio.dev);
-	init_data.fwnode = of_fwnode_handle(led);
+	init_data.fwnode = led;
 	init_data.devname_mandatory = true;
 
 	err = led_classdev_register_ext(dev, cdev, &init_data);
@@ -3285,19 +3285,16 @@ static int of_phy_led(struct phy_device *phydev,
 	return 0;
 }
 
-static int of_phy_leds(struct phy_device *phydev)
+static int fwnode_phy_leds(struct phy_device *phydev)
 {
-	struct device_node *node = phydev->mdio.dev.of_node;
-	struct device_node *leds;
+	struct fwnode_handle *fwnode = dev_fwnode(&phydev->mdio.dev);
+	struct fwnode_handle *leds, *led;
 	int err;
 
-	if (!IS_ENABLED(CONFIG_OF_MDIO))
-		return 0;
-
-	if (!node)
+	if (!fwnode)
 		return 0;
 
-	leds = of_get_child_by_name(node, "leds");
+	leds = fwnode_get_named_child_node(fwnode, "leds");
 	if (!leds)
 		return 0;
 
@@ -3311,17 +3308,17 @@ static int of_phy_leds(struct phy_device *phydev)
 		goto exit;
 	}
 
-	for_each_available_child_of_node_scoped(leds, led) {
-		err = of_phy_led(phydev, led);
+	fwnode_for_each_available_child_node_scoped(leds, led) {
+		err = fwnode_phy_led(phydev, led);
 		if (err) {
-			of_node_put(leds);
+			fwnode_handle_put(leds);
 			phy_leds_unregister(phydev);
 			return err;
 		}
 	}
 
 exit:
-	of_node_put(leds);
+	fwnode_handle_put(leds);
 	return 0;
 }
 
@@ -3516,7 +3513,7 @@ static int phy_probe(struct device *dev)
 	 * LEDs for them.
 	 */
 	if (IS_ENABLED(CONFIG_PHYLIB_LEDS) && !phy_driver_is_genphy(phydev))
-		err = of_phy_leds(phydev);
+		err = fwnode_phy_leds(phydev);
 
 out:
 	/* Re-assert the reset signal on error */
-- 
2.33.0

Re: [PATCH net-next] net: phy: change of_phy_leds() to fwnode_phy_leds()

[Andrew Lunn]

On Thu, Jan 08, 2026 at 03:34:05PM +0800, Jijie Shao wrote:
> Change of_phy_leds() to fwnode_phy_leds(), to support
> of node, acpi node, and software node together.
> 
> Signed-off-by: Jijie Shao <shaojijie@huawei.com>

I would prefer this is part of a patchset adding full support for PHY
leds via ACPI. The binding documentation needs updates to match the
code.

    Andrew

---
pw-bot: cr

Re: [PATCH net-next] net: phy: change of_phy_leds() to fwnode_phy_leds()

[kernel test robot]

Hi Jijie,

kernel test robot noticed the following build warnings:

[auto build test WARNING on net-next/main]

url:    https://github.com/intel-lab-lkp/linux/commits/Jijie-Shao/net-phy-change-of_phy_leds-to-fwnode_phy_leds/20260108-153742
base:   net-next/main
patch link:    https://lore.kernel.org/r/20260108073405.3036482-1-shaojijie%40huawei.com
patch subject: [PATCH net-next] net: phy: change of_phy_leds() to fwnode_phy_leds()
config: x86_64-kexec (https://download.01.org/0day-ci/archive/20260109/202601090427.Duo7dPR0-lkp@intel.com/config)
compiler: clang version 20.1.8 (https://github.com/llvm/llvm-project 87f0227cb60147a26a1eeb4fb06e3b505e9c7261)
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20260109/202601090427.Duo7dPR0-lkp@intel.com/reproduce)

If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202601090427.Duo7dPR0-lkp@intel.com/

All warnings (new ones prefixed by >>):

>> drivers/net/phy/phy_device.c:3291:31: warning: unused variable 'led' [-Wunused-variable]
    3291 |         struct fwnode_handle *leds, *led;
         |                                      ^~~
   1 warning generated.


vim +/led +3291 drivers/net/phy/phy_device.c

  3287	
  3288	static int fwnode_phy_leds(struct phy_device *phydev)
  3289	{
  3290		struct fwnode_handle *fwnode = dev_fwnode(&phydev->mdio.dev);
> 3291		struct fwnode_handle *leds, *led;
  3292		int err;
  3293	
  3294		if (!fwnode)
  3295			return 0;
  3296	
  3297		leds = fwnode_get_named_child_node(fwnode, "leds");
  3298		if (!leds)
  3299			return 0;
  3300	
  3301		/* Check if the PHY driver have at least an OP to
  3302		 * set the LEDs.
  3303		 */
  3304		if (!(phydev->drv->led_brightness_set ||
  3305		      phydev->drv->led_blink_set ||
  3306		      phydev->drv->led_hw_control_set)) {
  3307			phydev_dbg(phydev, "ignoring leds node defined with no PHY driver support\n");
  3308			goto exit;
  3309		}
  3310	
  3311		fwnode_for_each_available_child_node_scoped(leds, led) {
  3312			err = fwnode_phy_led(phydev, led);
  3313			if (err) {
  3314				fwnode_handle_put(leds);
  3315				phy_leds_unregister(phydev);
  3316				return err;
  3317			}
  3318		}
  3319	
  3320	exit:
  3321		fwnode_handle_put(leds);
  3322		return 0;
  3323	}
  3324	

-- 
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki

Re: [PATCH net-next] net: phy: change of_phy_leds() to fwnode_phy_leds()

[kernel test robot]

Hi Jijie,

kernel test robot noticed the following build warnings:

[auto build test WARNING on net-next/main]

url:    https://github.com/intel-lab-lkp/linux/commits/Jijie-Shao/net-phy-change-of_phy_leds-to-fwnode_phy_leds/20260108-153742
base:   net-next/main
patch link:    https://lore.kernel.org/r/20260108073405.3036482-1-shaojijie%40huawei.com
patch subject: [PATCH net-next] net: phy: change of_phy_leds() to fwnode_phy_leds()
config: sh-allmodconfig (https://download.01.org/0day-ci/archive/20260114/202601141349.H2uawAfe-lkp@intel.com/config)
compiler: sh4-linux-gcc (GCC) 15.2.0
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20260114/202601141349.H2uawAfe-lkp@intel.com/reproduce)

If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202601141349.H2uawAfe-lkp@intel.com/

All warnings (new ones prefixed by >>):

   drivers/net/phy/phy_device.c: In function 'fwnode_phy_leds':
>> drivers/net/phy/phy_device.c:3291:38: warning: unused variable 'led' [-Wunused-variable]
    3291 |         struct fwnode_handle *leds, *led;
         |                                      ^~~


vim +/led +3291 drivers/net/phy/phy_device.c

  3287	
  3288	static int fwnode_phy_leds(struct phy_device *phydev)
  3289	{
  3290		struct fwnode_handle *fwnode = dev_fwnode(&phydev->mdio.dev);
> 3291		struct fwnode_handle *leds, *led;
  3292		int err;
  3293	
  3294		if (!fwnode)
  3295			return 0;
  3296	
  3297		leds = fwnode_get_named_child_node(fwnode, "leds");
  3298		if (!leds)
  3299			return 0;
  3300	
  3301		/* Check if the PHY driver have at least an OP to
  3302		 * set the LEDs.
  3303		 */
  3304		if (!(phydev->drv->led_brightness_set ||
  3305		      phydev->drv->led_blink_set ||
  3306		      phydev->drv->led_hw_control_set)) {
  3307			phydev_dbg(phydev, "ignoring leds node defined with no PHY driver support\n");
  3308			goto exit;
  3309		}
  3310	
  3311		fwnode_for_each_available_child_node_scoped(leds, led) {
  3312			err = fwnode_phy_led(phydev, led);
  3313			if (err) {
  3314				fwnode_handle_put(leds);
  3315				phy_leds_unregister(phydev);
  3316				return err;
  3317			}
  3318		}
  3319	
  3320	exit:
  3321		fwnode_handle_put(leds);
  3322		return 0;
  3323	}
  3324	

-- 
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki