forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

hwmon: (nct6775) Remove num_attr_groups from struct nct6775_data

Browse source 
num_attr_groups is only used in nct6775_probe(), make it to be local variable.

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-07-24 08:59:34 +08:00 • committed by Guenter Roeck
parent 78313b9542
commit 55bdee69cd
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
drivers/hwmon/nct6775.c
View file

@ -735,7 +735,6 @@ struct nct6775_data {
enum kinds kind; enum kinds kind;
const char *name; const char *name;
int num_attr_groups;
const struct attribute_group *groups[6]; const struct attribute_group *groups[6];
u16 reg_temp[5][NUM_TEMP]; /* 0=temp, 1=temp_over, 2=temp_hyst, u16 reg_temp[5][NUM_TEMP]; /* 0=temp, 1=temp_over, 2=temp_hyst,
@ -3276,6 +3275,7 @@ static int nct6775_probe(struct platform_device *pdev)
u8 cr2a; u8 cr2a;
struct attribute_group *group; struct attribute_group *group;
struct device *hwmon_dev; struct device *hwmon_dev;
int num_attr_groups = 0;
res = platform_get_resource(pdev, IORESOURCE_IO, 0); res = platform_get_resource(pdev, IORESOURCE_IO, 0);
if (!devm_request_region(&pdev->dev, res->start, IOREGION_LENGTH, if (!devm_request_region(&pdev->dev, res->start, IOREGION_LENGTH,
@ -3907,29 +3907,29 @@ static int nct6775_probe(struct platform_device *pdev)
if (IS_ERR(group)) if (IS_ERR(group))
return PTR_ERR(group); return PTR_ERR(group);
data->groups[data->num_attr_groups++] = group; data->groups[num_attr_groups++] = group;
group = nct6775_create_attr_group(dev, &nct6775_in_template_group, group = nct6775_create_attr_group(dev, &nct6775_in_template_group,
fls(data->have_in)); fls(data->have_in));
if (IS_ERR(group)) if (IS_ERR(group))
return PTR_ERR(group); return PTR_ERR(group);
data->groups[data->num_attr_groups++] = group; data->groups[num_attr_groups++] = group;
group = nct6775_create_attr_group(dev, &nct6775_fan_template_group, group = nct6775_create_attr_group(dev, &nct6775_fan_template_group,
fls(data->has_fan)); fls(data->has_fan));
if (IS_ERR(group)) if (IS_ERR(group))
return PTR_ERR(group); return PTR_ERR(group);
data->groups[data->num_attr_groups++] = group; data->groups[num_attr_groups++] = group;
group = nct6775_create_attr_group(dev, &nct6775_temp_template_group, group = nct6775_create_attr_group(dev, &nct6775_temp_template_group,
fls(data->have_temp)); fls(data->have_temp));
if (IS_ERR(group)) if (IS_ERR(group))
return PTR_ERR(group); return PTR_ERR(group);
data->groups[data->num_attr_groups++] = group; data->groups[num_attr_groups++] = group;
data->groups[data->num_attr_groups++] = &nct6775_group_other; data->groups[num_attr_groups++] = &nct6775_group_other;
hwmon_dev = devm_hwmon_device_register_with_groups(dev, data->name, hwmon_dev = devm_hwmon_device_register_with_groups(dev, data->name,
data, data->groups); data, data->groups);