UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

hwmon: (da9052) 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: Adam Thomson <Adam.Thomson.Opensource@diasemi.com>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
This commit is contained in:
Axel Lin 2014-07-09 09:20:41 +08:00 committed by Guenter Roeck
parent e7d275e761
commit 4222eb5f2b
1 changed files with 9 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
drivers/hwmon/da9052-hwmon.c
View File

@ -26,7 +26,6 @@
struct da9052_hwmon { struct da9052_hwmon {
struct da9052 *da9052; struct da9052 *da9052;
struct device *class_device;
struct mutex hwmon_lock; struct mutex hwmon_lock;
}; };
@ -190,13 +189,6 @@ static ssize_t da9052_read_vbbat(struct device *dev,
return sprintf(buf, "%d\n", vbbat_reg_to_mv(ret)); return sprintf(buf, "%d\n", vbbat_reg_to_mv(ret));
} }
static ssize_t da9052_hwmon_show_name(struct device *dev,
struct device_attribute *devattr,
char *buf)
{
return sprintf(buf, "da9052\n");
}
static ssize_t show_label(struct device *dev, static ssize_t show_label(struct device *dev,
struct device_attribute *devattr, char *buf) struct device_attribute *devattr, char *buf)
{ {
@ -243,10 +235,7 @@ static SENSOR_DEVICE_ATTR(temp8_input, S_IRUGO, da9052_read_tjunc, NULL,
static SENSOR_DEVICE_ATTR(temp8_label, S_IRUGO, show_label, NULL, static SENSOR_DEVICE_ATTR(temp8_label, S_IRUGO, show_label, NULL,
DA9052_ADC_TJUNC); DA9052_ADC_TJUNC);
static DEVICE_ATTR(name, S_IRUGO, da9052_hwmon_show_name, NULL); static struct attribute *da9052_attrs[] = {
static struct attribute *da9052_attr[] = {
&dev_attr_name.attr,
&sensor_dev_attr_in0_input.dev_attr.attr, &sensor_dev_attr_in0_input.dev_attr.attr,
&sensor_dev_attr_in0_label.dev_attr.attr, &sensor_dev_attr_in0_label.dev_attr.attr,
&sensor_dev_attr_in3_input.dev_attr.attr, &sensor_dev_attr_in3_input.dev_attr.attr,
@ -268,54 +257,29 @@ static struct attribute *da9052_attr[] = {
NULL NULL
}; };
static const struct attribute_group da9052_attr_group = {.attrs = da9052_attr}; ATTRIBUTE_GROUPS(da9052);
static int da9052_hwmon_probe(struct platform_device *pdev) static int da9052_hwmon_probe(struct platform_device *pdev)
{ {
struct device *dev = &pdev->dev;
struct da9052_hwmon *hwmon; struct da9052_hwmon *hwmon;
int ret; struct device *hwmon_dev;
hwmon = devm_kzalloc(&pdev->dev, sizeof(struct da9052_hwmon), hwmon = devm_kzalloc(dev, sizeof(struct da9052_hwmon), GFP_KERNEL);
GFP_KERNEL);
if (!hwmon) if (!hwmon)
return -ENOMEM; return -ENOMEM;
mutex_init(&hwmon->hwmon_lock); mutex_init(&hwmon->hwmon_lock);
hwmon->da9052 = dev_get_drvdata(pdev->dev.parent); hwmon->da9052 = dev_get_drvdata(pdev->dev.parent);
platform_set_drvdata(pdev, hwmon); hwmon_dev = devm_hwmon_device_register_with_groups(dev, "da9052",
hwmon,
ret = sysfs_create_group(&pdev->dev.kobj, &da9052_attr_group); da9052_groups);
if (ret) return PTR_ERR_OR_ZERO(hwmon_dev);
goto err_mem;
hwmon->class_device = hwmon_device_register(&pdev->dev);
if (IS_ERR(hwmon->class_device)) {
ret = PTR_ERR(hwmon->class_device);
goto err_sysfs;
}
return 0;
err_sysfs:
sysfs_remove_group(&pdev->dev.kobj, &da9052_attr_group);
err_mem:
return ret;
}
static int da9052_hwmon_remove(struct platform_device *pdev)
{
struct da9052_hwmon *hwmon = platform_get_drvdata(pdev);
hwmon_device_unregister(hwmon->class_device);
sysfs_remove_group(&pdev->dev.kobj, &da9052_attr_group);
return 0;
} }
static struct platform_driver da9052_hwmon_driver = { static struct platform_driver da9052_hwmon_driver = {
.probe = da9052_hwmon_probe, .probe = da9052_hwmon_probe,
.remove = da9052_hwmon_remove,
.driver = { .driver = {
.name = "da9052-hwmon", .name = "da9052-hwmon",
.owner = THIS_MODULE, .owner = THIS_MODULE,