hwmon: Fix unchecked return status, batch 2
hwmon: Fix unchecked return status, batch 2 Fix up some hwmon drivers so that they no longer ignore return status from device_create_file(). Signed-off-by: Mark M. Hoffman <mhoffman@lightlink.com> Signed-off-by: Jean Delvare <khali@linux-fr.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Mark M. Hoffman
Greg Kroah-Hartman
parent
c18beb5b92
commit
0501a3816e
5 changed files with 340 additions and 180 deletions
|
|
@ -212,6 +212,23 @@ static int lm77_attach_adapter(struct i2c_adapter *adapter)
|
|||
return i2c_probe(adapter, &addr_data, lm77_detect);
|
||||
}
|
||||
|
||||
static struct attribute *lm77_attributes[] = {
|
||||
&dev_attr_temp1_input.attr,
|
||||
&dev_attr_temp1_crit.attr,
|
||||
&dev_attr_temp1_min.attr,
|
||||
&dev_attr_temp1_max.attr,
|
||||
&dev_attr_temp1_crit_hyst.attr,
|
||||
&dev_attr_temp1_min_hyst.attr,
|
||||
&dev_attr_temp1_max_hyst.attr,
|
||||
&dev_attr_alarms.attr,
|
||||
|
||||
NULL
|
||||
};
|
||||
|
||||
static const struct attribute_group lm77_group = {
|
||||
.attrs = lm77_attributes,
|
||||
};
|
||||
|
||||
/* This function is called by i2c_probe */
|
||||
static int lm77_detect(struct i2c_adapter *adapter, int address, int kind)
|
||||
{
|
||||
|
|
@ -317,22 +334,19 @@ static int lm77_detect(struct i2c_adapter *adapter, int address, int kind)
|
|||
lm77_init_client(new_client);
|
||||
|
||||
/* Register sysfs hooks */
|
||||
if ((err = sysfs_create_group(&new_client->dev.kobj, &lm77_group)))
|
||||
goto exit_detach;
|
||||
|
||||
data->class_dev = hwmon_device_register(&new_client->dev);
|
||||
if (IS_ERR(data->class_dev)) {
|
||||
err = PTR_ERR(data->class_dev);
|
||||
goto exit_detach;
|
||||
goto exit_remove;
|
||||
}
|
||||
|
||||
device_create_file(&new_client->dev, &dev_attr_temp1_input);
|
||||
device_create_file(&new_client->dev, &dev_attr_temp1_crit);
|
||||
device_create_file(&new_client->dev, &dev_attr_temp1_min);
|
||||
device_create_file(&new_client->dev, &dev_attr_temp1_max);
|
||||
device_create_file(&new_client->dev, &dev_attr_temp1_crit_hyst);
|
||||
device_create_file(&new_client->dev, &dev_attr_temp1_min_hyst);
|
||||
device_create_file(&new_client->dev, &dev_attr_temp1_max_hyst);
|
||||
device_create_file(&new_client->dev, &dev_attr_alarms);
|
||||
return 0;
|
||||
|
||||
exit_remove:
|
||||
sysfs_remove_group(&new_client->dev.kobj, &lm77_group);
|
||||
exit_detach:
|
||||
i2c_detach_client(new_client);
|
||||
exit_free:
|
||||
|
|
@ -345,6 +359,7 @@ static int lm77_detach_client(struct i2c_client *client)
|
|||
{
|
||||
struct lm77_data *data = i2c_get_clientdata(client);
|
||||
hwmon_device_unregister(data->class_dev);
|
||||
sysfs_remove_group(&client->dev.kobj, &lm77_group);
|
||||
i2c_detach_client(client);
|
||||
kfree(data);
|
||||
return 0;
|
||||
|
|
|
|||
|
|
@ -394,6 +394,48 @@ static int lm80_attach_adapter(struct i2c_adapter *adapter)
|
|||
return i2c_probe(adapter, &addr_data, lm80_detect);
|
||||
}
|
||||
|
||||
static struct attribute *lm80_attributes[] = {
|
||||
&dev_attr_in0_min.attr,
|
||||
&dev_attr_in1_min.attr,
|
||||
&dev_attr_in2_min.attr,
|
||||
&dev_attr_in3_min.attr,
|
||||
&dev_attr_in4_min.attr,
|
||||
&dev_attr_in5_min.attr,
|
||||
&dev_attr_in6_min.attr,
|
||||
&dev_attr_in0_max.attr,
|
||||
&dev_attr_in1_max.attr,
|
||||
&dev_attr_in2_max.attr,
|
||||
&dev_attr_in3_max.attr,
|
||||
&dev_attr_in4_max.attr,
|
||||
&dev_attr_in5_max.attr,
|
||||
&dev_attr_in6_max.attr,
|
||||
&dev_attr_in0_input.attr,
|
||||
&dev_attr_in1_input.attr,
|
||||
&dev_attr_in2_input.attr,
|
||||
&dev_attr_in3_input.attr,
|
||||
&dev_attr_in4_input.attr,
|
||||
&dev_attr_in5_input.attr,
|
||||
&dev_attr_in6_input.attr,
|
||||
&dev_attr_fan1_min.attr,
|
||||
&dev_attr_fan2_min.attr,
|
||||
&dev_attr_fan1_input.attr,
|
||||
&dev_attr_fan2_input.attr,
|
||||
&dev_attr_fan1_div.attr,
|
||||
&dev_attr_fan2_div.attr,
|
||||
&dev_attr_temp1_input.attr,
|
||||
&dev_attr_temp1_max.attr,
|
||||
&dev_attr_temp1_max_hyst.attr,
|
||||
&dev_attr_temp1_crit.attr,
|
||||
&dev_attr_temp1_crit_hyst.attr,
|
||||
&dev_attr_alarms.attr,
|
||||
|
||||
NULL
|
||||
};
|
||||
|
||||
static const struct attribute_group lm80_group = {
|
||||
.attrs = lm80_attributes,
|
||||
};
|
||||
|
||||
static int lm80_detect(struct i2c_adapter *adapter, int address, int kind)
|
||||
{
|
||||
int i, cur;
|
||||
|
|
@ -452,48 +494,19 @@ static int lm80_detect(struct i2c_adapter *adapter, int address, int kind)
|
|||
data->fan_min[1] = lm80_read_value(new_client, LM80_REG_FAN_MIN(2));
|
||||
|
||||
/* Register sysfs hooks */
|
||||
if ((err = sysfs_create_group(&new_client->dev.kobj, &lm80_group)))
|
||||
goto error_detach;
|
||||
|
||||
data->class_dev = hwmon_device_register(&new_client->dev);
|
||||
if (IS_ERR(data->class_dev)) {
|
||||
err = PTR_ERR(data->class_dev);
|
||||
goto error_detach;
|
||||
goto error_remove;
|
||||
}
|
||||
|
||||
device_create_file(&new_client->dev, &dev_attr_in0_min);
|
||||
device_create_file(&new_client->dev, &dev_attr_in1_min);
|
||||
device_create_file(&new_client->dev, &dev_attr_in2_min);
|
||||
device_create_file(&new_client->dev, &dev_attr_in3_min);
|
||||
device_create_file(&new_client->dev, &dev_attr_in4_min);
|
||||
device_create_file(&new_client->dev, &dev_attr_in5_min);
|
||||
device_create_file(&new_client->dev, &dev_attr_in6_min);
|
||||
device_create_file(&new_client->dev, &dev_attr_in0_max);
|
||||
device_create_file(&new_client->dev, &dev_attr_in1_max);
|
||||
device_create_file(&new_client->dev, &dev_attr_in2_max);
|
||||
device_create_file(&new_client->dev, &dev_attr_in3_max);
|
||||
device_create_file(&new_client->dev, &dev_attr_in4_max);
|
||||
device_create_file(&new_client->dev, &dev_attr_in5_max);
|
||||
device_create_file(&new_client->dev, &dev_attr_in6_max);
|
||||
device_create_file(&new_client->dev, &dev_attr_in0_input);
|
||||
device_create_file(&new_client->dev, &dev_attr_in1_input);
|
||||
device_create_file(&new_client->dev, &dev_attr_in2_input);
|
||||
device_create_file(&new_client->dev, &dev_attr_in3_input);
|
||||
device_create_file(&new_client->dev, &dev_attr_in4_input);
|
||||
device_create_file(&new_client->dev, &dev_attr_in5_input);
|
||||
device_create_file(&new_client->dev, &dev_attr_in6_input);
|
||||
device_create_file(&new_client->dev, &dev_attr_fan1_min);
|
||||
device_create_file(&new_client->dev, &dev_attr_fan2_min);
|
||||
device_create_file(&new_client->dev, &dev_attr_fan1_input);
|
||||
device_create_file(&new_client->dev, &dev_attr_fan2_input);
|
||||
device_create_file(&new_client->dev, &dev_attr_fan1_div);
|
||||
device_create_file(&new_client->dev, &dev_attr_fan2_div);
|
||||
device_create_file(&new_client->dev, &dev_attr_temp1_input);
|
||||
device_create_file(&new_client->dev, &dev_attr_temp1_max);
|
||||
device_create_file(&new_client->dev, &dev_attr_temp1_max_hyst);
|
||||
device_create_file(&new_client->dev, &dev_attr_temp1_crit);
|
||||
device_create_file(&new_client->dev, &dev_attr_temp1_crit_hyst);
|
||||
device_create_file(&new_client->dev, &dev_attr_alarms);
|
||||
|
||||
return 0;
|
||||
|
||||
error_remove:
|
||||
sysfs_remove_group(&new_client->dev.kobj, &lm80_group);
|
||||
error_detach:
|
||||
i2c_detach_client(new_client);
|
||||
error_free:
|
||||
|
|
@ -508,7 +521,7 @@ static int lm80_detach_client(struct i2c_client *client)
|
|||
int err;
|
||||
|
||||
hwmon_device_unregister(data->class_dev);
|
||||
|
||||
sysfs_remove_group(&client->dev.kobj, &lm80_group);
|
||||
if ((err = i2c_detach_client(client)))
|
||||
return err;
|
||||
|
||||
|
|
|
|||
|
|
@ -1025,6 +1025,89 @@ static int lm85_attach_adapter(struct i2c_adapter *adapter)
|
|||
return i2c_probe(adapter, &addr_data, lm85_detect);
|
||||
}
|
||||
|
||||
static struct attribute *lm85_attributes[] = {
|
||||
&dev_attr_fan1_input.attr,
|
||||
&dev_attr_fan2_input.attr,
|
||||
&dev_attr_fan3_input.attr,
|
||||
&dev_attr_fan4_input.attr,
|
||||
&dev_attr_fan1_min.attr,
|
||||
&dev_attr_fan2_min.attr,
|
||||
&dev_attr_fan3_min.attr,
|
||||
&dev_attr_fan4_min.attr,
|
||||
&dev_attr_pwm1.attr,
|
||||
&dev_attr_pwm2.attr,
|
||||
&dev_attr_pwm3.attr,
|
||||
&dev_attr_pwm1_enable.attr,
|
||||
&dev_attr_pwm2_enable.attr,
|
||||
&dev_attr_pwm3_enable.attr,
|
||||
&dev_attr_in0_input.attr,
|
||||
&dev_attr_in1_input.attr,
|
||||
&dev_attr_in2_input.attr,
|
||||
&dev_attr_in3_input.attr,
|
||||
&dev_attr_in0_min.attr,
|
||||
&dev_attr_in1_min.attr,
|
||||
&dev_attr_in2_min.attr,
|
||||
&dev_attr_in3_min.attr,
|
||||
&dev_attr_in0_max.attr,
|
||||
&dev_attr_in1_max.attr,
|
||||
&dev_attr_in2_max.attr,
|
||||
&dev_attr_in3_max.attr,
|
||||
&dev_attr_temp1_input.attr,
|
||||
&dev_attr_temp2_input.attr,
|
||||
&dev_attr_temp3_input.attr,
|
||||
&dev_attr_temp1_min.attr,
|
||||
&dev_attr_temp2_min.attr,
|
||||
&dev_attr_temp3_min.attr,
|
||||
&dev_attr_temp1_max.attr,
|
||||
&dev_attr_temp2_max.attr,
|
||||
&dev_attr_temp3_max.attr,
|
||||
&dev_attr_vrm.attr,
|
||||
&dev_attr_cpu0_vid.attr,
|
||||
&dev_attr_alarms.attr,
|
||||
&dev_attr_pwm1_auto_channels.attr,
|
||||
&dev_attr_pwm2_auto_channels.attr,
|
||||
&dev_attr_pwm3_auto_channels.attr,
|
||||
&dev_attr_pwm1_auto_pwm_min.attr,
|
||||
&dev_attr_pwm2_auto_pwm_min.attr,
|
||||
&dev_attr_pwm3_auto_pwm_min.attr,
|
||||
&dev_attr_pwm1_auto_pwm_minctl.attr,
|
||||
&dev_attr_pwm2_auto_pwm_minctl.attr,
|
||||
&dev_attr_pwm3_auto_pwm_minctl.attr,
|
||||
&dev_attr_pwm1_auto_pwm_freq.attr,
|
||||
&dev_attr_pwm2_auto_pwm_freq.attr,
|
||||
&dev_attr_pwm3_auto_pwm_freq.attr,
|
||||
&dev_attr_temp1_auto_temp_off.attr,
|
||||
&dev_attr_temp2_auto_temp_off.attr,
|
||||
&dev_attr_temp3_auto_temp_off.attr,
|
||||
&dev_attr_temp1_auto_temp_min.attr,
|
||||
&dev_attr_temp2_auto_temp_min.attr,
|
||||
&dev_attr_temp3_auto_temp_min.attr,
|
||||
&dev_attr_temp1_auto_temp_max.attr,
|
||||
&dev_attr_temp2_auto_temp_max.attr,
|
||||
&dev_attr_temp3_auto_temp_max.attr,
|
||||
&dev_attr_temp1_auto_temp_crit.attr,
|
||||
&dev_attr_temp2_auto_temp_crit.attr,
|
||||
&dev_attr_temp3_auto_temp_crit.attr,
|
||||
|
||||
NULL
|
||||
};
|
||||
|
||||
static const struct attribute_group lm85_group = {
|
||||
.attrs = lm85_attributes,
|
||||
};
|
||||
|
||||
static struct attribute *lm85_attributes_opt[] = {
|
||||
&dev_attr_in4_input.attr,
|
||||
&dev_attr_in4_min.attr,
|
||||
&dev_attr_in4_max.attr,
|
||||
|
||||
NULL
|
||||
};
|
||||
|
||||
static const struct attribute_group lm85_group_opt = {
|
||||
.attrs = lm85_attributes_opt,
|
||||
};
|
||||
|
||||
static int lm85_detect(struct i2c_adapter *adapter, int address,
|
||||
int kind)
|
||||
{
|
||||
|
|
@ -1163,87 +1246,33 @@ static int lm85_detect(struct i2c_adapter *adapter, int address,
|
|||
lm85_init_client(new_client);
|
||||
|
||||
/* Register sysfs hooks */
|
||||
data->class_dev = hwmon_device_register(&new_client->dev);
|
||||
if (IS_ERR(data->class_dev)) {
|
||||
err = PTR_ERR(data->class_dev);
|
||||
if ((err = sysfs_create_group(&new_client->dev.kobj, &lm85_group)))
|
||||
goto ERROR2;
|
||||
}
|
||||
|
||||
device_create_file(&new_client->dev, &dev_attr_fan1_input);
|
||||
device_create_file(&new_client->dev, &dev_attr_fan2_input);
|
||||
device_create_file(&new_client->dev, &dev_attr_fan3_input);
|
||||
device_create_file(&new_client->dev, &dev_attr_fan4_input);
|
||||
device_create_file(&new_client->dev, &dev_attr_fan1_min);
|
||||
device_create_file(&new_client->dev, &dev_attr_fan2_min);
|
||||
device_create_file(&new_client->dev, &dev_attr_fan3_min);
|
||||
device_create_file(&new_client->dev, &dev_attr_fan4_min);
|
||||
device_create_file(&new_client->dev, &dev_attr_pwm1);
|
||||
device_create_file(&new_client->dev, &dev_attr_pwm2);
|
||||
device_create_file(&new_client->dev, &dev_attr_pwm3);
|
||||
device_create_file(&new_client->dev, &dev_attr_pwm1_enable);
|
||||
device_create_file(&new_client->dev, &dev_attr_pwm2_enable);
|
||||
device_create_file(&new_client->dev, &dev_attr_pwm3_enable);
|
||||
device_create_file(&new_client->dev, &dev_attr_in0_input);
|
||||
device_create_file(&new_client->dev, &dev_attr_in1_input);
|
||||
device_create_file(&new_client->dev, &dev_attr_in2_input);
|
||||
device_create_file(&new_client->dev, &dev_attr_in3_input);
|
||||
device_create_file(&new_client->dev, &dev_attr_in0_min);
|
||||
device_create_file(&new_client->dev, &dev_attr_in1_min);
|
||||
device_create_file(&new_client->dev, &dev_attr_in2_min);
|
||||
device_create_file(&new_client->dev, &dev_attr_in3_min);
|
||||
device_create_file(&new_client->dev, &dev_attr_in0_max);
|
||||
device_create_file(&new_client->dev, &dev_attr_in1_max);
|
||||
device_create_file(&new_client->dev, &dev_attr_in2_max);
|
||||
device_create_file(&new_client->dev, &dev_attr_in3_max);
|
||||
device_create_file(&new_client->dev, &dev_attr_temp1_input);
|
||||
device_create_file(&new_client->dev, &dev_attr_temp2_input);
|
||||
device_create_file(&new_client->dev, &dev_attr_temp3_input);
|
||||
device_create_file(&new_client->dev, &dev_attr_temp1_min);
|
||||
device_create_file(&new_client->dev, &dev_attr_temp2_min);
|
||||
device_create_file(&new_client->dev, &dev_attr_temp3_min);
|
||||
device_create_file(&new_client->dev, &dev_attr_temp1_max);
|
||||
device_create_file(&new_client->dev, &dev_attr_temp2_max);
|
||||
device_create_file(&new_client->dev, &dev_attr_temp3_max);
|
||||
device_create_file(&new_client->dev, &dev_attr_vrm);
|
||||
device_create_file(&new_client->dev, &dev_attr_cpu0_vid);
|
||||
device_create_file(&new_client->dev, &dev_attr_alarms);
|
||||
device_create_file(&new_client->dev, &dev_attr_pwm1_auto_channels);
|
||||
device_create_file(&new_client->dev, &dev_attr_pwm2_auto_channels);
|
||||
device_create_file(&new_client->dev, &dev_attr_pwm3_auto_channels);
|
||||
device_create_file(&new_client->dev, &dev_attr_pwm1_auto_pwm_min);
|
||||
device_create_file(&new_client->dev, &dev_attr_pwm2_auto_pwm_min);
|
||||
device_create_file(&new_client->dev, &dev_attr_pwm3_auto_pwm_min);
|
||||
device_create_file(&new_client->dev, &dev_attr_pwm1_auto_pwm_minctl);
|
||||
device_create_file(&new_client->dev, &dev_attr_pwm2_auto_pwm_minctl);
|
||||
device_create_file(&new_client->dev, &dev_attr_pwm3_auto_pwm_minctl);
|
||||
device_create_file(&new_client->dev, &dev_attr_pwm1_auto_pwm_freq);
|
||||
device_create_file(&new_client->dev, &dev_attr_pwm2_auto_pwm_freq);
|
||||
device_create_file(&new_client->dev, &dev_attr_pwm3_auto_pwm_freq);
|
||||
device_create_file(&new_client->dev, &dev_attr_temp1_auto_temp_off);
|
||||
device_create_file(&new_client->dev, &dev_attr_temp2_auto_temp_off);
|
||||
device_create_file(&new_client->dev, &dev_attr_temp3_auto_temp_off);
|
||||
device_create_file(&new_client->dev, &dev_attr_temp1_auto_temp_min);
|
||||
device_create_file(&new_client->dev, &dev_attr_temp2_auto_temp_min);
|
||||
device_create_file(&new_client->dev, &dev_attr_temp3_auto_temp_min);
|
||||
device_create_file(&new_client->dev, &dev_attr_temp1_auto_temp_max);
|
||||
device_create_file(&new_client->dev, &dev_attr_temp2_auto_temp_max);
|
||||
device_create_file(&new_client->dev, &dev_attr_temp3_auto_temp_max);
|
||||
device_create_file(&new_client->dev, &dev_attr_temp1_auto_temp_crit);
|
||||
device_create_file(&new_client->dev, &dev_attr_temp2_auto_temp_crit);
|
||||
device_create_file(&new_client->dev, &dev_attr_temp3_auto_temp_crit);
|
||||
|
||||
/* The ADT7463 has an optional VRM 10 mode where pin 21 is used
|
||||
as a sixth digital VID input rather than an analog input. */
|
||||
data->vid = lm85_read_value(new_client, LM85_REG_VID);
|
||||
if (!(kind == adt7463 && (data->vid & 0x80))) {
|
||||
device_create_file(&new_client->dev, &dev_attr_in4_input);
|
||||
device_create_file(&new_client->dev, &dev_attr_in4_min);
|
||||
device_create_file(&new_client->dev, &dev_attr_in4_max);
|
||||
if (!(kind == adt7463 && (data->vid & 0x80)))
|
||||
if ((err = device_create_file(&new_client->dev,
|
||||
&dev_attr_in4_input))
|
||||
|| (err = device_create_file(&new_client->dev,
|
||||
&dev_attr_in4_min))
|
||||
|| (err = device_create_file(&new_client->dev,
|
||||
&dev_attr_in4_max)))
|
||||
goto ERROR3;
|
||||
|
||||
data->class_dev = hwmon_device_register(&new_client->dev);
|
||||
if (IS_ERR(data->class_dev)) {
|
||||
err = PTR_ERR(data->class_dev);
|
||||
goto ERROR3;
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
||||
/* Error out and cleanup code */
|
||||
ERROR3:
|
||||
sysfs_remove_group(&new_client->dev.kobj, &lm85_group);
|
||||
sysfs_remove_group(&new_client->dev.kobj, &lm85_group_opt);
|
||||
ERROR2:
|
||||
i2c_detach_client(new_client);
|
||||
ERROR1:
|
||||
|
|
@ -1256,6 +1285,8 @@ static int lm85_detach_client(struct i2c_client *client)
|
|||
{
|
||||
struct lm85_data *data = i2c_get_clientdata(client);
|
||||
hwmon_device_unregister(data->class_dev);
|
||||
sysfs_remove_group(&client->dev.kobj, &lm85_group);
|
||||
sysfs_remove_group(&client->dev.kobj, &lm85_group_opt);
|
||||
i2c_detach_client(client);
|
||||
kfree(data);
|
||||
return 0;
|
||||
|
|
|
|||
|
|
@ -542,6 +542,78 @@ static int lm87_attach_adapter(struct i2c_adapter *adapter)
|
|||
return i2c_probe(adapter, &addr_data, lm87_detect);
|
||||
}
|
||||
|
||||
static struct attribute *lm87_attributes[] = {
|
||||
&dev_attr_in1_input.attr,
|
||||
&dev_attr_in1_min.attr,
|
||||
&dev_attr_in1_max.attr,
|
||||
&dev_attr_in2_input.attr,
|
||||
&dev_attr_in2_min.attr,
|
||||
&dev_attr_in2_max.attr,
|
||||
&dev_attr_in3_input.attr,
|
||||
&dev_attr_in3_min.attr,
|
||||
&dev_attr_in3_max.attr,
|
||||
&dev_attr_in4_input.attr,
|
||||
&dev_attr_in4_min.attr,
|
||||
&dev_attr_in4_max.attr,
|
||||
|
||||
&dev_attr_temp1_input.attr,
|
||||
&dev_attr_temp1_max.attr,
|
||||
&dev_attr_temp1_min.attr,
|
||||
&dev_attr_temp1_crit.attr,
|
||||
&dev_attr_temp2_input.attr,
|
||||
&dev_attr_temp2_max.attr,
|
||||
&dev_attr_temp2_min.attr,
|
||||
&dev_attr_temp2_crit.attr,
|
||||
|
||||
&dev_attr_alarms.attr,
|
||||
&dev_attr_aout_output.attr,
|
||||
|
||||
NULL
|
||||
};
|
||||
|
||||
static const struct attribute_group lm87_group = {
|
||||
.attrs = lm87_attributes,
|
||||
};
|
||||
|
||||
static struct attribute *lm87_attributes_opt[] = {
|
||||
&dev_attr_in6_input.attr,
|
||||
&dev_attr_in6_min.attr,
|
||||
&dev_attr_in6_max.attr,
|
||||
|
||||
&dev_attr_fan1_input.attr,
|
||||
&dev_attr_fan1_min.attr,
|
||||
&dev_attr_fan1_div.attr,
|
||||
|
||||
&dev_attr_in7_input.attr,
|
||||
&dev_attr_in7_min.attr,
|
||||
&dev_attr_in7_max.attr,
|
||||
|
||||
&dev_attr_fan2_input.attr,
|
||||
&dev_attr_fan2_min.attr,
|
||||
&dev_attr_fan2_div.attr,
|
||||
|
||||
&dev_attr_temp3_input.attr,
|
||||
&dev_attr_temp3_max.attr,
|
||||
&dev_attr_temp3_min.attr,
|
||||
&dev_attr_temp3_crit.attr,
|
||||
|
||||
&dev_attr_in0_input.attr,
|
||||
&dev_attr_in0_min.attr,
|
||||
&dev_attr_in0_max.attr,
|
||||
&dev_attr_in5_input.attr,
|
||||
&dev_attr_in5_min.attr,
|
||||
&dev_attr_in5_max.attr,
|
||||
|
||||
&dev_attr_cpu0_vid.attr,
|
||||
&dev_attr_vrm.attr,
|
||||
|
||||
NULL
|
||||
};
|
||||
|
||||
static const struct attribute_group lm87_group_opt = {
|
||||
.attrs = lm87_attributes_opt,
|
||||
};
|
||||
|
||||
/*
|
||||
* The following function does more than just detection. If detection
|
||||
* succeeds, it also registers the new chip.
|
||||
|
|
@ -609,77 +681,90 @@ static int lm87_detect(struct i2c_adapter *adapter, int address, int kind)
|
|||
data->in_scale[7] = 1875;
|
||||
|
||||
/* Register sysfs hooks */
|
||||
data->class_dev = hwmon_device_register(&new_client->dev);
|
||||
if (IS_ERR(data->class_dev)) {
|
||||
err = PTR_ERR(data->class_dev);
|
||||
if ((err = sysfs_create_group(&new_client->dev.kobj, &lm87_group)))
|
||||
goto exit_detach;
|
||||
}
|
||||
|
||||
device_create_file(&new_client->dev, &dev_attr_in1_input);
|
||||
device_create_file(&new_client->dev, &dev_attr_in1_min);
|
||||
device_create_file(&new_client->dev, &dev_attr_in1_max);
|
||||
device_create_file(&new_client->dev, &dev_attr_in2_input);
|
||||
device_create_file(&new_client->dev, &dev_attr_in2_min);
|
||||
device_create_file(&new_client->dev, &dev_attr_in2_max);
|
||||
device_create_file(&new_client->dev, &dev_attr_in3_input);
|
||||
device_create_file(&new_client->dev, &dev_attr_in3_min);
|
||||
device_create_file(&new_client->dev, &dev_attr_in3_max);
|
||||
device_create_file(&new_client->dev, &dev_attr_in4_input);
|
||||
device_create_file(&new_client->dev, &dev_attr_in4_min);
|
||||
device_create_file(&new_client->dev, &dev_attr_in4_max);
|
||||
|
||||
if (data->channel & CHAN_NO_FAN(0)) {
|
||||
device_create_file(&new_client->dev, &dev_attr_in6_input);
|
||||
device_create_file(&new_client->dev, &dev_attr_in6_min);
|
||||
device_create_file(&new_client->dev, &dev_attr_in6_max);
|
||||
if ((err = device_create_file(&new_client->dev,
|
||||
&dev_attr_in6_input))
|
||||
|| (err = device_create_file(&new_client->dev,
|
||||
&dev_attr_in6_min))
|
||||
|| (err = device_create_file(&new_client->dev,
|
||||
&dev_attr_in6_max)))
|
||||
goto exit_remove;
|
||||
} else {
|
||||
device_create_file(&new_client->dev, &dev_attr_fan1_input);
|
||||
device_create_file(&new_client->dev, &dev_attr_fan1_min);
|
||||
device_create_file(&new_client->dev, &dev_attr_fan1_div);
|
||||
}
|
||||
if (data->channel & CHAN_NO_FAN(1)) {
|
||||
device_create_file(&new_client->dev, &dev_attr_in7_input);
|
||||
device_create_file(&new_client->dev, &dev_attr_in7_min);
|
||||
device_create_file(&new_client->dev, &dev_attr_in7_max);
|
||||
} else {
|
||||
device_create_file(&new_client->dev, &dev_attr_fan2_input);
|
||||
device_create_file(&new_client->dev, &dev_attr_fan2_min);
|
||||
device_create_file(&new_client->dev, &dev_attr_fan2_div);
|
||||
if ((err = device_create_file(&new_client->dev,
|
||||
&dev_attr_fan1_input))
|
||||
|| (err = device_create_file(&new_client->dev,
|
||||
&dev_attr_fan1_min))
|
||||
|| (err = device_create_file(&new_client->dev,
|
||||
&dev_attr_fan1_div)))
|
||||
goto exit_remove;
|
||||
}
|
||||
|
||||
device_create_file(&new_client->dev, &dev_attr_temp1_input);
|
||||
device_create_file(&new_client->dev, &dev_attr_temp1_max);
|
||||
device_create_file(&new_client->dev, &dev_attr_temp1_min);
|
||||
device_create_file(&new_client->dev, &dev_attr_temp1_crit);
|
||||
device_create_file(&new_client->dev, &dev_attr_temp2_input);
|
||||
device_create_file(&new_client->dev, &dev_attr_temp2_max);
|
||||
device_create_file(&new_client->dev, &dev_attr_temp2_min);
|
||||
device_create_file(&new_client->dev, &dev_attr_temp2_crit);
|
||||
if (data->channel & CHAN_NO_FAN(1)) {
|
||||
if ((err = device_create_file(&new_client->dev,
|
||||
&dev_attr_in7_input))
|
||||
|| (err = device_create_file(&new_client->dev,
|
||||
&dev_attr_in7_min))
|
||||
|| (err = device_create_file(&new_client->dev,
|
||||
&dev_attr_in7_max)))
|
||||
goto exit_remove;
|
||||
} else {
|
||||
if ((err = device_create_file(&new_client->dev,
|
||||
&dev_attr_fan2_input))
|
||||
|| (err = device_create_file(&new_client->dev,
|
||||
&dev_attr_fan2_min))
|
||||
|| (err = device_create_file(&new_client->dev,
|
||||
&dev_attr_fan2_div)))
|
||||
goto exit_remove;
|
||||
}
|
||||
|
||||
if (data->channel & CHAN_TEMP3) {
|
||||
device_create_file(&new_client->dev, &dev_attr_temp3_input);
|
||||
device_create_file(&new_client->dev, &dev_attr_temp3_max);
|
||||
device_create_file(&new_client->dev, &dev_attr_temp3_min);
|
||||
device_create_file(&new_client->dev, &dev_attr_temp3_crit);
|
||||
if ((err = device_create_file(&new_client->dev,
|
||||
&dev_attr_temp3_input))
|
||||
|| (err = device_create_file(&new_client->dev,
|
||||
&dev_attr_temp3_max))
|
||||
|| (err = device_create_file(&new_client->dev,
|
||||
&dev_attr_temp3_min))
|
||||
|| (err = device_create_file(&new_client->dev,
|
||||
&dev_attr_temp3_crit)))
|
||||
goto exit_remove;
|
||||
} else {
|
||||
device_create_file(&new_client->dev, &dev_attr_in0_input);
|
||||
device_create_file(&new_client->dev, &dev_attr_in0_min);
|
||||
device_create_file(&new_client->dev, &dev_attr_in0_max);
|
||||
device_create_file(&new_client->dev, &dev_attr_in5_input);
|
||||
device_create_file(&new_client->dev, &dev_attr_in5_min);
|
||||
device_create_file(&new_client->dev, &dev_attr_in5_max);
|
||||
if ((err = device_create_file(&new_client->dev,
|
||||
&dev_attr_in0_input))
|
||||
|| (err = device_create_file(&new_client->dev,
|
||||
&dev_attr_in0_min))
|
||||
|| (err = device_create_file(&new_client->dev,
|
||||
&dev_attr_in0_max))
|
||||
|| (err = device_create_file(&new_client->dev,
|
||||
&dev_attr_in5_input))
|
||||
|| (err = device_create_file(&new_client->dev,
|
||||
&dev_attr_in5_min))
|
||||
|| (err = device_create_file(&new_client->dev,
|
||||
&dev_attr_in5_max)))
|
||||
goto exit_remove;
|
||||
}
|
||||
|
||||
if (!(data->channel & CHAN_NO_VID)) {
|
||||
device_create_file(&new_client->dev, &dev_attr_cpu0_vid);
|
||||
device_create_file(&new_client->dev, &dev_attr_vrm);
|
||||
if ((err = device_create_file(&new_client->dev,
|
||||
&dev_attr_cpu0_vid))
|
||||
|| (err = device_create_file(&new_client->dev,
|
||||
&dev_attr_vrm)))
|
||||
goto exit_remove;
|
||||
}
|
||||
|
||||
device_create_file(&new_client->dev, &dev_attr_alarms);
|
||||
device_create_file(&new_client->dev, &dev_attr_aout_output);
|
||||
data->class_dev = hwmon_device_register(&new_client->dev);
|
||||
if (IS_ERR(data->class_dev)) {
|
||||
err = PTR_ERR(data->class_dev);
|
||||
goto exit_remove;
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
||||
exit_remove:
|
||||
sysfs_remove_group(&new_client->dev.kobj, &lm87_group);
|
||||
sysfs_remove_group(&new_client->dev.kobj, &lm87_group_opt);
|
||||
exit_detach:
|
||||
i2c_detach_client(new_client);
|
||||
exit_free:
|
||||
|
|
@ -732,6 +817,8 @@ static int lm87_detach_client(struct i2c_client *client)
|
|||
int err;
|
||||
|
||||
hwmon_device_unregister(data->class_dev);
|
||||
sysfs_remove_group(&client->dev.kobj, &lm87_group);
|
||||
sysfs_remove_group(&client->dev.kobj, &lm87_group_opt);
|
||||
|
||||
if ((err = i2c_detach_client(client)))
|
||||
return err;
|
||||
|
|
|
|||
|
|
@ -288,6 +288,23 @@ static int max6635_check(struct i2c_client *client)
|
|||
return 1;
|
||||
}
|
||||
|
||||
static struct attribute *lm92_attributes[] = {
|
||||
&dev_attr_temp1_input.attr,
|
||||
&dev_attr_temp1_crit.attr,
|
||||
&dev_attr_temp1_crit_hyst.attr,
|
||||
&dev_attr_temp1_min.attr,
|
||||
&dev_attr_temp1_min_hyst.attr,
|
||||
&dev_attr_temp1_max.attr,
|
||||
&dev_attr_temp1_max_hyst.attr,
|
||||
&dev_attr_alarms.attr,
|
||||
|
||||
NULL
|
||||
};
|
||||
|
||||
static const struct attribute_group lm92_group = {
|
||||
.attrs = lm92_attributes,
|
||||
};
|
||||
|
||||
/* The following function does more than just detection. If detection
|
||||
succeeds, it also registers the new chip. */
|
||||
static int lm92_detect(struct i2c_adapter *adapter, int address, int kind)
|
||||
|
|
@ -359,23 +376,19 @@ static int lm92_detect(struct i2c_adapter *adapter, int address, int kind)
|
|||
lm92_init_client(new_client);
|
||||
|
||||
/* Register sysfs hooks */
|
||||
if ((err = sysfs_create_group(&new_client->dev.kobj, &lm92_group)))
|
||||
goto exit_detach;
|
||||
|
||||
data->class_dev = hwmon_device_register(&new_client->dev);
|
||||
if (IS_ERR(data->class_dev)) {
|
||||
err = PTR_ERR(data->class_dev);
|
||||
goto exit_detach;
|
||||
goto exit_remove;
|
||||
}
|
||||
|
||||
device_create_file(&new_client->dev, &dev_attr_temp1_input);
|
||||
device_create_file(&new_client->dev, &dev_attr_temp1_crit);
|
||||
device_create_file(&new_client->dev, &dev_attr_temp1_crit_hyst);
|
||||
device_create_file(&new_client->dev, &dev_attr_temp1_min);
|
||||
device_create_file(&new_client->dev, &dev_attr_temp1_min_hyst);
|
||||
device_create_file(&new_client->dev, &dev_attr_temp1_max);
|
||||
device_create_file(&new_client->dev, &dev_attr_temp1_max_hyst);
|
||||
device_create_file(&new_client->dev, &dev_attr_alarms);
|
||||
|
||||
return 0;
|
||||
|
||||
exit_remove:
|
||||
sysfs_remove_group(&new_client->dev.kobj, &lm92_group);
|
||||
exit_detach:
|
||||
i2c_detach_client(new_client);
|
||||
exit_free:
|
||||
|
|
@ -397,6 +410,7 @@ static int lm92_detach_client(struct i2c_client *client)
|
|||
int err;
|
||||
|
||||
hwmon_device_unregister(data->class_dev);
|
||||
sysfs_remove_group(&client->dev.kobj, &lm92_group);
|
||||
|
||||
if ((err = i2c_detach_client(client)))
|
||||
return err;
|
||||
|
|
|
|||
Loading…
Reference in a new issue