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

hwmon: (smsc47b397) Convert to devm_hwmon_device_register_with_groups 

Use ATTRIBUTE_GROUPS macro and devm_hwmon_device_register_with_groups() to
simplify the code a bit.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Tested-by: Jean Delvare <jdelvare@suse.de>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
This commit is contained in:
Axel Lin 2014-07-08 09:27:38 +08:00 committed by Guenter Roeck
parent 93c090b36a
commit 9b993e3661
1 changed files with 7 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
drivers/hwmon/smsc47b397.c
View File

@ -100,8 +100,6 @@ static u8 smsc47b397_reg_temp[] = {0x25, 0x26, 0x27, 0x80};
struct smsc47b397_data { struct smsc47b397_data {
unsigned short addr; unsigned short addr;
const char *name;
struct device *hwmon_dev;
struct mutex lock; struct mutex lock;
struct mutex update_lock; struct mutex update_lock;
@ -202,15 +200,7 @@ static SENSOR_DEVICE_ATTR(fan2_input, S_IRUGO, show_fan, NULL, 1);
static SENSOR_DEVICE_ATTR(fan3_input, S_IRUGO, show_fan, NULL, 2); static SENSOR_DEVICE_ATTR(fan3_input, S_IRUGO, show_fan, NULL, 2);
static SENSOR_DEVICE_ATTR(fan4_input, S_IRUGO, show_fan, NULL, 3); static SENSOR_DEVICE_ATTR(fan4_input, S_IRUGO, show_fan, NULL, 3);
static ssize_t show_name(struct device *dev, struct device_attribute static struct attribute *smsc47b397_attrs[] = {
*devattr, char *buf)
{
struct smsc47b397_data *data = dev_get_drvdata(dev);
return sprintf(buf, "%s\n", data->name);
}
static DEVICE_ATTR(name, S_IRUGO, show_name, NULL);
static struct attribute *smsc47b397_attributes[] = {
&sensor_dev_attr_temp1_input.dev_attr.attr, &sensor_dev_attr_temp1_input.dev_attr.attr,
&sensor_dev_attr_temp2_input.dev_attr.attr, &sensor_dev_attr_temp2_input.dev_attr.attr,
&sensor_dev_attr_temp3_input.dev_attr.attr, &sensor_dev_attr_temp3_input.dev_attr.attr,
@ -220,23 +210,10 @@ static struct attribute *smsc47b397_attributes[] = {
&sensor_dev_attr_fan3_input.dev_attr.attr, &sensor_dev_attr_fan3_input.dev_attr.attr,
&sensor_dev_attr_fan4_input.dev_attr.attr, &sensor_dev_attr_fan4_input.dev_attr.attr,
&dev_attr_name.attr,
NULL NULL
}; };
static const struct attribute_group smsc47b397_group = { ATTRIBUTE_GROUPS(smsc47b397);
.attrs = smsc47b397_attributes,
};
static int smsc47b397_remove(struct platform_device *pdev)
{
struct smsc47b397_data *data = platform_get_drvdata(pdev);
hwmon_device_unregister(data->hwmon_dev);
sysfs_remove_group(&pdev->dev.kobj, &smsc47b397_group);
return 0;
}
static int smsc47b397_probe(struct platform_device *pdev); static int smsc47b397_probe(struct platform_device *pdev);
@ -246,15 +223,14 @@ static struct platform_driver smsc47b397_driver = {
.name = DRVNAME, .name = DRVNAME,
}, },
.probe = smsc47b397_probe, .probe = smsc47b397_probe,
.remove = smsc47b397_remove,
}; };
static int smsc47b397_probe(struct platform_device *pdev) static int smsc47b397_probe(struct platform_device *pdev)
{ {
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
struct smsc47b397_data *data; struct smsc47b397_data *data;
struct device *hwmon_dev;
struct resource *res; struct resource *res;
int err = 0;
res = platform_get_resource(pdev, IORESOURCE_IO, 0); res = platform_get_resource(pdev, IORESOURCE_IO, 0);
if (!devm_request_region(dev, res->start, SMSC_EXTENT, if (!devm_request_region(dev, res->start, SMSC_EXTENT,
@ -270,26 +246,13 @@ static int smsc47b397_probe(struct platform_device *pdev)
return -ENOMEM; return -ENOMEM;
data->addr = res->start; data->addr = res->start;
data->name = "smsc47b397";
mutex_init(&data->lock); mutex_init(&data->lock);
mutex_init(&data->update_lock); mutex_init(&data->update_lock);
platform_set_drvdata(pdev, data);
err = sysfs_create_group(&dev->kobj, &smsc47b397_group); hwmon_dev = devm_hwmon_device_register_with_groups(dev, "smsc47b397",
if (err) data,
return err; smsc47b397_groups);
return PTR_ERR_OR_ZERO(hwmon_dev);
data->hwmon_dev = hwmon_device_register(dev);
if (IS_ERR(data->hwmon_dev)) {
err = PTR_ERR(data->hwmon_dev);
goto error_remove;
}
return 0;
error_remove:
sysfs_remove_group(&dev->kobj, &smsc47b397_group);
return err;
} }
static int __init smsc47b397_device_add(unsigned short address) static int __init smsc47b397_device_add(unsigned short address)