diff options
| author | Guenter Roeck <linux@roeck-us.net> | 2018-08-28 20:41:41 +0200 |
|---|---|---|
| committer | Guenter Roeck <linux@roeck-us.net> | 2018-10-11 05:37:13 +0200 |
| commit | 86103cffe8834fef0a342fcac82585ff67cda569 (patch) | |
| tree | 87c83be14d1c132fc94e17ee7a757736c20859cc | |
| parent | hwmon: Convert to using %pOFn instead of device_node.name (diff) | |
| download | linux-86103cffe8834fef0a342fcac82585ff67cda569.tar.xz linux-86103cffe8834fef0a342fcac82585ff67cda569.zip | |
hwmon: (iio_hwmon) Do not duplicate or sanitize fixed string
Calling devm_kstrdup() on a fixed string is unnecessary, as is validating
its contents. Rearrange the code to avoid both.
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
| -rw-r--r-- | drivers/hwmon/iio_hwmon.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/drivers/hwmon/iio_hwmon.c b/drivers/hwmon/iio_hwmon.c index 7566991f1c04..eed66e533ee2 100644 --- a/drivers/hwmon/iio_hwmon.c +++ b/drivers/hwmon/iio_hwmon.c @@ -137,14 +137,15 @@ static int iio_hwmon_probe(struct platform_device *pdev) st->attr_group.attrs = st->attrs; st->groups[0] = &st->attr_group; - if (dev->of_node) + if (dev->of_node) { sname = devm_kasprintf(dev, GFP_KERNEL, "%pOFn", dev->of_node); - else - sname = devm_kstrdup(dev, "iio_hwmon", GFP_KERNEL); - if (!sname) - return -ENOMEM; + if (!sname) + return -ENOMEM; + strreplace(sname, '-', '_'); + } else { + sname = "iio_hwmon"; + } - strreplace(sname, '-', '_'); hwmon_dev = devm_hwmon_device_register_with_groups(dev, sname, st, st->groups); return PTR_ERR_OR_ZERO(hwmon_dev); |