Skip to content

L
linux
Commit b69b0399 authored by Hans de Goede's avatar Hans de Goede Committed by Jean Delvare
Browse files
Options

hwmon: (f71882fg) Cleanup sysfs attr creation 2/2 

This patch merges the f71882fg_auto_pwm_attr array into the
fxxxx_fan_attr resp. fxxxx_auto_pwm_attr array, as the f71882fg_auto_pwm_attr
array was merely extending these 2 with entries for a 4th fan, it also makes
these 2 arrays 2 dimensional so that the rest of the code can choose to
add attr for 3 or 4 fans without needing to know the nr of attr per fan.
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
parent 66344aa6
Show whitespace changes
Inline Side-by-side
Showing with 52 additions and 64 deletions
drivers/hwmon/f71882fg.c
View file @ b69b0399
...@@ -416,41 +416,51 @@ static struct sensor_device_attribute_2 f8000_in_temp_attr[] = { ...@@ -416,41 +416,51 @@ static struct sensor_device_attribute_2 f8000_in_temp_attr[] = {
}; };
/* Fan / PWM attr common to all models */ /* Fan / PWM attr common to all models */
static struct sensor_device_attribute_2 fxxxx_fan_attr[] = { static struct sensor_device_attribute_2 fxxxx_fan_attr[4][6] = { {
SENSOR_ATTR_2(fan1_input, S_IRUGO, show_fan, NULL, 0, 0), SENSOR_ATTR_2(fan1_input, S_IRUGO, show_fan, NULL, 0, 0),
SENSOR_ATTR_2(fan1_full_speed, S_IRUGO|S_IWUSR, SENSOR_ATTR_2(fan1_full_speed, S_IRUGO|S_IWUSR,
show_fan_full_speed, show_fan_full_speed,
store_fan_full_speed, 0, 0), store_fan_full_speed, 0, 0),
SENSOR_ATTR_2(fan1_alarm, S_IRUGO, show_fan_alarm, NULL, 0, 0), SENSOR_ATTR_2(fan1_alarm, S_IRUGO, show_fan_alarm, NULL, 0, 0),
SENSOR_ATTR_2(fan2_input, S_IRUGO, show_fan, NULL, 0, 1),
SENSOR_ATTR_2(fan2_full_speed, S_IRUGO|S_IWUSR,
show_fan_full_speed,
store_fan_full_speed, 0, 1),
SENSOR_ATTR_2(fan2_alarm, S_IRUGO, show_fan_alarm, NULL, 0, 1),
SENSOR_ATTR_2(fan3_input, S_IRUGO, show_fan, NULL, 0, 2),
SENSOR_ATTR_2(fan3_full_speed, S_IRUGO|S_IWUSR,
show_fan_full_speed,
store_fan_full_speed, 0, 2),
SENSOR_ATTR_2(fan3_alarm, S_IRUGO, show_fan_alarm, NULL, 0, 2),
SENSOR_ATTR_2(pwm1, S_IRUGO|S_IWUSR, show_pwm, store_pwm, 0, 0), SENSOR_ATTR_2(pwm1, S_IRUGO|S_IWUSR, show_pwm, store_pwm, 0, 0),
SENSOR_ATTR_2(pwm1_enable, S_IRUGO|S_IWUSR, show_pwm_enable, SENSOR_ATTR_2(pwm1_enable, S_IRUGO|S_IWUSR, show_pwm_enable,
store_pwm_enable, 0, 0), store_pwm_enable, 0, 0),
SENSOR_ATTR_2(pwm1_interpolate, S_IRUGO|S_IWUSR, SENSOR_ATTR_2(pwm1_interpolate, S_IRUGO|S_IWUSR,
show_pwm_interpolate, store_pwm_interpolate, 0, 0), show_pwm_interpolate, store_pwm_interpolate, 0, 0),
}, {
SENSOR_ATTR_2(fan2_input, S_IRUGO, show_fan, NULL, 0, 1),
SENSOR_ATTR_2(fan2_full_speed, S_IRUGO|S_IWUSR,
show_fan_full_speed,
store_fan_full_speed, 0, 1),
SENSOR_ATTR_2(fan2_alarm, S_IRUGO, show_fan_alarm, NULL, 0, 1),
SENSOR_ATTR_2(pwm2, S_IRUGO|S_IWUSR, show_pwm, store_pwm, 0, 1), SENSOR_ATTR_2(pwm2, S_IRUGO|S_IWUSR, show_pwm, store_pwm, 0, 1),
SENSOR_ATTR_2(pwm2_enable, S_IRUGO|S_IWUSR, show_pwm_enable, SENSOR_ATTR_2(pwm2_enable, S_IRUGO|S_IWUSR, show_pwm_enable,
store_pwm_enable, 0, 1), store_pwm_enable, 0, 1),
SENSOR_ATTR_2(pwm2_interpolate, S_IRUGO|S_IWUSR, SENSOR_ATTR_2(pwm2_interpolate, S_IRUGO|S_IWUSR,
show_pwm_interpolate, store_pwm_interpolate, 0, 1), show_pwm_interpolate, store_pwm_interpolate, 0, 1),
}, {
SENSOR_ATTR_2(fan3_input, S_IRUGO, show_fan, NULL, 0, 2),
SENSOR_ATTR_2(fan3_full_speed, S_IRUGO|S_IWUSR,
show_fan_full_speed,
store_fan_full_speed, 0, 2),
SENSOR_ATTR_2(fan3_alarm, S_IRUGO, show_fan_alarm, NULL, 0, 2),
SENSOR_ATTR_2(pwm3, S_IRUGO|S_IWUSR, show_pwm, store_pwm, 0, 2), SENSOR_ATTR_2(pwm3, S_IRUGO|S_IWUSR, show_pwm, store_pwm, 0, 2),
SENSOR_ATTR_2(pwm3_enable, S_IRUGO|S_IWUSR, show_pwm_enable, SENSOR_ATTR_2(pwm3_enable, S_IRUGO|S_IWUSR, show_pwm_enable,
store_pwm_enable, 0, 2), store_pwm_enable, 0, 2),
SENSOR_ATTR_2(pwm3_interpolate, S_IRUGO|S_IWUSR, SENSOR_ATTR_2(pwm3_interpolate, S_IRUGO|S_IWUSR,
show_pwm_interpolate, store_pwm_interpolate, 0, 2), show_pwm_interpolate, store_pwm_interpolate, 0, 2),
}; }, {
SENSOR_ATTR_2(fan4_input, S_IRUGO, show_fan, NULL, 0, 3),
SENSOR_ATTR_2(fan4_full_speed, S_IRUGO|S_IWUSR,
show_fan_full_speed,
store_fan_full_speed, 0, 3),
SENSOR_ATTR_2(fan4_alarm, S_IRUGO, show_fan_alarm, NULL, 0, 3),
SENSOR_ATTR_2(pwm4, S_IRUGO|S_IWUSR, show_pwm, store_pwm, 0, 3),
SENSOR_ATTR_2(pwm4_enable, S_IRUGO|S_IWUSR, show_pwm_enable,
store_pwm_enable, 0, 3),
SENSOR_ATTR_2(pwm4_interpolate, S_IRUGO|S_IWUSR,
show_pwm_interpolate, store_pwm_interpolate, 0, 3),
} };
/* Attr for models which can beep on Fan alarm */ /* Attr for models which can beep on Fan alarm */
static struct sensor_device_attribute_2 fxxxx_fan_beep_attr[] = { static struct sensor_device_attribute_2 fxxxx_fan_beep_attr[] = {
...@@ -460,6 +470,8 @@ static struct sensor_device_attribute_2 fxxxx_fan_beep_attr[] = { ...@@ -460,6 +470,8 @@ static struct sensor_device_attribute_2 fxxxx_fan_beep_attr[] = {
store_fan_beep, 0, 1), store_fan_beep, 0, 1),
SENSOR_ATTR_2(fan3_beep, S_IRUGO|S_IWUSR, show_fan_beep, SENSOR_ATTR_2(fan3_beep, S_IRUGO|S_IWUSR, show_fan_beep,
store_fan_beep, 0, 2), store_fan_beep, 0, 2),
SENSOR_ATTR_2(fan4_beep, S_IRUGO|S_IWUSR, show_fan_beep,
store_fan_beep, 0, 3),
}; };
/* PWM attr for the f71862fg, fewer pwms and fewer zones per pwm than the /* PWM attr for the f71862fg, fewer pwms and fewer zones per pwm than the
...@@ -533,7 +545,7 @@ static struct sensor_device_attribute_2 f71862fg_auto_pwm_attr[] = { ...@@ -533,7 +545,7 @@ static struct sensor_device_attribute_2 f71862fg_auto_pwm_attr[] = {
}; };
/* PWM attr common to the f71858fg, f71882fg and f71889fg */ /* PWM attr common to the f71858fg, f71882fg and f71889fg */
static struct sensor_device_attribute_2 fxxxx_auto_pwm_attr[] = { static struct sensor_device_attribute_2 fxxxx_auto_pwm_attr[4][14] = { {
SENSOR_ATTR_2(pwm1_auto_channels_temp, S_IRUGO|S_IWUSR, SENSOR_ATTR_2(pwm1_auto_channels_temp, S_IRUGO|S_IWUSR,
show_pwm_auto_point_channel, show_pwm_auto_point_channel,
store_pwm_auto_point_channel, 0, 0), store_pwm_auto_point_channel, 0, 0),
...@@ -574,7 +586,7 @@ static struct sensor_device_attribute_2 fxxxx_auto_pwm_attr[] = { ...@@ -574,7 +586,7 @@ static struct sensor_device_attribute_2 fxxxx_auto_pwm_attr[] = {
show_pwm_auto_point_temp_hyst, NULL, 2, 0), show_pwm_auto_point_temp_hyst, NULL, 2, 0),
SENSOR_ATTR_2(pwm1_auto_point4_temp_hyst, S_IRUGO, SENSOR_ATTR_2(pwm1_auto_point4_temp_hyst, S_IRUGO,
show_pwm_auto_point_temp_hyst, NULL, 3, 0), show_pwm_auto_point_temp_hyst, NULL, 3, 0),
}, {
SENSOR_ATTR_2(pwm2_auto_channels_temp, S_IRUGO|S_IWUSR, SENSOR_ATTR_2(pwm2_auto_channels_temp, S_IRUGO|S_IWUSR,
show_pwm_auto_point_channel, show_pwm_auto_point_channel,
store_pwm_auto_point_channel, 0, 1), store_pwm_auto_point_channel, 0, 1),
...@@ -615,7 +627,7 @@ static struct sensor_device_attribute_2 fxxxx_auto_pwm_attr[] = { ...@@ -615,7 +627,7 @@ static struct sensor_device_attribute_2 fxxxx_auto_pwm_attr[] = {
show_pwm_auto_point_temp_hyst, NULL, 2, 1), show_pwm_auto_point_temp_hyst, NULL, 2, 1),
SENSOR_ATTR_2(pwm2_auto_point4_temp_hyst, S_IRUGO, SENSOR_ATTR_2(pwm2_auto_point4_temp_hyst, S_IRUGO,
show_pwm_auto_point_temp_hyst, NULL, 3, 1), show_pwm_auto_point_temp_hyst, NULL, 3, 1),
}, {
SENSOR_ATTR_2(pwm3_auto_channels_temp, S_IRUGO|S_IWUSR, SENSOR_ATTR_2(pwm3_auto_channels_temp, S_IRUGO|S_IWUSR,
show_pwm_auto_point_channel, show_pwm_auto_point_channel,
store_pwm_auto_point_channel, 0, 2), store_pwm_auto_point_channel, 0, 2),
...@@ -656,23 +668,7 @@ static struct sensor_device_attribute_2 fxxxx_auto_pwm_attr[] = { ...@@ -656,23 +668,7 @@ static struct sensor_device_attribute_2 fxxxx_auto_pwm_attr[] = {
show_pwm_auto_point_temp_hyst, NULL, 2, 2), show_pwm_auto_point_temp_hyst, NULL, 2, 2),
SENSOR_ATTR_2(pwm3_auto_point4_temp_hyst, S_IRUGO, SENSOR_ATTR_2(pwm3_auto_point4_temp_hyst, S_IRUGO,
show_pwm_auto_point_temp_hyst, NULL, 3, 2), show_pwm_auto_point_temp_hyst, NULL, 3, 2),
}; }, {
/* Fan / PWM attr found on the f71882fg but not on the f71858fg */
static struct sensor_device_attribute_2 f71882fg_auto_pwm_attr[] = {
SENSOR_ATTR_2(fan4_input, S_IRUGO, show_fan, NULL, 0, 3),
SENSOR_ATTR_2(fan4_full_speed, S_IRUGO|S_IWUSR,
show_fan_full_speed,
store_fan_full_speed, 0, 3),
SENSOR_ATTR_2(fan4_beep, S_IRUGO|S_IWUSR, show_fan_beep,
store_fan_beep, 0, 3),
SENSOR_ATTR_2(fan4_alarm, S_IRUGO, show_fan_alarm, NULL, 0, 3),
SENSOR_ATTR_2(pwm4, S_IRUGO|S_IWUSR, show_pwm, store_pwm, 0, 3),
SENSOR_ATTR_2(pwm4_enable, S_IRUGO|S_IWUSR, show_pwm_enable,
store_pwm_enable, 0, 3),
SENSOR_ATTR_2(pwm4_interpolate, S_IRUGO|S_IWUSR,
show_pwm_interpolate, store_pwm_interpolate, 0, 3),
SENSOR_ATTR_2(pwm4_auto_channels_temp, S_IRUGO|S_IWUSR, SENSOR_ATTR_2(pwm4_auto_channels_temp, S_IRUGO|S_IWUSR,
show_pwm_auto_point_channel, show_pwm_auto_point_channel,
store_pwm_auto_point_channel, 0, 3), store_pwm_auto_point_channel, 0, 3),
...@@ -713,7 +709,7 @@ static struct sensor_device_attribute_2 f71882fg_auto_pwm_attr[] = { ...@@ -713,7 +709,7 @@ static struct sensor_device_attribute_2 f71882fg_auto_pwm_attr[] = {
show_pwm_auto_point_temp_hyst, NULL, 2, 3), show_pwm_auto_point_temp_hyst, NULL, 2, 3),
SENSOR_ATTR_2(pwm4_auto_point4_temp_hyst, S_IRUGO, SENSOR_ATTR_2(pwm4_auto_point4_temp_hyst, S_IRUGO,
show_pwm_auto_point_temp_hyst, NULL, 3, 3), show_pwm_auto_point_temp_hyst, NULL, 3, 3),
}; } };
/* Fan attr specific to the f8000 (4th fan input can only measure speed) */ /* Fan attr specific to the f8000 (4th fan input can only measure speed) */
static struct sensor_device_attribute_2 f8000_fan_attr[] = { static struct sensor_device_attribute_2 f8000_fan_attr[] = {
...@@ -1917,39 +1913,24 @@ static int __devinit f71882fg_probe(struct platform_device *pdev) ...@@ -1917,39 +1913,24 @@ static int __devinit f71882fg_probe(struct platform_device *pdev)
goto exit_unregister_sysfs; goto exit_unregister_sysfs;
} }
err = f71882fg_create_sysfs_files(pdev, fxxxx_fan_attr, err = f71882fg_create_sysfs_files(pdev, &fxxxx_fan_attr[0][0],
ARRAY_SIZE(fxxxx_fan_attr)); ARRAY_SIZE(fxxxx_fan_attr[0]) * nr_fans);
if (err) if (err)
goto exit_unregister_sysfs; goto exit_unregister_sysfs;
switch (data->type) { if (data->type == f71862fg || data->type == f71882fg) {
case f71862fg:
err = f71882fg_create_sysfs_files(pdev, err = f71882fg_create_sysfs_files(pdev,
fxxxx_fan_beep_attr, fxxxx_fan_beep_attr, nr_fans);
ARRAY_SIZE(fxxxx_fan_beep_attr));
if (err) if (err)
goto exit_unregister_sysfs; goto exit_unregister_sysfs;
}
switch (data->type) {
case f71862fg:
err = f71882fg_create_sysfs_files(pdev, err = f71882fg_create_sysfs_files(pdev,
f71862fg_auto_pwm_attr, f71862fg_auto_pwm_attr,
ARRAY_SIZE(f71862fg_auto_pwm_attr)); ARRAY_SIZE(f71862fg_auto_pwm_attr));
break; break;
case f71882fg:
err = f71882fg_create_sysfs_files(pdev,
fxxxx_fan_beep_attr,
ARRAY_SIZE(fxxxx_fan_beep_attr));
if (err)
goto exit_unregister_sysfs;
err = f71882fg_create_sysfs_files(pdev,
f71882fg_auto_pwm_attr,
ARRAY_SIZE(f71882fg_auto_pwm_attr));
if (err)
goto exit_unregister_sysfs;
/* fall through! */
case f71858fg:
err = f71882fg_create_sysfs_files(pdev,
fxxxx_auto_pwm_attr,
ARRAY_SIZE(fxxxx_auto_pwm_attr));
break;
case f8000: case f8000:
err = f71882fg_create_sysfs_files(pdev, err = f71882fg_create_sysfs_files(pdev,
f8000_fan_attr, f8000_fan_attr,
...@@ -1960,6 +1941,10 @@ static int __devinit f71882fg_probe(struct platform_device *pdev) ...@@ -1960,6 +1941,10 @@ static int __devinit f71882fg_probe(struct platform_device *pdev)
f8000_auto_pwm_attr, f8000_auto_pwm_attr,
ARRAY_SIZE(f8000_auto_pwm_attr)); ARRAY_SIZE(f8000_auto_pwm_attr));
break; break;
default: /* f71858fg / f71882fg */
err = f71882fg_create_sysfs_files(pdev,
&fxxxx_auto_pwm_attr[0][0],
ARRAY_SIZE(fxxxx_auto_pwm_attr[0]) * nr_fans);
} }
if (err) if (err)
goto exit_unregister_sysfs; goto exit_unregister_sysfs;
...@@ -1989,7 +1974,7 @@ static int __devinit f71882fg_probe(struct platform_device *pdev) ...@@ -1989,7 +1974,7 @@ static int __devinit f71882fg_probe(struct platform_device *pdev)
static int f71882fg_remove(struct platform_device *pdev) static int f71882fg_remove(struct platform_device *pdev)
{ {
int i; int i, j;
struct f71882fg_data *data = platform_get_drvdata(pdev); struct f71882fg_data *data = platform_get_drvdata(pdev);
platform_set_drvdata(pdev, NULL); platform_set_drvdata(pdev, NULL);
...@@ -2009,15 +1994,18 @@ static int f71882fg_remove(struct platform_device *pdev) ...@@ -2009,15 +1994,18 @@ static int f71882fg_remove(struct platform_device *pdev)
&fxxxx_in1_alarm_attr[i].dev_attr); &fxxxx_in1_alarm_attr[i].dev_attr);
for (i = 0; i < ARRAY_SIZE(fxxxx_fan_attr); i++) for (i = 0; i < ARRAY_SIZE(fxxxx_fan_attr); i++)
device_remove_file(&pdev->dev, &fxxxx_fan_attr[i].dev_attr); for (j = 0; j < ARRAY_SIZE(fxxxx_fan_attr[0]); j++)
device_remove_file(&pdev->dev,
&fxxxx_fan_attr[i][j].dev_attr);
for (i = 0; i < ARRAY_SIZE(fxxxx_fan_beep_attr); i++) for (i = 0; i < ARRAY_SIZE(fxxxx_fan_beep_attr); i++)
device_remove_file(&pdev->dev, device_remove_file(&pdev->dev,
&fxxxx_fan_beep_attr[i].dev_attr); &fxxxx_fan_beep_attr[i].dev_attr);
for (i = 0; i < ARRAY_SIZE(f71882fg_auto_pwm_attr); i++) for (i = 0; i < ARRAY_SIZE(fxxxx_auto_pwm_attr); i++)
for (j = 0; j < ARRAY_SIZE(fxxxx_auto_pwm_attr[0]); j++)
device_remove_file(&pdev->dev, device_remove_file(&pdev->dev,
&f71882fg_auto_pwm_attr[i].dev_attr); &fxxxx_auto_pwm_attr[i][j].dev_attr);
for (i = 0; i < ARRAY_SIZE(f8000_auto_pwm_attr); i++) for (i = 0; i < ARRAY_SIZE(f8000_auto_pwm_attr); i++)
device_remove_file(&pdev->dev, device_remove_file(&pdev->dev,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7