2022-03-29 23:26:49

by Michael Walle

Subject: [PATCH v2 3/5] net: sfp: use hwmon_sanitize_name()

Instead of open-coding the bad characters replacement in the hwmon name,
use the new hwmon_sanitize_name().

Signed-off-by: Michael Walle <[email protected]>
---
drivers/net/phy/sfp.c | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/drivers/net/phy/sfp.c b/drivers/net/phy/sfp.c
index 4dfb79807823..0d5dba30444d 100644
--- a/drivers/net/phy/sfp.c
+++ b/drivers/net/phy/sfp.c
@@ -1289,7 +1289,7 @@ static const struct hwmon_chip_info sfp_hwmon_chip_info = {
static void sfp_hwmon_probe(struct work_struct *work)
{
struct sfp *sfp = container_of(work, struct sfp, hwmon_probe.work);
- int err, i;
+ int err;

/* hwmon interface needs to access 16bit registers in atomic way to
* guarantee coherency of the diagnostic monitoring data. If it is not
@@ -1317,16 +1317,12 @@ static void sfp_hwmon_probe(struct work_struct *work)
return;
}

- sfp->hwmon_name = kstrdup(dev_name(sfp->dev), GFP_KERNEL);
+ sfp->hwmon_name = hwmon_sanitize_name(dev_name(sfp->dev));
if (!sfp->hwmon_name) {
dev_err(sfp->dev, "out of memory for hwmon name\n");
return;
}

- for (i = 0; sfp->hwmon_name[i]; i++)
- if (hwmon_is_bad_char(sfp->hwmon_name[i]))
- sfp->hwmon_name[i] = '_';
-
sfp->hwmon_dev = hwmon_device_register_with_info(sfp->dev,
sfp->hwmon_name, sfp,
&sfp_hwmon_chip_info,
--
2.30.2

2022-03-31 03:31:17

by Russell King (Oracle)

Subject: Re: [PATCH v2 3/5] net: sfp: use hwmon_sanitize_name()

On Tue, Mar 29, 2022 at 06:07:28PM +0200, Michael Walle wrote:
> Instead of open-coding the bad characters replacement in the hwmon name,
> use the new hwmon_sanitize_name().
>
> Signed-off-by: Michael Walle <[email protected]>

Assuming hwmon_sanitize_name() gets settled, then:

Acked-by: Russell King (Oracle) <[email protected]>

> ---
> drivers/net/phy/sfp.c | 8 ++------
> 1 file changed, 2 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/net/phy/sfp.c b/drivers/net/phy/sfp.c
> index 4dfb79807823..0d5dba30444d 100644
> --- a/drivers/net/phy/sfp.c
> +++ b/drivers/net/phy/sfp.c
> @@ -1289,7 +1289,7 @@ static const struct hwmon_chip_info sfp_hwmon_chip_info = {
> static void sfp_hwmon_probe(struct work_struct *work)
> {
> struct sfp *sfp = container_of(work, struct sfp, hwmon_probe.work);
> - int err, i;
> + int err;
>
> /* hwmon interface needs to access 16bit registers in atomic way to
> * guarantee coherency of the diagnostic monitoring data. If it is not
> @@ -1317,16 +1317,12 @@ static void sfp_hwmon_probe(struct work_struct *work)
> return;
> }
>
> - sfp->hwmon_name = kstrdup(dev_name(sfp->dev), GFP_KERNEL);
> + sfp->hwmon_name = hwmon_sanitize_name(dev_name(sfp->dev));
> if (!sfp->hwmon_name) {
> dev_err(sfp->dev, "out of memory for hwmon name\n");
> return;
> }
>
> - for (i = 0; sfp->hwmon_name[i]; i++)
> - if (hwmon_is_bad_char(sfp->hwmon_name[i]))
> - sfp->hwmon_name[i] = '_';
> -
> sfp->hwmon_dev = hwmon_device_register_with_info(sfp->dev,
> sfp->hwmon_name, sfp,
> &sfp_hwmon_chip_info,
> --
> 2.30.2
>
>

--
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/
FTTP is here! 40Mbps down 10Mbps up. Decent connectivity at last!

2022-04-01 18:34:06

by Russell King (Oracle)

Subject: Re: [PATCH v2 3/5] net: sfp: use hwmon_sanitize_name()

On Tue, Mar 29, 2022 at 06:07:28PM +0200, Michael Walle wrote:
> Instead of open-coding the bad characters replacement in the hwmon name,
> use the new hwmon_sanitize_name().
>
> Signed-off-by: Michael Walle <[email protected]>

Acked-by: Russell King (Oracle) <[email protected]>

--
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/
FTTP is here! 40Mbps down 10Mbps up. Decent connectivity at last!