[PATCH net-next 0/4] net: phy: remove calls to devm_hwmon_sanitize_name

[PATCH net-next 0/4] net: phy: remove calls to devm_hwmon_sanitize_name

[Heiner Kallweit]

Since c909e68f8127 ("hwmon: (core) Use device name as a fallback in
devm_hwmon_device_register_with_info") we can simply provide NULL
as name argument.

Heiner Kallweit (4):
  net: phy: realtek: remove call to devm_hwmon_sanitize_name
  net: phy: tja11xx: remove call to devm_hwmon_sanitize_name
  net: phy: mxl-gpy: remove call to devm_hwmon_sanitize_name
  net: phy: marvell-88q2xxx: remove call to devm_hwmon_sanitize_name

 drivers/net/phy/marvell-88q2xxx.c       |  8 +-------
 drivers/net/phy/mxl-gpy.c               |  8 +-------
 drivers/net/phy/nxp-tja11xx.c           | 19 +++++--------------
 drivers/net/phy/realtek/realtek_hwmon.c |  7 +------
 4 files changed, 8 insertions(+), 34 deletions(-)

-- 
2.48.1

[PATCH net-next 1/4] net: phy: realtek: remove call to devm_hwmon_sanitize_name

[Heiner Kallweit]

Since c909e68f8127 ("hwmon: (core) Use device name as a fallback in
devm_hwmon_device_register_with_info") we can simply provide NULL
as name argument.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
---
 drivers/net/phy/realtek/realtek_hwmon.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/drivers/net/phy/realtek/realtek_hwmon.c b/drivers/net/phy/realtek/realtek_hwmon.c
index 1ecb410bb..ac96e2d1e 100644
--- a/drivers/net/phy/realtek/realtek_hwmon.c
+++ b/drivers/net/phy/realtek/realtek_hwmon.c
@@ -63,16 +63,11 @@ static const struct hwmon_chip_info rtl822x_hwmon_chip_info = {
 int rtl822x_hwmon_init(struct phy_device *phydev)
 {
 	struct device *hwdev, *dev = &phydev->mdio.dev;
-	const char *name;
 
 	/* Ensure over-temp alarm is reset. */
 	phy_clear_bits_mmd(phydev, MDIO_MMD_VEND2, RTL822X_VND2_TSALRM, 3);
 
-	name = devm_hwmon_sanitize_name(dev, dev_name(dev));
-	if (IS_ERR(name))
-		return PTR_ERR(name);
-
-	hwdev = devm_hwmon_device_register_with_info(dev, name, phydev,
+	hwdev = devm_hwmon_device_register_with_info(dev, NULL, phydev,
 						     &rtl822x_hwmon_chip_info,
 						     NULL);
 	return PTR_ERR_OR_ZERO(hwdev);
-- 
2.48.1

[PATCH net-next 2/4] net: phy: tja11xx: remove call to devm_hwmon_sanitize_name

[Heiner Kallweit]

Since c909e68f8127 ("hwmon: (core) Use device name as a fallback in
devm_hwmon_device_register_with_info") we can simply provide NULL
as name argument.

Note that neither priv->hwmon_name nor priv->hwmon_dev are used
outside tja11xx_hwmon_register.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
---
 drivers/net/phy/nxp-tja11xx.c | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/drivers/net/phy/nxp-tja11xx.c b/drivers/net/phy/nxp-tja11xx.c
index 601094fe2..07e94a247 100644
--- a/drivers/net/phy/nxp-tja11xx.c
+++ b/drivers/net/phy/nxp-tja11xx.c
@@ -87,8 +87,6 @@
 #define TJA110X_RMII_MODE_REFCLK_IN       BIT(0)
 
 struct tja11xx_priv {
-	char		*hwmon_name;
-	struct device	*hwmon_dev;
 	struct phy_device *phydev;
 	struct work_struct phy_register_work;
 	u32 flags;
@@ -508,19 +506,12 @@ static const struct hwmon_chip_info tja11xx_hwmon_chip_info = {
 static int tja11xx_hwmon_register(struct phy_device *phydev,
 				  struct tja11xx_priv *priv)
 {
-	struct device *dev = &phydev->mdio.dev;
-
-	priv->hwmon_name = devm_hwmon_sanitize_name(dev, dev_name(dev));
-	if (IS_ERR(priv->hwmon_name))
-		return PTR_ERR(priv->hwmon_name);
-
-	priv->hwmon_dev =
-		devm_hwmon_device_register_with_info(dev, priv->hwmon_name,
-						     phydev,
-						     &tja11xx_hwmon_chip_info,
-						     NULL);
+	struct device *hdev, *dev = &phydev->mdio.dev;
 
-	return PTR_ERR_OR_ZERO(priv->hwmon_dev);
+	hdev = devm_hwmon_device_register_with_info(dev, NULL, phydev,
+						    &tja11xx_hwmon_chip_info,
+						    NULL);
+	return PTR_ERR_OR_ZERO(hdev);
 }
 
 static int tja11xx_parse_dt(struct phy_device *phydev)
-- 
2.48.1

[PATCH net-next 3/4] net: phy: mxl-gpy: remove call to devm_hwmon_sanitize_name

[Heiner Kallweit]

Since c909e68f8127 ("hwmon: (core) Use device name as a fallback in
devm_hwmon_device_register_with_info") we can simply provide NULL
as name argument.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
---
 drivers/net/phy/mxl-gpy.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/drivers/net/phy/mxl-gpy.c b/drivers/net/phy/mxl-gpy.c
index 94d9cb727..cc531cc92 100644
--- a/drivers/net/phy/mxl-gpy.c
+++ b/drivers/net/phy/mxl-gpy.c
@@ -225,14 +225,8 @@ static int gpy_hwmon_register(struct phy_device *phydev)
 {
 	struct device *dev = &phydev->mdio.dev;
 	struct device *hwmon_dev;
-	char *hwmon_name;
 
-	hwmon_name = devm_hwmon_sanitize_name(dev, dev_name(dev));
-	if (IS_ERR(hwmon_name))
-		return PTR_ERR(hwmon_name);
-
-	hwmon_dev = devm_hwmon_device_register_with_info(dev, hwmon_name,
-							 phydev,
+	hwmon_dev = devm_hwmon_device_register_with_info(dev, NULL, phydev,
 							 &gpy_hwmon_chip_info,
 							 NULL);
 
-- 
2.48.1

[PATCH net-next 4/4] net: phy: marvell-88q2xxx: remove call to devm_hwmon_sanitize_name

[Heiner Kallweit]

Since c909e68f8127 ("hwmon: (core) Use device name as a fallback in
devm_hwmon_device_register_with_info") we can simply provide NULL
as name argument.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
---
 drivers/net/phy/marvell-88q2xxx.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/drivers/net/phy/marvell-88q2xxx.c b/drivers/net/phy/marvell-88q2xxx.c
index 15c0f8adc..23e1f0521 100644
--- a/drivers/net/phy/marvell-88q2xxx.c
+++ b/drivers/net/phy/marvell-88q2xxx.c
@@ -765,16 +765,10 @@ static int mv88q2xxx_hwmon_probe(struct phy_device *phydev)
 	struct mv88q2xxx_priv *priv = phydev->priv;
 	struct device *dev = &phydev->mdio.dev;
 	struct device *hwmon;
-	char *hwmon_name;
 
 	priv->enable_temp = true;
-	hwmon_name = devm_hwmon_sanitize_name(dev, dev_name(dev));
-	if (IS_ERR(hwmon_name))
-		return PTR_ERR(hwmon_name);
 
-	hwmon = devm_hwmon_device_register_with_info(dev,
-						     hwmon_name,
-						     phydev,
+	hwmon = devm_hwmon_device_register_with_info(dev, NULL, phydev,
 						     &mv88q2xxx_hwmon_chip_info,
 						     NULL);
 
-- 
2.48.1

Re: [PATCH net-next 2/4] net: phy: tja11xx: remove call to devm_hwmon_sanitize_name

[Maxime Chevallier]

Hello Heiner,

On Thu, 13 Mar 2025 20:45:06 +0100
Heiner Kallweit <hkallweit1@gmail.com> wrote:

> Since c909e68f8127 ("hwmon: (core) Use device name as a fallback in
> devm_hwmon_device_register_with_info") we can simply provide NULL
> as name argument.
> 
> Note that neither priv->hwmon_name nor priv->hwmon_dev are used
> outside tja11xx_hwmon_register.
> 
> Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
> ---
>  drivers/net/phy/nxp-tja11xx.c | 19 +++++--------------
>  1 file changed, 5 insertions(+), 14 deletions(-)
> 
> diff --git a/drivers/net/phy/nxp-tja11xx.c b/drivers/net/phy/nxp-tja11xx.c
> index 601094fe2..07e94a247 100644
> --- a/drivers/net/phy/nxp-tja11xx.c
> +++ b/drivers/net/phy/nxp-tja11xx.c
> @@ -87,8 +87,6 @@
>  #define TJA110X_RMII_MODE_REFCLK_IN       BIT(0)
>  
>  struct tja11xx_priv {
> -	char		*hwmon_name;
> -	struct device	*hwmon_dev;
>  	struct phy_device *phydev;
>  	struct work_struct phy_register_work;
>  	u32 flags;
> @@ -508,19 +506,12 @@ static const struct hwmon_chip_info tja11xx_hwmon_chip_info = {
>  static int tja11xx_hwmon_register(struct phy_device *phydev,
>  				  struct tja11xx_priv *priv)
>  {
> -	struct device *dev = &phydev->mdio.dev;
> -
> -	priv->hwmon_name = devm_hwmon_sanitize_name(dev, dev_name(dev));
> -	if (IS_ERR(priv->hwmon_name))
> -		return PTR_ERR(priv->hwmon_name);
> -
> -	priv->hwmon_dev =
> -		devm_hwmon_device_register_with_info(dev, priv->hwmon_name,
> -						     phydev,
> -						     &tja11xx_hwmon_chip_info,
> -						     NULL);
> +	struct device *hdev, *dev = &phydev->mdio.dev;
>  
> -	return PTR_ERR_OR_ZERO(priv->hwmon_dev);
> +	hdev = devm_hwmon_device_register_with_info(dev, NULL, phydev,
> +						    &tja11xx_hwmon_chip_info,
> +						    NULL);
> +	return PTR_ERR_OR_ZERO(hdev);
>  }

The change look correct to me, however I think you can go one step
further and remove the field tja11xx_priv.hwmon_name as well as
hwmon_dev.

One could argue that we can even remove tja11xx_hwmon_register()
entirely

Thanks,

Maxime

Re: [PATCH net-next 2/4] net: phy: tja11xx: remove call to devm_hwmon_sanitize_name

[Heiner Kallweit]

On 14.03.2025 08:45, Maxime Chevallier wrote:
> Hello Heiner,
> 
> On Thu, 13 Mar 2025 20:45:06 +0100
> Heiner Kallweit <hkallweit1@gmail.com> wrote:
> 
>> Since c909e68f8127 ("hwmon: (core) Use device name as a fallback in
>> devm_hwmon_device_register_with_info") we can simply provide NULL
>> as name argument.
>>
>> Note that neither priv->hwmon_name nor priv->hwmon_dev are used
>> outside tja11xx_hwmon_register.
>>
>> Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
>> ---
>>  drivers/net/phy/nxp-tja11xx.c | 19 +++++--------------
>>  1 file changed, 5 insertions(+), 14 deletions(-)
>>
>> diff --git a/drivers/net/phy/nxp-tja11xx.c b/drivers/net/phy/nxp-tja11xx.c
>> index 601094fe2..07e94a247 100644
>> --- a/drivers/net/phy/nxp-tja11xx.c
>> +++ b/drivers/net/phy/nxp-tja11xx.c
>> @@ -87,8 +87,6 @@
>>  #define TJA110X_RMII_MODE_REFCLK_IN       BIT(0)
>>  
>>  struct tja11xx_priv {
>> -	char		*hwmon_name;
>> -	struct device	*hwmon_dev;
>>  	struct phy_device *phydev;
>>  	struct work_struct phy_register_work;
>>  	u32 flags;
>> @@ -508,19 +506,12 @@ static const struct hwmon_chip_info tja11xx_hwmon_chip_info = {
>>  static int tja11xx_hwmon_register(struct phy_device *phydev,
>>  				  struct tja11xx_priv *priv)
>>  {
>> -	struct device *dev = &phydev->mdio.dev;
>> -
>> -	priv->hwmon_name = devm_hwmon_sanitize_name(dev, dev_name(dev));
>> -	if (IS_ERR(priv->hwmon_name))
>> -		return PTR_ERR(priv->hwmon_name);
>> -
>> -	priv->hwmon_dev =
>> -		devm_hwmon_device_register_with_info(dev, priv->hwmon_name,
>> -						     phydev,
>> -						     &tja11xx_hwmon_chip_info,
>> -						     NULL);
>> +	struct device *hdev, *dev = &phydev->mdio.dev;
>>  
>> -	return PTR_ERR_OR_ZERO(priv->hwmon_dev);
>> +	hdev = devm_hwmon_device_register_with_info(dev, NULL, phydev,
>> +						    &tja11xx_hwmon_chip_info,
>> +						    NULL);
>> +	return PTR_ERR_OR_ZERO(hdev);
>>  }
> 
> The change look correct to me, however I think you can go one step
> further and remove the field tja11xx_priv.hwmon_name as well as
> hwmon_dev.
> 
This is part of the patch. Or what do you mean?

> One could argue that we can even remove tja11xx_hwmon_register()
> entirely
> 
It's called from two places, and we would have to duplicate some things
like IS_ERR(). I think it's ok to leave this function in.

> Thanks,
> 
> Maxime

Heiner

Re: [PATCH net-next 2/4] net: phy: tja11xx: remove call to devm_hwmon_sanitize_name

[Maxime Chevallier]

On Fri, 14 Mar 2025 12:26:33 +0100
Heiner Kallweit <hkallweit1@gmail.com> wrote:

> On 14.03.2025 08:45, Maxime Chevallier wrote:
> > Hello Heiner,
> > 
> > On Thu, 13 Mar 2025 20:45:06 +0100
> > Heiner Kallweit <hkallweit1@gmail.com> wrote:
> >   
> >> Since c909e68f8127 ("hwmon: (core) Use device name as a fallback in
> >> devm_hwmon_device_register_with_info") we can simply provide NULL
> >> as name argument.
> >>
> >> Note that neither priv->hwmon_name nor priv->hwmon_dev are used
> >> outside tja11xx_hwmon_register.
> >>
> >> Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
> >> ---
> >>  drivers/net/phy/nxp-tja11xx.c | 19 +++++--------------
> >>  1 file changed, 5 insertions(+), 14 deletions(-)
> >>
> >> diff --git a/drivers/net/phy/nxp-tja11xx.c b/drivers/net/phy/nxp-tja11xx.c
> >> index 601094fe2..07e94a247 100644
> >> --- a/drivers/net/phy/nxp-tja11xx.c
> >> +++ b/drivers/net/phy/nxp-tja11xx.c
> >> @@ -87,8 +87,6 @@
> >>  #define TJA110X_RMII_MODE_REFCLK_IN       BIT(0)
> >>  
> >>  struct tja11xx_priv {
> >> -	char		*hwmon_name;
> >> -	struct device	*hwmon_dev;
> >>  	struct phy_device *phydev;
> >>  	struct work_struct phy_register_work;
> >>  	u32 flags;
> >> @@ -508,19 +506,12 @@ static const struct hwmon_chip_info tja11xx_hwmon_chip_info = {
> >>  static int tja11xx_hwmon_register(struct phy_device *phydev,
> >>  				  struct tja11xx_priv *priv)
> >>  {
> >> -	struct device *dev = &phydev->mdio.dev;
> >> -
> >> -	priv->hwmon_name = devm_hwmon_sanitize_name(dev, dev_name(dev));
> >> -	if (IS_ERR(priv->hwmon_name))
> >> -		return PTR_ERR(priv->hwmon_name);
> >> -
> >> -	priv->hwmon_dev =
> >> -		devm_hwmon_device_register_with_info(dev, priv->hwmon_name,
> >> -						     phydev,
> >> -						     &tja11xx_hwmon_chip_info,
> >> -						     NULL);
> >> +	struct device *hdev, *dev = &phydev->mdio.dev;
> >>  
> >> -	return PTR_ERR_OR_ZERO(priv->hwmon_dev);
> >> +	hdev = devm_hwmon_device_register_with_info(dev, NULL, phydev,
> >> +						    &tja11xx_hwmon_chip_info,
> >> +						    NULL);
> >> +	return PTR_ERR_OR_ZERO(hdev);
> >>  }  
> > 
> > The change look correct to me, however I think you can go one step
> > further and remove the field tja11xx_priv.hwmon_name as well as
> > hwmon_dev.
> >   
> This is part of the patch. Or what do you mean?

Uh you are correct :( meh OK sory for the noise then, morning coffee
didn't go through entirely this morning it seems.

Maxime

Re: [PATCH net-next 0/4] net: phy: remove calls to devm_hwmon_sanitize_name

[Maxime Chevallier]

Hi Heiner,

On Thu, 13 Mar 2025 20:43:44 +0100
Heiner Kallweit <hkallweit1@gmail.com> wrote:

> Since c909e68f8127 ("hwmon: (core) Use device name as a fallback in
> devm_hwmon_device_register_with_info") we can simply provide NULL
> as name argument.
> 
> Heiner Kallweit (4):
>   net: phy: realtek: remove call to devm_hwmon_sanitize_name
>   net: phy: tja11xx: remove call to devm_hwmon_sanitize_name
>   net: phy: mxl-gpy: remove call to devm_hwmon_sanitize_name
>   net: phy: marvell-88q2xxx: remove call to devm_hwmon_sanitize_name
> 
>  drivers/net/phy/marvell-88q2xxx.c       |  8 +-------
>  drivers/net/phy/mxl-gpy.c               |  8 +-------
>  drivers/net/phy/nxp-tja11xx.c           | 19 +++++--------------
>  drivers/net/phy/realtek/realtek_hwmon.c |  7 +------
>  4 files changed, 8 insertions(+), 34 deletions(-)
> 

With more coffee in my system, I took a better look and it indeed looks
good to me.

Reviewed-by: Maxime Chevallier <maxime.chevallier@bootlin.com>

Sorry about the noisy comments,

Maxime

Re: [PATCH net-next 0/4] net: phy: remove calls to devm_hwmon_sanitize_name

[patchwork-bot+netdevbpf]

Hello:

This series was applied to netdev/net-next.git (main)
by Paolo Abeni <pabeni@redhat.com>:

On Thu, 13 Mar 2025 20:43:44 +0100 you wrote:
> Since c909e68f8127 ("hwmon: (core) Use device name as a fallback in
> devm_hwmon_device_register_with_info") we can simply provide NULL
> as name argument.
> 
> Heiner Kallweit (4):
>   net: phy: realtek: remove call to devm_hwmon_sanitize_name
>   net: phy: tja11xx: remove call to devm_hwmon_sanitize_name
>   net: phy: mxl-gpy: remove call to devm_hwmon_sanitize_name
>   net: phy: marvell-88q2xxx: remove call to devm_hwmon_sanitize_name
> 
> [...]

Here is the summary with links:
  - [net-next,1/4] net: phy: realtek: remove call to devm_hwmon_sanitize_name
    https://git.kernel.org/netdev/net-next/c/62e36b244135
  - [net-next,2/4] net: phy: tja11xx: remove call to devm_hwmon_sanitize_name
    https://git.kernel.org/netdev/net-next/c/91ee21962430
  - [net-next,3/4] net: phy: mxl-gpy: remove call to devm_hwmon_sanitize_name
    https://git.kernel.org/netdev/net-next/c/0426bd18af92
  - [net-next,4/4] net: phy: marvell-88q2xxx: remove call to devm_hwmon_sanitize_name
    https://git.kernel.org/netdev/net-next/c/345be5cd6e1d

You are awesome, thank you!
-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html