net: sfp: use hwmon_sanitize_name()
authorMichael Walle <michael@walle.cc>
Wed, 22 Jun 2022 12:35:42 +0000 (14:35 +0200)
committerJakub Kicinski <kuba@kernel.org>
Fri, 24 Jun 2022 03:52:19 +0000 (20:52 -0700)
Instead of open-coding the bad characters replacement in the hwmon name,
use the new hwmon_sanitize_name().

Signed-off-by: Michael Walle <michael@walle.cc>
Acked-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Acked-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/phy/sfp.c

index 9a5d5a1..81a529c 100644 (file)
@@ -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,