From 55d96acdada74fc4cd49bb51d83a07c7b8b11a6f Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Thu, 28 Oct 2010 20:31:49 +0200 Subject: [PATCH] --- yaml --- r: 220505 b: refs/heads/master c: 21fc977551da43ec21ae0ebb859411afd4243d2b h: refs/heads/master i: 220503: 19081bddc5c050bbbe9fe12b04775a17ff9fec3a v: v3 --- [refs] | 2 +- trunk/drivers/hwmon/w83795.c | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index c903a6326910..0eb9a5ceacef 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1bb3450ce5050bc677c1995a60a0ddfe9e33e7b6 +refs/heads/master: 21fc977551da43ec21ae0ebb859411afd4243d2b diff --git a/trunk/drivers/hwmon/w83795.c b/trunk/drivers/hwmon/w83795.c index 78a876f35fa3..e916c04e8681 100644 --- a/trunk/drivers/hwmon/w83795.c +++ b/trunk/drivers/hwmon/w83795.c @@ -1265,8 +1265,7 @@ store_temp(struct device *dev, struct device_attribute *attr, static ssize_t show_dts_mode(struct device *dev, struct device_attribute *attr, char *buf) { - struct i2c_client *client = to_i2c_client(dev); - struct w83795_data *data = i2c_get_clientdata(client); + struct w83795_data *data = dev_get_drvdata(dev); int tmp; if (data->enable_dts & 2) @@ -1296,8 +1295,7 @@ show_dts_ext(struct device *dev, struct device_attribute *attr, char *buf) struct sensor_device_attribute_2 *sensor_attr = to_sensor_dev_attr_2(attr); int nr = sensor_attr->nr; - struct i2c_client *client = to_i2c_client(dev); - struct w83795_data *data = i2c_get_clientdata(client); + struct w83795_data *data = dev_get_drvdata(dev); long temp = temp_from_reg(data->dts_ext[nr]); return sprintf(buf, "%ld\n", temp); @@ -1328,8 +1326,7 @@ store_dts_ext(struct device *dev, struct device_attribute *attr, static ssize_t show_temp_mode(struct device *dev, struct device_attribute *attr, char *buf) { - struct i2c_client *client = to_i2c_client(dev); - struct w83795_data *data = i2c_get_clientdata(client); + struct w83795_data *data = dev_get_drvdata(dev); struct sensor_device_attribute_2 *sensor_attr = to_sensor_dev_attr_2(attr); int index = sensor_attr->index;