kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

hwmon: (iio_hwmon) Simplify attr.name generation in iio_hwmon_probe()

Browse source 
Since every call to devm_kasprintf() in the switch statement is mostly
the same, we can move all of the shared code outside and capture
differencies with two helper variables. No functional change intended.

Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Cc: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
This commit is contained in:
Andrey Smirnov 2019-04-02 21:28:11 -07:00 committed by Guenter Roeck
parent 5aaa58734d
commit cb202bb8b3
1 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
drivers/hwmon/iio_hwmon.c
View file

@ -92,6 +92,9 @@ static int iio_hwmon_probe(struct platform_device *pdev)
return -ENOMEM; return -ENOMEM;
for (i = 0; i < st->num_channels; i++) { for (i = 0; i < st->num_channels; i++) {
const char *prefix;
int n;
a = devm_kzalloc(dev, sizeof(*a), GFP_KERNEL); a = devm_kzalloc(dev, sizeof(*a), GFP_KERNEL);
if (a == NULL) if (a == NULL)
return -ENOMEM; return -ENOMEM;
@ -103,28 +106,28 @@ static int iio_hwmon_probe(struct platform_device *pdev)
switch (type) { switch (type) {
case IIO_VOLTAGE: case IIO_VOLTAGE:
a->dev_attr.attr.name = devm_kasprintf(dev, GFP_KERNEL, n = in_i++;
"in%d_input", prefix = "in";
in_i++);
break; break;
case IIO_TEMP: case IIO_TEMP:
a->dev_attr.attr.name = devm_kasprintf(dev, GFP_KERNEL, n = temp_i++;
"temp%d_input", prefix = "temp";
temp_i++);
break; break;
case IIO_CURRENT: case IIO_CURRENT:
a->dev_attr.attr.name = devm_kasprintf(dev, GFP_KERNEL, n = curr_i++;
"curr%d_input", prefix = "curr";
curr_i++);
break; break;
case IIO_HUMIDITYRELATIVE: case IIO_HUMIDITYRELATIVE:
a->dev_attr.attr.name = devm_kasprintf(dev, GFP_KERNEL, n = humidity_i++;
"humidity%d_input", prefix = "humidity";
humidity_i++);
break; break;
default: default:
return -EINVAL; return -EINVAL;
} }
a->dev_attr.attr.name = devm_kasprintf(dev, GFP_KERNEL,
"%s%d_input",
prefix, n);
if (a->dev_attr.attr.name == NULL) if (a->dev_attr.attr.name == NULL)
return -ENOMEM; return -ENOMEM;