2022-06-22 12:39:11

by Michael Walle

Subject: [PATCH net-next 1/2] 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]>
Acked-by: Russell King (Oracle) <[email protected]>
---
drivers/net/phy/sfp.c | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/drivers/net/phy/sfp.c b/drivers/net/phy/sfp.c
index 9a5d5a10560f..81a529c3dbe4 100644
--- a/drivers/net/phy/sfp.c
+++ b/drivers/net/phy/sfp.c
@@ -1290,7 +1290,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
@@ -1318,16 +1318,12 @@ static void sfp_hwmon_probe(struct work_struct *work)
return;
}

- sfp->hwmon_name = kstrdup(dev_name(sfp->dev), GFP_KERNEL);
- if (!sfp->hwmon_name) {
+ sfp->hwmon_name = hwmon_sanitize_name(dev_name(sfp->dev));
+ if (IS_ERR(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-06-22 15:32:39

by Guenter Roeck

Subject: Re: [PATCH net-next 1/2] net: sfp: use hwmon_sanitize_name()

On Wed, Jun 22, 2022 at 02:35:42PM +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]>

Acked-by: Guenter Roeck <[email protected]>

> ---
> drivers/net/phy/sfp.c | 10 +++-------
> 1 file changed, 3 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/net/phy/sfp.c b/drivers/net/phy/sfp.c
> index 9a5d5a10560f..81a529c3dbe4 100644
> --- a/drivers/net/phy/sfp.c
> +++ b/drivers/net/phy/sfp.c
> @@ -1290,7 +1290,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
> @@ -1318,16 +1318,12 @@ static void sfp_hwmon_probe(struct work_struct *work)
> return;
> }
>
> - sfp->hwmon_name = kstrdup(dev_name(sfp->dev), GFP_KERNEL);
> - if (!sfp->hwmon_name) {
> + sfp->hwmon_name = hwmon_sanitize_name(dev_name(sfp->dev));
> + if (IS_ERR(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
>