drivers/i2c/chips/lm77.c - max1619.c: update device attribute callbacks
PATCH 7/15 drivers/i2c/chips/lm77.c - max1619.c: update device attribute callbacks
Signed-off-by Yani Ioannou <[email protected]>
---
lm77.c | 14 ++++++------ lm78.c | 36 +++++++++++++++---------------- lm80.c | 20 ++++++++--------- lm83.c | 6 ++--- lm85.c | 72 +++++++++++++++++++++++++++++++------------------------------- lm87.c | 46 +++++++++++++++++++-------------------- lm90.c | 12 +++++----- lm92.c | 14 ++++++------ max1619.c | 6 ++--- 9 files changed, 113 insertions(+), 113 deletions(-)
drivers/i2c/chips/lm77.c +7 -7
@@ -103,7 +103,7 @@ static inline int LM77_TEMP_FROM_REG(u16/* read routines for temperature limits */ #define show (value) \ -static ssize_t show_##value(struct device *dev, char *buf) \ +static ssize_t show_##value(struct device *dev, struct device_attribute *attr, char *buf) \ { \ struct lm77_data *data = lm77_update_device(dev); \ return sprintf(buf, "%d\n", data->value); \
@@ -116,17 +116,17 @@ show(temp_max);show (alarms);/* read routines for hysteresis values */ -static ssize_t show_temp_crit_hyst (struct device *dev,char *buf) +static ssize_t show_temp_crit_hyst (struct device *dev,struct device_attribute *attr,char *buf) {struct lm77_data *data =lm77_update_device (dev);return sprintf (buf,"%d\n" , data->temp_crit - data->temp_hyst); } -static ssize_t show_temp_min_hyst (struct device *dev,char *buf) +static ssize_t show_temp_min_hyst (struct device *dev,struct device_attribute *attr,char *buf) {struct lm77_data *data =lm77_update_device (dev);return sprintf (buf,"%d\n" , data->temp_min + data->temp_hyst); } -static ssize_t show_temp_max_hyst (struct device *dev,char *buf) +static ssize_t show_temp_max_hyst (struct device *dev,struct device_attribute *attr,char *buf) {struct lm77_data *data =lm77_update_device (dev);return sprintf (buf,"%d\n" , data->temp_max - data->temp_hyst);
@@ -134,7 +134,7 @@ static ssize_t show_temp_max_hyst(struct/* write routines */ #define set (value, reg) \ -static ssize_t set_##value(struct device *dev, const char *buf, size_t count) \ +static ssize_t set_##value(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) \ { \ struct i2c_client *client = to_i2c_client(dev); \ struct lm77_data *data = i2c_get_clientdata(client); \
@@ -152,7 +152,7 @@ set(temp_max, LM77_REG_TEMP_MAX);/* hysteresis is stored as a relative value on the chip, so it has to be converted first */ -static ssize_t set_temp_crit_hyst (struct device *dev,const char *buf,size_t count) +static ssize_t set_temp_crit_hyst (struct device *dev,struct device_attribute *attr,const char *buf,size_t count) {struct i2c_client *client =to_i2c_client (dev);struct lm77_data *data =i2c_get_clientdata (client);
@@ -167,7 +167,7 @@ static ssize_t set_temp_crit_hyst(struct }/* preserve hysteresis when setting T_crit */ -static ssize_t set_temp_crit (struct device *dev,const char *buf,size_t count) +static ssize_t set_temp_crit (struct device *dev,struct device_attribute *attr,const char *buf,size_t count) {struct i2c_client *client =to_i2c_client (dev);struct lm77_data *data =i2c_get_clientdata (client);
drivers/i2c/chips/lm78.c +18 -18
@@ -224,28 +224,28 @@ static ssize_t set_in_max(struct device#define show_in_offset (offset) \ static ssize_t \ - show_in##offset (struct device *dev, char *buf) \ + show_in##offset (struct device *dev, struct device_attribute *attr, char *buf) \ { \ return show_in(dev, buf, offset); \ } \ static DEVICE_ATTR(in##offset##_input, S_IRUGO, \ show_in##offset, NULL); \ static ssize_t \ - show_in##offset##_min (struct device *dev, char *buf) \ + show_in##offset##_min (struct device *dev, struct device_attribute *attr, char *buf) \ { \ return show_in_min(dev, buf, offset); \ } \ static ssize_t \ - show_in##offset##_max (struct device *dev, char *buf) \ + show_in##offset##_max (struct device *dev, struct device_attribute *attr, char *buf) \ { \ return show_in_max(dev, buf, offset); \ } \ -static ssize_t set_in##offset##_min (struct device *dev, \ +static ssize_t set_in##offset##_min (struct device *dev, struct device_attribute *attr, \ const char *buf, size_t count) \ { \ return set_in_min(dev, buf, count, offset); \ } \ -static ssize_t set_in##offset##_max (struct device *dev, \ +static ssize_t set_in##offset##_max (struct device *dev, struct device_attribute *attr, \ const char *buf, size_t count) \ { \ return set_in_max(dev, buf, count, offset); \
@@ -264,19 +264,19 @@ show_in_offset(5);show_in_offset (6 );/* Temperature */ -static ssize_t show_temp (struct device *dev,char *buf) +static ssize_t show_temp (struct device *dev,struct device_attribute *attr,char *buf) {struct lm78_data *data =lm78_update_device (dev);return sprintf (buf,"%d\n" ,TEMP_FROM_REG (data->temp)); } -static ssize_t show_temp_over (struct device *dev,char *buf) +static ssize_t show_temp_over (struct device *dev,struct device_attribute *attr,char *buf) {struct lm78_data *data =lm78_update_device (dev);return sprintf (buf,"%d\n" ,TEMP_FROM_REG (data->temp_over)); } -static ssize_t set_temp_over (struct device *dev,const char *buf,size_t count) +static ssize_t set_temp_over (struct device *dev,struct device_attribute *attr,const char *buf,size_t count) {struct i2c_client *client =to_i2c_client (dev);struct lm78_data *data =i2c_get_clientdata (client);
@@ -289,13 +289,13 @@ static ssize_t set_temp_over(struct devireturn count; } -static ssize_t show_temp_hyst (struct device *dev,char *buf) +static ssize_t show_temp_hyst (struct device *dev,struct device_attribute *attr,char *buf) {struct lm78_data *data =lm78_update_device (dev);return sprintf (buf,"%d\n" ,TEMP_FROM_REG (data->temp_hyst)); } -static ssize_t set_temp_hyst (struct device *dev,const char *buf,size_t count) +static ssize_t set_temp_hyst (struct device *dev,struct device_attribute *attr,const char *buf,size_t count) {struct i2c_client *client =to_i2c_client (dev);struct lm78_data *data =i2c_get_clientdata (client);
@@ -398,19 +398,19 @@ static ssize_t set_fan_div(struct device }#define show_fan_offset (offset) \ -static ssize_t show_fan_##offset (struct device *dev, char *buf) \ +static ssize_t show_fan_##offset (struct device *dev, struct device_attribute *attr, char *buf) \ { \ return show_fan(dev, buf, offset - 1); \ } \ -static ssize_t show_fan_##offset##_min (struct device *dev, char *buf) \ +static ssize_t show_fan_##offset##_min (struct device *dev, struct device_attribute *attr, char *buf) \ { \ return show_fan_min(dev, buf, offset - 1); \ } \ -static ssize_t show_fan_##offset##_div (struct device *dev, char *buf) \ +static ssize_t show_fan_##offset##_div (struct device *dev, struct device_attribute *attr, char *buf) \ { \ return show_fan_div(dev, buf, offset - 1); \ } \ -static ssize_t set_fan_##offset##_min (struct device *dev, \ +static ssize_t set_fan_##offset##_min (struct device *dev, struct device_attribute *attr, \ const char *buf, size_t count) \ { \ return set_fan_min(dev, buf, count, offset - 1); \
@@ -419,13 +419,13 @@ static DEVICE_ATTR(fan##offset##_input, static DEVICE_ATTR(fan##offset##_min, S_IRUGO | S_IWUSR, \ show_fan_##offset##_min, set_fan_##offset##_min); -static ssize_t set_fan_1_div (struct device *dev,const char *buf, +static ssize_t set_fan_1_div (struct device *dev,struct device_attribute *attr,const char *buf,size_t count) {return set_fan_div (dev, buf, count,0 ) ; } -static ssize_t set_fan_2_div (struct device *dev,const char *buf, +static ssize_t set_fan_2_div (struct device *dev,struct device_attribute *attr,const char *buf,size_t count) {return set_fan_div (dev, buf, count,1 ) ;
@@ -443,7 +443,7 @@ static DEVICE_ATTR(fan2_div, S_IRUGO | S static DEVICE_ATTR(fan3_div, S_IRUGO, show_fan_3_div, NULL);/* VID */ -static ssize_t show_vid (struct device *dev,char *buf) +static ssize_t show_vid (struct device *dev,struct device_attribute *attr,char *buf) {struct lm78_data *data =lm78_update_device (dev);return sprintf (buf,"%d\n" ,VID_FROM_REG (data->vid));
@@ -451,7 +451,7 @@ static ssize_t show_vid(struct device *d static DEVICE_ATTR(cpu0_vid, S_IRUGO, show_vid, NULL);/* Alarms */ -static ssize_t show_alarms (struct device *dev,char *buf) +static ssize_t show_alarms (struct device *dev,struct device_attribute *attr,char *buf) {struct lm78_data *data =lm78_update_device (dev);return sprintf (buf,"%u\n" , data->alarms);
drivers/i2c/chips/lm80.c +10 -10
@@ -156,7 +156,7 @@ static struct i2c_driver lm80_driver = {*/ #define show_in (suffix, value) \ -static ssize_t show_in_##suffix(struct device *dev, char *buf) \ +static ssize_t show_in_##suffix(struct device *dev, struct device_attribute *attr, char *buf) \ { \ struct lm80_data *data = lm80_update_device(dev); \ return sprintf(buf, "%d\n", IN_FROM_REG(data->value)); \
@@ -184,7 +184,7 @@ show_in(input5, in[5]);show_in (input6, in[6 ]);#define set_in (suffix, value, reg) \ -static ssize_t set_in_##suffix(struct device *dev, const char *buf, \ +static ssize_t set_in_##suffix(struct device *dev, struct device_attribute *attr, const char *buf, \ size_t count) \ { \ struct i2c_client *client = to_i2c_client(dev); \
@@ -213,7 +213,7 @@ set_in(max5, in_max[5], LM80_REG_IN_MAX(set_in (max6, in_max[6 ],LM80_REG_IN_MAX (6 ));#define show_fan (suffix, value, div) \ -static ssize_t show_fan_##suffix(struct device *dev, char *buf) \ +static ssize_t show_fan_##suffix(struct device *dev, struct device_attribute *attr, char *buf) \ { \ struct lm80_data *data = lm80_update_device(dev); \ return sprintf(buf, "%d\n", FAN_FROM_REG(data->value, \
@@ -225,7 +225,7 @@ show_fan(input1, fan[0], fan_div[0]);show_fan (input2, fan[1 ], fan_div[1 ]);#define show_fan_div (suffix, value) \ -static ssize_t show_fan_div##suffix(struct device *dev, char *buf) \ +static ssize_t show_fan_div##suffix(struct device *dev, struct device_attribute *attr, char *buf) \ { \ struct lm80_data *data = lm80_update_device(dev); \ return sprintf(buf, "%d\n", DIV_FROM_REG(data->value)); \
@@ -234,7 +234,7 @@ show_fan_div(1, fan_div[0]);show_fan_div (2 , fan_div[1 ]);#define set_fan (suffix, value, reg, div) \ -static ssize_t set_fan_##suffix(struct device *dev, const char *buf, \ +static ssize_t set_fan_##suffix(struct device *dev, struct device_attribute *attr, const char *buf, \ size_t count) \ { \ struct i2c_client *client = to_i2c_client(dev); \
@@ -292,7 +292,7 @@ static ssize_t set_fan_div(struct device }#define set_fan_div (number) \ -static ssize_t set_fan_div##number(struct device *dev, const char *buf, \ +static ssize_t set_fan_div##number(struct device *dev, struct device_attribute *attr, const char *buf, \ size_t count) \ { \ return set_fan_div(dev, buf, count, number - 1); \
@@ -300,14 +300,14 @@ static ssize_t set_fan_div##number(strucset_fan_div (1 );set_fan_div (2 ); -static ssize_t show_temp_input1 (struct device *dev,char *buf) +static ssize_t show_temp_input1 (struct device *dev,struct device_attribute *attr,char *buf) {struct lm80_data *data =lm80_update_device (dev);return sprintf (buf,"%ld\n" ,TEMP_FROM_REG (data->temp)); }#define show_temp (suffix, value) \ -static ssize_t show_temp_##suffix(struct device *dev, char *buf) \ +static ssize_t show_temp_##suffix(struct device *dev, struct device_attribute *attr, char *buf) \ { \ struct lm80_data *data = lm80_update_device(dev); \ return sprintf(buf, "%d\n", TEMP_LIMIT_FROM_REG(data->value)); \
@@ -318,7 +318,7 @@ show_temp(os_max, temp_os_max);show_temp (os_hyst, temp_os_hyst);#define set_temp (suffix, value, reg) \ -static ssize_t set_temp_##suffix(struct device *dev, const char *buf, \ +static ssize_t set_temp_##suffix(struct device *dev, struct device_attribute *attr, const char *buf, \ size_t count) \ { \ struct i2c_client *client = to_i2c_client(dev); \
@@ -336,7 +336,7 @@ set_temp(hot_hyst, temp_hot_hyst, LM80_Rset_temp (os_max, temp_os_max,LM80_REG_TEMP_OS_MAX );set_temp (os_hyst, temp_os_hyst,LM80_REG_TEMP_OS_HYST ); -static ssize_t show_alarms (struct device *dev,char *buf) +static ssize_t show_alarms (struct device *dev,struct device_attribute *attr,char *buf) {struct lm80_data *data =lm80_update_device (dev);return sprintf (buf,"%u\n" , data->alarms);
drivers/i2c/chips/lm83.c +3 -3
@@ -155,7 +155,7 @@ struct lm83_data {*/ #define show_temp (suffix, value) \ -static ssize_t show_temp_##suffix(struct device *dev, char *buf) \ +static ssize_t show_temp_##suffix(struct device *dev, struct device_attribute *attr, char *buf) \ { \ struct lm83_data *data = lm83_update_device(dev); \ return sprintf(buf, "%d\n", TEMP_FROM_REG(data->value)); \
@@ -171,7 +171,7 @@ show_temp(high4, temp_high[3]);show_temp (crit, temp_crit);#define set_temp (suffix, value, reg) \ -static ssize_t set_temp_##suffix(struct device *dev, const char *buf, \ +static ssize_t set_temp_##suffix(struct device *dev, struct device_attribute *attr, const char *buf, \ size_t count) \ { \ struct i2c_client *client = to_i2c_client(dev); \
@@ -190,7 +190,7 @@ set_temp(high3, temp_high[2], LM83_REG_Wset_temp (high4, temp_high[3 ],LM83_REG_W_REMOTE3_HIGH );set_temp (crit, temp_crit,LM83_REG_W_TCRIT ); -static ssize_t show_alarms (struct device *dev,char *buf) +static ssize_t show_alarms (struct device *dev,struct device_attribute *attr,char *buf) {struct lm83_data *data =lm83_update_device (dev);return sprintf (buf,"%d\n" , data->alarms);
drivers/i2c/chips/lm85.c +36 -36
226 lines not on this page · raw message
drivers/i2c/chips/lm87.c +23 -23
168 lines not on this page · raw message
drivers/i2c/chips/lm90.c +6 -6
@@ -218,7 +218,7 @@ struct lm90_data {*/ #define show_temp (value, converter) \ -static ssize_t show_##value(struct device *dev, char *buf) \ +static ssize_t show_##value(struct device *dev, struct device_attribute *attr, char *buf) \ { \ struct lm90_data *data = lm90_update_device(dev); \ return sprintf(buf, "%d\n", converter(data->value)); \
@@ -233,7 +233,7 @@ show_temp(temp_crit1, TEMP1_FROM_REG);show_temp (temp_crit2,TEMP1_FROM_REG );#define set_temp1 (value, reg) \ -static ssize_t set_##value(struct device *dev, const char *buf, \ +static ssize_t set_##value(struct device *dev, struct device_attribute *attr, const char *buf, \ size_t count) \ { \ struct i2c_client *client = to_i2c_client(dev); \
@@ -250,7 +250,7 @@ static ssize_t set_##value(struct devicereturn count; \ }#define set_temp2 (value, regh, regl) \ -static ssize_t set_##value(struct device *dev, const char *buf, \ +static ssize_t set_##value(struct device *dev, struct device_attribute *attr, const char *buf, \ size_t count) \ { \ struct i2c_client *client = to_i2c_client(dev); \
@@ -275,7 +275,7 @@ set_temp1(temp_crit1, LM90_REG_W_LOCAL_Cset_temp1 (temp_crit2,LM90_REG_W_REMOTE_CRIT );#define show_temp_hyst (value, basereg) \ -static ssize_t show_##value(struct device *dev, char *buf) \ +static ssize_t show_##value(struct device *dev, struct device_attribute *attr, char *buf) \ { \ struct lm90_data *data = lm90_update_device(dev); \ return sprintf(buf, "%d\n", TEMP1_FROM_REG(data->basereg) \
@@ -284,7 +284,7 @@ static ssize_t show_##value(struct devicshow_temp_hyst (temp_hyst1, temp_crit1);show_temp_hyst (temp_hyst2, temp_crit2); -static ssize_t set_temp_hyst1 (struct device *dev,const char *buf, +static ssize_t set_temp_hyst1 (struct device *dev,struct device_attribute *attr,const char *buf,size_t count) {struct i2c_client *client =to_i2c_client (dev);
@@ -300,7 +300,7 @@ static ssize_t set_temp_hyst1(struct devreturn count; } -static ssize_t show_alarms (struct device *dev,char *buf) +static ssize_t show_alarms (struct device *dev,struct device_attribute *attr,char *buf) {struct lm90_data *data =lm90_update_device (dev);return sprintf (buf,"%d\n" , data->alarms);
drivers/i2c/chips/lm92.c +7 -7
@@ -140,7 +140,7 @@ static struct lm92_data *lm92_update_dev }#define show_temp (value) \ -static ssize_t show_##value(struct device *dev, char *buf) \ +static ssize_t show_##value(struct device *dev, struct device_attribute *attr, char *buf) \ { \ struct lm92_data *data = lm92_update_device(dev); \ return sprintf(buf, "%d\n", TEMP_FROM_REG(data->value)); \
@@ -151,7 +151,7 @@ show_temp(temp1_min);show_temp (temp1_max);#define set_temp (value, reg) \ -static ssize_t set_##value(struct device *dev, const char *buf, \ +static ssize_t set_##value(struct device *dev, struct device_attribute *attr, const char *buf, \ size_t count) \ { \ struct i2c_client *client = to_i2c_client(dev); \
@@ -168,26 +168,26 @@ set_temp(temp1_crit, LM92_REG_TEMP_CRIT)set_temp (temp1_min,LM92_REG_TEMP_LOW );set_temp (temp1_max,LM92_REG_TEMP_HIGH ); -static ssize_t show_temp1_crit_hyst (struct device *dev,char *buf) +static ssize_t show_temp1_crit_hyst (struct device *dev,struct device_attribute *attr,char *buf) {struct lm92_data *data =lm92_update_device (dev);return sprintf (buf,"%d\n" ,TEMP_FROM_REG (data->temp1_crit) -TEMP_FROM_REG (data->temp1_hyst)); } -static ssize_t show_temp1_max_hyst (struct device *dev,char *buf) +static ssize_t show_temp1_max_hyst (struct device *dev,struct device_attribute *attr,char *buf) {struct lm92_data *data =lm92_update_device (dev);return sprintf (buf,"%d\n" ,TEMP_FROM_REG (data->temp1_max) -TEMP_FROM_REG (data->temp1_hyst)); } -static ssize_t show_temp1_min_hyst (struct device *dev,char *buf) +static ssize_t show_temp1_min_hyst (struct device *dev,struct device_attribute *attr,char *buf) {struct lm92_data *data =lm92_update_device (dev);return sprintf (buf,"%d\n" ,TEMP_FROM_REG (data->temp1_min) +TEMP_FROM_REG (data->temp1_hyst)); } -static ssize_t set_temp1_crit_hyst (struct device *dev,const char *buf, +static ssize_t set_temp1_crit_hyst (struct device *dev,struct device_attribute *attr,const char *buf,size_t count) {struct i2c_client *client =to_i2c_client (dev);
@@ -202,7 +202,7 @@ static ssize_t set_temp1_crit_hyst(strucreturn count; } -static ssize_t show_alarms (struct device *dev,char *buf) +static ssize_t show_alarms (struct device *dev,struct device_attribute *attr,char *buf) {struct lm92_data *data =lm92_update_device (dev);return sprintf (buf,"%d\n" ,ALARMS_FROM_REG (data->temp1_input));
drivers/i2c/chips/max1619.c +3 -3
@@ -122,7 +122,7 @@ struct max1619_data {*/ #define show_temp (value) \ -static ssize_t show_##value(struct device *dev, char *buf) \ +static ssize_t show_##value(struct device *dev, struct device_attribute *attr, char *buf) \ { \ struct max1619_data *data = max1619_update_device(dev); \ return sprintf(buf, "%d\n", TEMP_FROM_REG(data->value)); \
@@ -135,7 +135,7 @@ show_temp(temp_crit2);show_temp (temp_hyst2);#define set_temp2 (value, reg) \ -static ssize_t set_##value(struct device *dev, const char *buf, \ +static ssize_t set_##value(struct device *dev, struct device_attribute *attr, const char *buf, \ size_t count) \ { \ struct i2c_client *client = to_i2c_client(dev); \
@@ -154,7 +154,7 @@ set_temp2(temp_high2, MAX1619_REG_W_REMOset_temp2 (temp_crit2,MAX1619_REG_W_REMOTE_CRIT );set_temp2 (temp_hyst2,MAX1619_REG_W_TCRIT_HYST ); -static ssize_t show_alarms (struct device *dev,char *buf) +static ssize_t show_alarms (struct device *dev,struct device_attribute *attr,char *buf) {struct max1619_data *data =max1619_update_device (dev);return sprintf (buf,"%d\n" , data->alarms);