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

hwmon: (lm90) Introduce function to delete sysfs files

Browse Source 
Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
This commit is contained in:
Guenter Roeck
2010-10-28 20:31:43 +02:00
committed by Jean Delvare
parent 88073bb1ba
commit b6fc1bacc7
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/hwmon/lm90.c
View File

@@ -815,6 +815,15 @@ static int lm90_detect(struct i2c_client *new_client,
return 0; return 0;
} }
static void lm90_remove_files(struct i2c_client *client, struct lm90_data *data)
{
if (data->flags & LM90_HAVE_OFFSET)
device_remove_file(&client->dev,
&sensor_dev_attr_temp2_offset.dev_attr);
device_remove_file(&client->dev, &dev_attr_pec);
sysfs_remove_group(&client->dev.kobj, &lm90_group);
}
static int lm90_probe(struct i2c_client *new_client, static int lm90_probe(struct i2c_client *new_client,
const struct i2c_device_id *id) const struct i2c_device_id *id)
{ {
@@ -889,8 +898,7 @@ static int lm90_probe(struct i2c_client *new_client,
return 0; return 0;
exit_remove_files: exit_remove_files:
sysfs_remove_group(&new_client->dev.kobj, &lm90_group); lm90_remove_files(new_client, data);
device_remove_file(&new_client->dev, &dev_attr_pec);
exit_free: exit_free:
kfree(data); kfree(data);
exit: exit:
@@ -937,11 +945,7 @@ static int lm90_remove(struct i2c_client *client)
struct lm90_data *data = i2c_get_clientdata(client); struct lm90_data *data = i2c_get_clientdata(client);
hwmon_device_unregister(data->hwmon_dev); hwmon_device_unregister(data->hwmon_dev);
sysfs_remove_group(&client->dev.kobj, &lm90_group); lm90_remove_files(client, data);
device_remove_file(&client->dev, &dev_attr_pec);
if (data->flags & LM90_HAVE_OFFSET)
device_remove_file(&client->dev,
&sensor_dev_attr_temp2_offset.dev_attr);
/* Restore initial configuration */ /* Restore initial configuration */
i2c_smbus_write_byte_data(client, LM90_REG_W_CONFIG1, i2c_smbus_write_byte_data(client, LM90_REG_W_CONFIG1,