Skip to content

Commit

Permalink
hwmon: (adt7475) Convert to use hwmon_device_register_with_groups()
Browse files Browse the repository at this point in the history 
hwmon_device_register() is a deprecated function and produces a warning.

Converting the driver to use the hwmon_device_register_with_groups()
instead.

Signed-off-by: Grant McEwan <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Guenter Roeck <[email protected]>
  • Loading branch information
@atlowl @groeck
atlowl authored and groeck committed Sep 3, 2019
1 parent 22e96ce commit c64fce7
Showing 1 changed file with 50 additions and 96 deletions.
146 changes: 50 additions & 96 deletions drivers/hwmon/adt7475.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ static const struct of_device_id __maybe_unused adt7475_of_match[] = {
MODULE_DEVICE_TABLE(of, adt7475_of_match);

struct adt7475_data {
struct device *hwmon_dev;
struct i2c_client *client;
struct mutex lock;

unsigned long measure_updated;
Expand All @@ -212,6 +212,7 @@ struct adt7475_data {

u8 vid;
u8 vrm;
const struct attribute_group *groups[9];
};

static struct i2c_driver adt7475_driver;
Expand Down Expand Up @@ -346,8 +347,8 @@ static ssize_t voltage_store(struct device *dev,
{

struct sensor_device_attribute_2 *sattr = to_sensor_dev_attr_2(attr);
struct i2c_client *client = to_i2c_client(dev);
struct adt7475_data *data = i2c_get_clientdata(client);
struct adt7475_data *data = dev_get_drvdata(dev);
struct i2c_client *client = data->client;
unsigned char reg;
long val;

Expand Down Expand Up @@ -440,8 +441,8 @@ static ssize_t temp_store(struct device *dev, struct device_attribute *attr,
const char *buf, size_t count)
{
struct sensor_device_attribute_2 *sattr = to_sensor_dev_attr_2(attr);
struct i2c_client *client = to_i2c_client(dev);
struct adt7475_data *data = i2c_get_clientdata(client);
struct adt7475_data *data = dev_get_drvdata(dev);
struct i2c_client *client = data->client;
unsigned char reg = 0;
u8 out;
int temp;
Expand Down Expand Up @@ -542,8 +543,7 @@ static ssize_t temp_st_show(struct device *dev, struct device_attribute *attr,
char *buf)
{
struct sensor_device_attribute_2 *sattr = to_sensor_dev_attr_2(attr);
struct i2c_client *client = to_i2c_client(dev);
struct adt7475_data *data = i2c_get_clientdata(client);
struct adt7475_data *data = dev_get_drvdata(dev);
long val;

switch (sattr->index) {
Expand All @@ -570,8 +570,8 @@ static ssize_t temp_st_store(struct device *dev,
size_t count)
{
struct sensor_device_attribute_2 *sattr = to_sensor_dev_attr_2(attr);
struct i2c_client *client = to_i2c_client(dev);
struct adt7475_data *data = i2c_get_clientdata(client);
struct adt7475_data *data = dev_get_drvdata(dev);
struct i2c_client *client = data->client;
unsigned char reg;
int shift, idx;
ulong val;
Expand Down Expand Up @@ -647,8 +647,8 @@ static ssize_t point2_show(struct device *dev, struct device_attribute *attr,
static ssize_t point2_store(struct device *dev, struct device_attribute *attr,
const char *buf, size_t count)
{
struct i2c_client *client = to_i2c_client(dev);
struct adt7475_data *data = i2c_get_clientdata(client);
struct adt7475_data *data = dev_get_drvdata(dev);
struct i2c_client *client = data->client;
struct sensor_device_attribute_2 *sattr = to_sensor_dev_attr_2(attr);
int temp;
long val;
Expand Down Expand Up @@ -710,8 +710,8 @@ static ssize_t tach_store(struct device *dev, struct device_attribute *attr,
{

struct sensor_device_attribute_2 *sattr = to_sensor_dev_attr_2(attr);
struct i2c_client *client = to_i2c_client(dev);
struct adt7475_data *data = i2c_get_clientdata(client);
struct adt7475_data *data = dev_get_drvdata(dev);
struct i2c_client *client = data->client;
unsigned long val;

if (kstrtoul(buf, 10, &val))
Expand Down Expand Up @@ -769,8 +769,8 @@ static ssize_t pwm_store(struct device *dev, struct device_attribute *attr,
{

struct sensor_device_attribute_2 *sattr = to_sensor_dev_attr_2(attr);
struct i2c_client *client = to_i2c_client(dev);
struct adt7475_data *data = i2c_get_clientdata(client);
struct adt7475_data *data = dev_get_drvdata(dev);
struct i2c_client *client = data->client;
unsigned char reg = 0;
long val;

Expand Down Expand Up @@ -818,8 +818,8 @@ static ssize_t stall_disable_show(struct device *dev,
struct device_attribute *attr, char *buf)
{
struct sensor_device_attribute_2 *sattr = to_sensor_dev_attr_2(attr);
struct i2c_client *client = to_i2c_client(dev);
struct adt7475_data *data = i2c_get_clientdata(client);
struct adt7475_data *data = dev_get_drvdata(dev);

u8 mask = BIT(5 + sattr->index);

return sprintf(buf, "%d\n", !!(data->enh_acoustics[0] & mask));
Expand All @@ -830,8 +830,8 @@ static ssize_t stall_disable_store(struct device *dev,
const char *buf, size_t count)
{
struct sensor_device_attribute_2 *sattr = to_sensor_dev_attr_2(attr);
struct i2c_client *client = to_i2c_client(dev);
struct adt7475_data *data = i2c_get_clientdata(client);
struct adt7475_data *data = dev_get_drvdata(dev);
struct i2c_client *client = data->client;
long val;
u8 mask = BIT(5 + sattr->index);

Expand Down Expand Up @@ -914,8 +914,8 @@ static ssize_t pwmchan_store(struct device *dev,
size_t count)
{
struct sensor_device_attribute_2 *sattr = to_sensor_dev_attr_2(attr);
struct i2c_client *client = to_i2c_client(dev);
struct adt7475_data *data = i2c_get_clientdata(client);
struct adt7475_data *data = dev_get_drvdata(dev);
struct i2c_client *client = data->client;
int r;
long val;

Expand All @@ -938,8 +938,8 @@ static ssize_t pwmctrl_store(struct device *dev,
size_t count)
{
struct sensor_device_attribute_2 *sattr = to_sensor_dev_attr_2(attr);
struct i2c_client *client = to_i2c_client(dev);
struct adt7475_data *data = i2c_get_clientdata(client);
struct adt7475_data *data = dev_get_drvdata(dev);
struct i2c_client *client = data->client;
int r;
long val;

Expand Down Expand Up @@ -982,8 +982,8 @@ static ssize_t pwmfreq_store(struct device *dev,
size_t count)
{
struct sensor_device_attribute_2 *sattr = to_sensor_dev_attr_2(attr);
struct i2c_client *client = to_i2c_client(dev);
struct adt7475_data *data = i2c_get_clientdata(client);
struct adt7475_data *data = dev_get_drvdata(dev);
struct i2c_client *client = data->client;
int out;
long val;

Expand Down Expand Up @@ -1022,8 +1022,8 @@ static ssize_t pwm_use_point2_pwm_at_crit_store(struct device *dev,
struct device_attribute *devattr,
const char *buf, size_t count)
{
struct i2c_client *client = to_i2c_client(dev);
struct adt7475_data *data = i2c_get_clientdata(client);
struct adt7475_data *data = dev_get_drvdata(dev);
struct i2c_client *client = data->client;
long val;

if (kstrtol(buf, 10, &val))
Expand Down Expand Up @@ -1342,26 +1342,6 @@ static int adt7475_detect(struct i2c_client *client,
return 0;
}

static void adt7475_remove_files(struct i2c_client *client,
struct adt7475_data *data)
{
sysfs_remove_group(&client->dev.kobj, &adt7475_attr_group);
if (data->has_fan4)
sysfs_remove_group(&client->dev.kobj, &fan4_attr_group);
if (data->has_pwm2)
sysfs_remove_group(&client->dev.kobj, &pwm2_attr_group);
if (data->has_voltage & (1 << 0))
sysfs_remove_group(&client->dev.kobj, &in0_attr_group);
if (data->has_voltage & (1 << 3))
sysfs_remove_group(&client->dev.kobj, &in3_attr_group);
if (data->has_voltage & (1 << 4))
sysfs_remove_group(&client->dev.kobj, &in4_attr_group);
if (data->has_voltage & (1 << 5))
sysfs_remove_group(&client->dev.kobj, &in5_attr_group);
if (data->has_vid)
sysfs_remove_group(&client->dev.kobj, &vid_attr_group);
}

static int adt7475_update_limits(struct i2c_client *client)
{
struct adt7475_data *data = i2c_get_clientdata(client);
Expand Down Expand Up @@ -1489,14 +1469,16 @@ static int adt7475_probe(struct i2c_client *client,
};

struct adt7475_data *data;
int i, ret = 0, revision;
struct device *hwmon_dev;
int i, ret = 0, revision, group_num = 0;
u8 config2, config3;

data = devm_kzalloc(&client->dev, sizeof(*data), GFP_KERNEL);
if (data == NULL)
return -ENOMEM;

mutex_init(&data->lock);
data->client = client;
i2c_set_clientdata(client, data);

if (client->dev.of_node)
Expand Down Expand Up @@ -1590,52 +1572,40 @@ static int adt7475_probe(struct i2c_client *client,
break;
}

ret = sysfs_create_group(&client->dev.kobj, &adt7475_attr_group);
if (ret)
return ret;
data->groups[group_num++] = &adt7475_attr_group;

/* Features that can be disabled individually */
if (data->has_fan4) {
ret = sysfs_create_group(&client->dev.kobj, &fan4_attr_group);
if (ret)
goto eremove;
data->groups[group_num++] = &fan4_attr_group;
}
if (data->has_pwm2) {
ret = sysfs_create_group(&client->dev.kobj, &pwm2_attr_group);
if (ret)
goto eremove;
data->groups[group_num++] = &pwm2_attr_group;
}
if (data->has_voltage & (1 << 0)) {
ret = sysfs_create_group(&client->dev.kobj, &in0_attr_group);
if (ret)
goto eremove;
data->groups[group_num++] = &in0_attr_group;
}
if (data->has_voltage & (1 << 3)) {
ret = sysfs_create_group(&client->dev.kobj, &in3_attr_group);
if (ret)
goto eremove;
data->groups[group_num++] = &in3_attr_group;
}
if (data->has_voltage & (1 << 4)) {
ret = sysfs_create_group(&client->dev.kobj, &in4_attr_group);
if (ret)
goto eremove;
data->groups[group_num++] = &in4_attr_group;
}
if (data->has_voltage & (1 << 5)) {
ret = sysfs_create_group(&client->dev.kobj, &in5_attr_group);
if (ret)
goto eremove;
data->groups[group_num++] = &in5_attr_group;
}
if (data->has_vid) {
data->vrm = vid_which_vrm();
ret = sysfs_create_group(&client->dev.kobj, &vid_attr_group);
if (ret)
goto eremove;
data->groups[group_num] = &vid_attr_group;
}

data->hwmon_dev = hwmon_device_register(&client->dev);
if (IS_ERR(data->hwmon_dev)) {
ret = PTR_ERR(data->hwmon_dev);
goto eremove;
/* register device with all the acquired attributes */
hwmon_dev = devm_hwmon_device_register_with_groups(&client->dev,
client->name, data,
data->groups);

if (IS_ERR(hwmon_dev)) {
ret = PTR_ERR(hwmon_dev);
return ret;
}

dev_info(&client->dev, "%s device, revision %d\n",
Expand All @@ -1657,21 +1627,7 @@ static int adt7475_probe(struct i2c_client *client,
/* Limits and settings, should never change update more than once */
ret = adt7475_update_limits(client);
if (ret)
goto eremove;

return 0;

eremove:
adt7475_remove_files(client, data);
return ret;
}

static int adt7475_remove(struct i2c_client *client)
{
struct adt7475_data *data = i2c_get_clientdata(client);

hwmon_device_unregister(data->hwmon_dev);
adt7475_remove_files(client, data);
return ret;

return 0;
}
Expand All @@ -1683,7 +1639,6 @@ static struct i2c_driver adt7475_driver = {
.of_match_table = of_match_ptr(adt7475_of_match),
},
.probe = adt7475_probe,
.remove = adt7475_remove,
.id_table = adt7475_id,
.detect = adt7475_detect,
.address_list = normal_i2c,
Expand Down Expand Up @@ -1757,8 +1712,8 @@ static void adt7475_read_pwm(struct i2c_client *client, int index)

static int adt7475_update_measure(struct device *dev)
{
struct i2c_client *client = to_i2c_client(dev);
struct adt7475_data *data = i2c_get_clientdata(client);
struct adt7475_data *data = dev_get_drvdata(dev);
struct i2c_client *client = data->client;
u16 ext;
int i;
int ret;
Expand Down Expand Up @@ -1854,8 +1809,7 @@ static int adt7475_update_measure(struct device *dev)

static struct adt7475_data *adt7475_update_device(struct device *dev)
{
struct i2c_client *client = to_i2c_client(dev);
struct adt7475_data *data = i2c_get_clientdata(client);
struct adt7475_data *data = dev_get_drvdata(dev);
int ret;

mutex_lock(&data->lock);
Expand Down

0 comments on commit c64fce7

Please sign in to comment.