lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

hwmon: (wm8350) Convert to devm_hwmon_device_register_with_groups

Browse Source 
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>
Acked-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
This commit is contained in:
Axel Lin
2014-06-17 23:12:08 +08:00
committed by Guenter Roeck
parent 9a70c97b21
commit b3aabd6db3
1 changed files with 7 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
drivers/hwmon/wm8350-hwmon.c
View File

@@ -28,19 +28,12 @@
#include <linux/mfd/wm8350/core.h> #include <linux/mfd/wm8350/core.h>
#include <linux/mfd/wm8350/comparator.h> #include <linux/mfd/wm8350/comparator.h>
static ssize_t show_name(struct device *dev,
struct device_attribute *attr, char *buf)
{
return sprintf(buf, "wm8350\n");
}
static const char * const input_names[] = { static const char * const input_names[] = {
[WM8350_AUXADC_USB] = "USB", [WM8350_AUXADC_USB] = "USB",
[WM8350_AUXADC_LINE] = "Line", [WM8350_AUXADC_LINE] = "Line",
[WM8350_AUXADC_BATT] = "Battery", [WM8350_AUXADC_BATT] = "Battery",
}; };
static ssize_t show_voltage(struct device *dev, static ssize_t show_voltage(struct device *dev,
struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
{ {
@@ -68,15 +61,11 @@ static ssize_t show_label(struct device *dev,
static SENSOR_DEVICE_ATTR(in##id##_label, S_IRUGO, show_label, \ static SENSOR_DEVICE_ATTR(in##id##_label, S_IRUGO, show_label, \
NULL, name) NULL, name)
static DEVICE_ATTR(name, S_IRUGO, show_name, NULL);
WM8350_NAMED_VOLTAGE(0, WM8350_AUXADC_USB); WM8350_NAMED_VOLTAGE(0, WM8350_AUXADC_USB);
WM8350_NAMED_VOLTAGE(1, WM8350_AUXADC_BATT); WM8350_NAMED_VOLTAGE(1, WM8350_AUXADC_BATT);
WM8350_NAMED_VOLTAGE(2, WM8350_AUXADC_LINE); WM8350_NAMED_VOLTAGE(2, WM8350_AUXADC_LINE);
static struct attribute *wm8350_attributes[] = { static struct attribute *wm8350_attrs[] = {
&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_in1_input.dev_attr.attr, &sensor_dev_attr_in1_input.dev_attr.attr,
@@ -87,46 +76,21 @@ static struct attribute *wm8350_attributes[] = {
NULL, NULL,
}; };
static const struct attribute_group wm8350_attr_group = { ATTRIBUTE_GROUPS(wm8350);
.attrs = wm8350_attributes,
};
static int wm8350_hwmon_probe(struct platform_device *pdev) static int wm8350_hwmon_probe(struct platform_device *pdev)
{ {
struct wm8350 *wm8350 = platform_get_drvdata(pdev); struct wm8350 *wm8350 = platform_get_drvdata(pdev);
int ret; struct device *hwmon_dev;
ret = sysfs_create_group(&pdev->dev.kobj, &wm8350_attr_group); hwmon_dev = devm_hwmon_device_register_with_groups(&pdev->dev, "wm8350",
if (ret) wm8350,
goto err; wm8350_groups);
return PTR_ERR_OR_ZERO(hwmon_dev);
wm8350->hwmon.classdev = hwmon_device_register(&pdev->dev);
if (IS_ERR(wm8350->hwmon.classdev)) {
ret = PTR_ERR(wm8350->hwmon.classdev);
goto err_group;
}
return 0;
err_group:
sysfs_remove_group(&pdev->dev.kobj, &wm8350_attr_group);
err:
return ret;
}
static int wm8350_hwmon_remove(struct platform_device *pdev)
{
struct wm8350 *wm8350 = platform_get_drvdata(pdev);
hwmon_device_unregister(wm8350->hwmon.classdev);
sysfs_remove_group(&pdev->dev.kobj, &wm8350_attr_group);
return 0;
} }
static struct platform_driver wm8350_hwmon_driver = { static struct platform_driver wm8350_hwmon_driver = {
.probe = wm8350_hwmon_probe, .probe = wm8350_hwmon_probe,
.remove = wm8350_hwmon_remove,
.driver = { .driver = {
.name = "wm8350-hwmon", .name = "wm8350-hwmon",
.owner = THIS_MODULE, .owner = THIS_MODULE,