diff options
author | Axel Lin <axel.lin@ingics.com> | 2014-07-01 14:31:44 (GMT) |
---|---|---|
committer | Guenter Roeck <linux@roeck-us.net> | 2014-08-04 14:01:35 (GMT) |
commit | 045c1391ec3b703ee00643fe9bda7cd65cd463e1 (patch) | |
tree | 368e859dca293a637df0d9d6cc603b51a4c52875 /drivers/hwmon/ad7414.c | |
parent | ed67f0872be1aa516831332c732752022d4edc7c (diff) | |
download | linux-045c1391ec3b703ee00643fe9bda7cd65cd463e1.tar.xz |
hwmon: (ad7414) Convert to devm_hwmon_device_register_with_groups
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>
Diffstat (limited to 'drivers/hwmon/ad7414.c')
-rw-r--r-- | drivers/hwmon/ad7414.c | 57 |
1 files changed, 16 insertions, 41 deletions
diff --git a/drivers/hwmon/ad7414.c b/drivers/hwmon/ad7414.c index 5d501ad..763490a 100644 --- a/drivers/hwmon/ad7414.c +++ b/drivers/hwmon/ad7414.c @@ -39,7 +39,7 @@ static u8 AD7414_REG_LIMIT[] = { AD7414_REG_T_HIGH, AD7414_REG_T_LOW }; struct ad7414_data { - struct device *hwmon_dev; + struct i2c_client *client; struct mutex lock; /* atomic read data updates */ char valid; /* !=0 if following fields are valid */ unsigned long next_update; /* In jiffies */ @@ -72,8 +72,8 @@ static inline int ad7414_write(struct i2c_client *client, u8 reg, u8 value) static struct ad7414_data *ad7414_update_device(struct device *dev) { - struct i2c_client *client = to_i2c_client(dev); - struct ad7414_data *data = i2c_get_clientdata(client); + struct ad7414_data *data = dev_get_drvdata(dev); + struct i2c_client *client = data->client; mutex_lock(&data->lock); @@ -127,8 +127,8 @@ static ssize_t set_max_min(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) { - struct i2c_client *client = to_i2c_client(dev); - struct ad7414_data *data = i2c_get_clientdata(client); + struct ad7414_data *data = dev_get_drvdata(dev); + struct i2c_client *client = data->client; int index = to_sensor_dev_attr(attr)->index; u8 reg = AD7414_REG_LIMIT[index]; long temp; @@ -164,7 +164,7 @@ static ssize_t show_alarm(struct device *dev, struct device_attribute *attr, static SENSOR_DEVICE_ATTR(temp1_min_alarm, S_IRUGO, show_alarm, NULL, 3); static SENSOR_DEVICE_ATTR(temp1_max_alarm, S_IRUGO, show_alarm, NULL, 4); -static struct attribute *ad7414_attributes[] = { +static struct attribute *ad7414_attrs[] = { &sensor_dev_attr_temp1_input.dev_attr.attr, &sensor_dev_attr_temp1_max.dev_attr.attr, &sensor_dev_attr_temp1_min.dev_attr.attr, @@ -173,27 +173,25 @@ static struct attribute *ad7414_attributes[] = { NULL }; -static const struct attribute_group ad7414_group = { - .attrs = ad7414_attributes, -}; +ATTRIBUTE_GROUPS(ad7414); static int ad7414_probe(struct i2c_client *client, const struct i2c_device_id *dev_id) { + struct device *dev = &client->dev; struct ad7414_data *data; + struct device *hwmon_dev; int conf; - int err; if (!i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_BYTE_DATA | I2C_FUNC_SMBUS_READ_WORD_DATA)) return -EOPNOTSUPP; - data = devm_kzalloc(&client->dev, sizeof(struct ad7414_data), - GFP_KERNEL); + data = devm_kzalloc(dev, sizeof(struct ad7414_data), GFP_KERNEL); if (!data) return -ENOMEM; - i2c_set_clientdata(client, data); + data->client = client; mutex_init(&data->lock); dev_info(&client->dev, "chip found\n"); @@ -201,38 +199,16 @@ static int ad7414_probe(struct i2c_client *client, /* Make sure the chip is powered up. */ conf = i2c_smbus_read_byte_data(client, AD7414_REG_CONF); if (conf < 0) - dev_warn(&client->dev, - "ad7414_probe unable to read config register.\n"); + dev_warn(dev, "ad7414_probe unable to read config register.\n"); else { conf &= ~(1 << 7); i2c_smbus_write_byte_data(client, AD7414_REG_CONF, conf); } - /* Register sysfs hooks */ - err = sysfs_create_group(&client->dev.kobj, &ad7414_group); - if (err) - return err; - - data->hwmon_dev = hwmon_device_register(&client->dev); - if (IS_ERR(data->hwmon_dev)) { - err = PTR_ERR(data->hwmon_dev); - goto exit_remove; - } - - return 0; - -exit_remove: - sysfs_remove_group(&client->dev.kobj, &ad7414_group); - return err; -} - -static int ad7414_remove(struct i2c_client *client) -{ - struct ad7414_data *data = i2c_get_clientdata(client); - - hwmon_device_unregister(data->hwmon_dev); - sysfs_remove_group(&client->dev.kobj, &ad7414_group); - return 0; + hwmon_dev = devm_hwmon_device_register_with_groups(dev, + client->name, + data, ad7414_groups); + return PTR_ERR_OR_ZERO(hwmon_dev); } static const struct i2c_device_id ad7414_id[] = { @@ -246,7 +222,6 @@ static struct i2c_driver ad7414_driver = { .name = "ad7414", }, .probe = ad7414_probe, - .remove = ad7414_remove, .id_table = ad7414_id, }; |