diff mbox series

hwmon: (iio_hwmon) Do not duplicate or sanitize fixed string

Message ID 1535481935-28226-1-git-send-email-linux@roeck-us.net (mailing list archive)
State Accepted
Headers show
Series hwmon: (iio_hwmon) Do not duplicate or sanitize fixed string | expand

Commit Message

Guenter Roeck Aug. 28, 2018, 6:45 p.m. UTC 
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>
---
 drivers/hwmon/iio_hwmon.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)
diff mbox series

Patch

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);