From 86103cffe8834fef0a342fcac82585ff67cda569 Mon Sep 17 00:00:00 2001 From: Guenter Roeck Date: Tue, 28 Aug 2018 11:41:41 -0700 Subject: 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 --- drivers/hwmon/iio_hwmon.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'drivers/hwmon/iio_hwmon.c') 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); -- cgit v1.2.3