diff options
| author | Axel Lin <axel.lin@ingics.com> | 2014-06-14 14:33:24 +0800 |
|---|---|---|
| committer | Guenter Roeck <linux@roeck-us.net> | 2014-08-04 07:01:33 -0700 |
| commit | 5495af5f3e6e2cce34a2c22ecd8b1a94e93c184a (patch) | |
| tree | 47dc1c2fb06967df42e7ce4c67d70b51924d81cd /drivers/hwmon | |
| parent | f4ff415564cbd1221e5bbac80f97ee94b7e5258d (diff) | |
hwmon: (twl4030-madc-hwmon) 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>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Diffstat (limited to 'drivers/hwmon')
| -rw-r--r-- | drivers/hwmon/twl4030-madc-hwmon.c | 38 |
1 files changed, 6 insertions, 32 deletions
diff --git a/drivers/hwmon/twl4030-madc-hwmon.c b/drivers/hwmon/twl4030-madc-hwmon.c index 6c6d440bb2dd..9a0e2b8e8b94 100644 --- a/drivers/hwmon/twl4030-madc-hwmon.c +++ b/drivers/hwmon/twl4030-madc-hwmon.c @@ -74,7 +74,7 @@ static SENSOR_DEVICE_ATTR(in11_input, S_IRUGO, madc_read, NULL, 11); static SENSOR_DEVICE_ATTR(in12_input, S_IRUGO, madc_read, NULL, 12); static SENSOR_DEVICE_ATTR(in15_input, S_IRUGO, madc_read, NULL, 15); -static struct attribute *twl4030_madc_attributes[] = { +static struct attribute *twl4030_madc_attrs[] = { &sensor_dev_attr_in0_input.dev_attr.attr, &sensor_dev_attr_temp1_input.dev_attr.attr, &sensor_dev_attr_in2_input.dev_attr.attr, @@ -91,46 +91,20 @@ static struct attribute *twl4030_madc_attributes[] = { &sensor_dev_attr_in15_input.dev_attr.attr, NULL }; - -static const struct attribute_group twl4030_madc_group = { - .attrs = twl4030_madc_attributes, -}; +ATTRIBUTE_GROUPS(twl4030_madc); static int twl4030_madc_hwmon_probe(struct platform_device *pdev) { - int ret; struct device *hwmon; - ret = sysfs_create_group(&pdev->dev.kobj, &twl4030_madc_group); - if (ret) - goto err_sysfs; - hwmon = hwmon_device_register(&pdev->dev); - if (IS_ERR(hwmon)) { - dev_err(&pdev->dev, "hwmon_device_register failed.\n"); - ret = PTR_ERR(hwmon); - goto err_reg; - } - - return 0; - -err_reg: - sysfs_remove_group(&pdev->dev.kobj, &twl4030_madc_group); -err_sysfs: - - return ret; -} - -static int twl4030_madc_hwmon_remove(struct platform_device *pdev) -{ - hwmon_device_unregister(&pdev->dev); - sysfs_remove_group(&pdev->dev.kobj, &twl4030_madc_group); - - return 0; + hwmon = devm_hwmon_device_register_with_groups(&pdev->dev, + "twl4030_madc", NULL, + twl4030_madc_groups); + return PTR_ERR_OR_ZERO(hwmon); } static struct platform_driver twl4030_madc_hwmon_driver = { .probe = twl4030_madc_hwmon_probe, - .remove = twl4030_madc_hwmon_remove, .driver = { .name = "twl4030_madc_hwmon", .owner = THIS_MODULE, |