hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hwmon: (smsc47m1) Fix: do not use assignment in if condition 

Fix checkpatch issue:
ERROR: do not use assignment in if condition

Replace repeated calls to device_create_file() with calls to sysfs_create_group.

Cc: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
This commit is contained in:
Guenter Roeck 2012-01-16 17:15:02 -08:00 committed by Guenter Roeck
parent 7cc3cb6662
commit 7e612685a3
1 changed files with 80 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

125
drivers/hwmon/smsc47m1.c
View File

@ -380,30 +380,73 @@ static ssize_t show_name(struct device *dev, struct device_attribute
} }
static DEVICE_ATTR(name, S_IRUGO, show_name, NULL); static DEVICE_ATTR(name, S_IRUGO, show_name, NULL);
/* Almost all sysfs files may or may not be created depending on the chip static struct attribute *smsc47m1_attributes_fan1[] = {
setup so we create them individually. It is still convenient to define a
group to remove them all at once. */
static struct attribute *smsc47m1_attributes[] = {
&sensor_dev_attr_fan1_input.dev_attr.attr, &sensor_dev_attr_fan1_input.dev_attr.attr,
&sensor_dev_attr_fan1_min.dev_attr.attr, &sensor_dev_attr_fan1_min.dev_attr.attr,
&sensor_dev_attr_fan1_div.dev_attr.attr, &sensor_dev_attr_fan1_div.dev_attr.attr,
&sensor_dev_attr_fan1_alarm.dev_attr.attr, &sensor_dev_attr_fan1_alarm.dev_attr.attr,
NULL
};
static const struct attribute_group smsc47m1_group_fan1 = {
.attrs = smsc47m1_attributes_fan1,
};
static struct attribute *smsc47m1_attributes_fan2[] = {
&sensor_dev_attr_fan2_input.dev_attr.attr, &sensor_dev_attr_fan2_input.dev_attr.attr,
&sensor_dev_attr_fan2_min.dev_attr.attr, &sensor_dev_attr_fan2_min.dev_attr.attr,
&sensor_dev_attr_fan2_div.dev_attr.attr, &sensor_dev_attr_fan2_div.dev_attr.attr,
&sensor_dev_attr_fan2_alarm.dev_attr.attr, &sensor_dev_attr_fan2_alarm.dev_attr.attr,
NULL
};
static const struct attribute_group smsc47m1_group_fan2 = {
.attrs = smsc47m1_attributes_fan2,
};
static struct attribute *smsc47m1_attributes_fan3[] = {
&sensor_dev_attr_fan3_input.dev_attr.attr, &sensor_dev_attr_fan3_input.dev_attr.attr,
&sensor_dev_attr_fan3_min.dev_attr.attr, &sensor_dev_attr_fan3_min.dev_attr.attr,
&sensor_dev_attr_fan3_div.dev_attr.attr, &sensor_dev_attr_fan3_div.dev_attr.attr,
&sensor_dev_attr_fan3_alarm.dev_attr.attr, &sensor_dev_attr_fan3_alarm.dev_attr.attr,
NULL
};
static const struct attribute_group smsc47m1_group_fan3 = {
.attrs = smsc47m1_attributes_fan3,
};
static struct attribute *smsc47m1_attributes_pwm1[] = {
&sensor_dev_attr_pwm1.dev_attr.attr, &sensor_dev_attr_pwm1.dev_attr.attr,
&sensor_dev_attr_pwm1_enable.dev_attr.attr, &sensor_dev_attr_pwm1_enable.dev_attr.attr,
NULL
};
static const struct attribute_group smsc47m1_group_pwm1 = {
.attrs = smsc47m1_attributes_pwm1,
};
static struct attribute *smsc47m1_attributes_pwm2[] = {
&sensor_dev_attr_pwm2.dev_attr.attr, &sensor_dev_attr_pwm2.dev_attr.attr,
&sensor_dev_attr_pwm2_enable.dev_attr.attr, &sensor_dev_attr_pwm2_enable.dev_attr.attr,
NULL
};
static const struct attribute_group smsc47m1_group_pwm2 = {
.attrs = smsc47m1_attributes_pwm2,
};
static struct attribute *smsc47m1_attributes_pwm3[] = {
&sensor_dev_attr_pwm3.dev_attr.attr, &sensor_dev_attr_pwm3.dev_attr.attr,
&sensor_dev_attr_pwm3_enable.dev_attr.attr, &sensor_dev_attr_pwm3_enable.dev_attr.attr,
NULL
};
static const struct attribute_group smsc47m1_group_pwm3 = {
.attrs = smsc47m1_attributes_pwm3,
};
static struct attribute *smsc47m1_attributes[] = {
&dev_attr_alarms.attr, &dev_attr_alarms.attr,
&dev_attr_name.attr, &dev_attr_name.attr,
NULL NULL
@ -583,6 +626,17 @@ static int smsc47m1_handle_resources(unsigned short address, enum chips type,
return 0; return 0;
} }
static void smsc47m1_remove_files(struct device *dev)
{
sysfs_remove_group(&dev->kobj, &smsc47m1_group);
sysfs_remove_group(&dev->kobj, &smsc47m1_group_fan1);
sysfs_remove_group(&dev->kobj, &smsc47m1_group_fan2);
sysfs_remove_group(&dev->kobj, &smsc47m1_group_fan3);
sysfs_remove_group(&dev->kobj, &smsc47m1_group_pwm1);
sysfs_remove_group(&dev->kobj, &smsc47m1_group_pwm2);
sysfs_remove_group(&dev->kobj, &smsc47m1_group_pwm3);
}
static int __init smsc47m1_probe(struct platform_device *pdev) static int __init smsc47m1_probe(struct platform_device *pdev)
{ {
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
@ -653,74 +707,55 @@ static int __init smsc47m1_probe(struct platform_device *pdev)
/* Register sysfs hooks */ /* Register sysfs hooks */
if (fan1) { if (fan1) {
if ((err = device_create_file(dev, err = sysfs_create_group(&dev->kobj,
&sensor_dev_attr_fan1_input.dev_attr)) &smsc47m1_group_fan1);
|| (err = device_create_file(dev, if (err)
&sensor_dev_attr_fan1_min.dev_attr))
|| (err = device_create_file(dev,
&sensor_dev_attr_fan1_div.dev_attr))
|| (err = device_create_file(dev,
&sensor_dev_attr_fan1_alarm.dev_attr)))
goto error_remove_files; goto error_remove_files;
} else } else
dev_dbg(dev, "Fan 1 not enabled by hardware, skipping\n"); dev_dbg(dev, "Fan 1 not enabled by hardware, skipping\n");
if (fan2) { if (fan2) {
if ((err = device_create_file(dev, err = sysfs_create_group(&dev->kobj,
&sensor_dev_attr_fan2_input.dev_attr)) &smsc47m1_group_fan2);
|| (err = device_create_file(dev, if (err)
&sensor_dev_attr_fan2_min.dev_attr))
|| (err = device_create_file(dev,
&sensor_dev_attr_fan2_div.dev_attr))
|| (err = device_create_file(dev,
&sensor_dev_attr_fan2_alarm.dev_attr)))
goto error_remove_files; goto error_remove_files;
} else } else
dev_dbg(dev, "Fan 2 not enabled by hardware, skipping\n"); dev_dbg(dev, "Fan 2 not enabled by hardware, skipping\n");
if (fan3) { if (fan3) {
if ((err = device_create_file(dev, err = sysfs_create_group(&dev->kobj,
&sensor_dev_attr_fan3_input.dev_attr)) &smsc47m1_group_fan3);
|| (err = device_create_file(dev, if (err)
&sensor_dev_attr_fan3_min.dev_attr))
|| (err = device_create_file(dev,
&sensor_dev_attr_fan3_div.dev_attr))
|| (err = device_create_file(dev,
&sensor_dev_attr_fan3_alarm.dev_attr)))
goto error_remove_files; goto error_remove_files;
} else if (data->type == smsc47m2) } else if (data->type == smsc47m2)
dev_dbg(dev, "Fan 3 not enabled by hardware, skipping\n"); dev_dbg(dev, "Fan 3 not enabled by hardware, skipping\n");
if (pwm1) { if (pwm1) {
if ((err = device_create_file(dev, err = sysfs_create_group(&dev->kobj,
&sensor_dev_attr_pwm1.dev_attr)) &smsc47m1_group_pwm1);
|| (err = device_create_file(dev, if (err)
&sensor_dev_attr_pwm1_enable.dev_attr)))
goto error_remove_files; goto error_remove_files;
} else } else
dev_dbg(dev, "PWM 1 not enabled by hardware, skipping\n"); dev_dbg(dev, "PWM 1 not enabled by hardware, skipping\n");
if (pwm2) { if (pwm2) {
if ((err = device_create_file(dev, err = sysfs_create_group(&dev->kobj,
&sensor_dev_attr_pwm2.dev_attr)) &smsc47m1_group_pwm2);
|| (err = device_create_file(dev, if (err)
&sensor_dev_attr_pwm2_enable.dev_attr)))
goto error_remove_files; goto error_remove_files;
} else } else
dev_dbg(dev, "PWM 2 not enabled by hardware, skipping\n"); dev_dbg(dev, "PWM 2 not enabled by hardware, skipping\n");
if (pwm3) { if (pwm3) {
if ((err = device_create_file(dev, err = sysfs_create_group(&dev->kobj,
&sensor_dev_attr_pwm3.dev_attr)) &smsc47m1_group_pwm3);
|| (err = device_create_file(dev, if (err)
&sensor_dev_attr_pwm3_enable.dev_attr)))
goto error_remove_files; goto error_remove_files;
} else if (data->type == smsc47m2) } else if (data->type == smsc47m2)
dev_dbg(dev, "PWM 3 not enabled by hardware, skipping\n"); dev_dbg(dev, "PWM 3 not enabled by hardware, skipping\n");
if ((err = device_create_file(dev, &dev_attr_alarms))) err = sysfs_create_group(&dev->kobj, &smsc47m1_group);
goto error_remove_files; if (err)
if ((err = device_create_file(dev, &dev_attr_name)))
goto error_remove_files; goto error_remove_files;
data->hwmon_dev = hwmon_device_register(dev); data->hwmon_dev = hwmon_device_register(dev);
@ -732,7 +767,7 @@ static int __init smsc47m1_probe(struct platform_device *pdev)
return 0; return 0;
error_remove_files: error_remove_files:
sysfs_remove_group(&dev->kobj, &smsc47m1_group); smsc47m1_remove_files(dev);
error_free: error_free:
platform_set_drvdata(pdev, NULL); platform_set_drvdata(pdev, NULL);
kfree(data); kfree(data);
@ -747,7 +782,7 @@ static int __exit smsc47m1_remove(struct platform_device *pdev)
struct resource *res; struct resource *res;
hwmon_device_unregister(data->hwmon_dev); hwmon_device_unregister(data->hwmon_dev);
sysfs_remove_group(&pdev->dev.kobj, &smsc47m1_group); smsc47m1_remove_files(&pdev->dev);
res = platform_get_resource(pdev, IORESOURCE_IO, 0); res = platform_get_resource(pdev, IORESOURCE_IO, 0);
smsc47m1_handle_resources(res->start, data->type, RELEASE, &pdev->dev); smsc47m1_handle_resources(res->start, data->type, RELEASE, &pdev->dev);