iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hwmon: (fam15h_power) 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>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
This commit is contained in:
Axel Lin 2014-06-19 23:29:11 +08:00 committed by Guenter Roeck
parent b3aabd6db3
commit 562dc9732a
1 changed files with 9 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
drivers/hwmon/fam15h_power.c
View File

@ -45,7 +45,7 @@ MODULE_LICENSE("GPL");
#define REG_TDP_LIMIT3 0xe8 #define REG_TDP_LIMIT3 0xe8
struct fam15h_power_data { struct fam15h_power_data {
struct device *hwmon_dev; struct pci_dev *pdev;
unsigned int tdp_to_watts; unsigned int tdp_to_watts;
unsigned int base_tdp; unsigned int base_tdp;
unsigned int processor_pwr_watts; unsigned int processor_pwr_watts;
@ -57,8 +57,8 @@ static ssize_t show_power(struct device *dev,
u32 val, tdp_limit, running_avg_range; u32 val, tdp_limit, running_avg_range;
s32 running_avg_capture; s32 running_avg_capture;
u64 curr_pwr_watts; u64 curr_pwr_watts;
struct pci_dev *f4 = to_pci_dev(dev);
struct fam15h_power_data *data = dev_get_drvdata(dev); struct fam15h_power_data *data = dev_get_drvdata(dev);
struct pci_dev *f4 = data->pdev;
pci_bus_read_config_dword(f4->bus, PCI_DEVFN(PCI_SLOT(f4->devfn), 5), pci_bus_read_config_dword(f4->bus, PCI_DEVFN(PCI_SLOT(f4->devfn), 5),
REG_TDP_RUNNING_AVERAGE, &val); REG_TDP_RUNNING_AVERAGE, &val);
@ -96,23 +96,13 @@ static ssize_t show_power_crit(struct device *dev,
} }
static DEVICE_ATTR(power1_crit, S_IRUGO, show_power_crit, NULL); static DEVICE_ATTR(power1_crit, S_IRUGO, show_power_crit, NULL);
static ssize_t show_name(struct device *dev,
struct device_attribute *attr, char *buf)
{
return sprintf(buf, "fam15h_power\n");
}
static DEVICE_ATTR(name, S_IRUGO, show_name, NULL);
static struct attribute *fam15h_power_attrs[] = { static struct attribute *fam15h_power_attrs[] = {
&dev_attr_power1_input.attr, &dev_attr_power1_input.attr,
&dev_attr_power1_crit.attr, &dev_attr_power1_crit.attr,
&dev_attr_name.attr,
NULL NULL
}; };
static const struct attribute_group fam15h_power_attr_group = { ATTRIBUTE_GROUPS(fam15h_power);
.attrs = fam15h_power_attrs,
};
static bool fam15h_power_is_internal_node0(struct pci_dev *f4) static bool fam15h_power_is_internal_node0(struct pci_dev *f4)
{ {
@ -202,7 +192,7 @@ static int fam15h_power_probe(struct pci_dev *pdev,
{ {
struct fam15h_power_data *data; struct fam15h_power_data *data;
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
int err; struct device *hwmon_dev;
/* /*
* though we ignore every other northbridge, we still have to * though we ignore every other northbridge, we still have to
@ -219,34 +209,12 @@ static int fam15h_power_probe(struct pci_dev *pdev,
return -ENOMEM; return -ENOMEM;
fam15h_power_init_data(pdev, data); fam15h_power_init_data(pdev, data);
data->pdev = pdev;
dev_set_drvdata(dev, data); hwmon_dev = devm_hwmon_device_register_with_groups(dev, "fam15h_power",
err = sysfs_create_group(&dev->kobj, &fam15h_power_attr_group); data,
if (err) fam15h_power_groups);
return err; 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 exit_remove_group;
}
return 0;
exit_remove_group:
sysfs_remove_group(&dev->kobj, &fam15h_power_attr_group);
return err;
}
static void fam15h_power_remove(struct pci_dev *pdev)
{
struct device *dev;
struct fam15h_power_data *data;
dev = &pdev->dev;
data = dev_get_drvdata(dev);
hwmon_device_unregister(data->hwmon_dev);
sysfs_remove_group(&dev->kobj, &fam15h_power_attr_group);
} }
static const struct pci_device_id fam15h_power_id_table[] = { static const struct pci_device_id fam15h_power_id_table[] = {
@ -260,7 +228,6 @@ static struct pci_driver fam15h_power_driver = {
.name = "fam15h_power", .name = "fam15h_power",
.id_table = fam15h_power_id_table, .id_table = fam15h_power_id_table,
.probe = fam15h_power_probe, .probe = fam15h_power_probe,
.remove = fam15h_power_remove,
.resume = fam15h_power_resume, .resume = fam15h_power_resume,
}; };