Skip to content

L
linux-davinci-2.6.23
Commit 8627f9ba authored by Yani Ioannou's avatar Yani Ioannou Committed by Greg Kroah-Hartman
Browse files
Options

[PATCH] Driver Core: drivers/i2c/chips/lm77.c - max1619.c: update device attribute callbacks 

Signed-off-by: default avatarYani Ioannou <yani.ioannou@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 30f74292
Hide whitespace changes
Inline Side-by-side
Showing with 113 additions and 113 deletions
drivers/i2c/chips/lm77.c
View file @ 8627f9ba
...@@ -103,7 +103,7 @@ static inline int LM77_TEMP_FROM_REG(u16 reg) ...@@ -103,7 +103,7 @@ static inline int LM77_TEMP_FROM_REG(u16 reg)
/* read routines for temperature limits */ /* read routines for temperature limits */
#define show(value) \ #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); \ struct lm77_data *data = lm77_update_device(dev); \
return sprintf(buf, "%d\n", data->value); \ return sprintf(buf, "%d\n", data->value); \
...@@ -116,17 +116,17 @@ show(temp_max); ...@@ -116,17 +116,17 @@ show(temp_max);
show(alarms); show(alarms);
/* read routines for hysteresis values */ /* 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); struct lm77_data *data = lm77_update_device(dev);
return sprintf(buf, "%d\n", data->temp_crit - data->temp_hyst); 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); struct lm77_data *data = lm77_update_device(dev);
return sprintf(buf, "%d\n", data->temp_min + data->temp_hyst); 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); struct lm77_data *data = lm77_update_device(dev);
return sprintf(buf, "%d\n", data->temp_max - data->temp_hyst); return sprintf(buf, "%d\n", data->temp_max - data->temp_hyst);
...@@ -134,7 +134,7 @@ static ssize_t show_temp_max_hyst(struct device *dev, char *buf) ...@@ -134,7 +134,7 @@ static ssize_t show_temp_max_hyst(struct device *dev, char *buf)
/* write routines */ /* write routines */
#define set(value, reg) \ #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 i2c_client *client = to_i2c_client(dev); \
struct lm77_data *data = i2c_get_clientdata(client); \ struct lm77_data *data = i2c_get_clientdata(client); \
...@@ -152,7 +152,7 @@ set(temp_max, LM77_REG_TEMP_MAX); ...@@ -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 /* hysteresis is stored as a relative value on the chip, so it has to be
converted first */ 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 i2c_client *client = to_i2c_client(dev);
struct lm77_data *data = i2c_get_clientdata(client); struct lm77_data *data = i2c_get_clientdata(client);
...@@ -167,7 +167,7 @@ static ssize_t set_temp_crit_hyst(struct device *dev, const char *buf, size_t co ...@@ -167,7 +167,7 @@ static ssize_t set_temp_crit_hyst(struct device *dev, const char *buf, size_t co
} }
/* preserve hysteresis when setting T_crit */ /* 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 i2c_client *client = to_i2c_client(dev);
struct lm77_data *data = i2c_get_clientdata(client); struct lm77_data *data = i2c_get_clientdata(client);
......
drivers/i2c/chips/lm78.c
View file @ 8627f9ba
...@@ -224,28 +224,28 @@ static ssize_t set_in_max(struct device *dev, const char *buf, ...@@ -224,28 +224,28 @@ static ssize_t set_in_max(struct device *dev, const char *buf,
#define show_in_offset(offset) \ #define show_in_offset(offset) \
static ssize_t \ 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); \ return show_in(dev, buf, offset); \
} \ } \
static DEVICE_ATTR(in##offset##_input, S_IRUGO, \ static DEVICE_ATTR(in##offset##_input, S_IRUGO, \
show_in##offset, NULL); \ show_in##offset, NULL); \
static ssize_t \ 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); \ return show_in_min(dev, buf, offset); \
} \ } \
static ssize_t \ 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); \ 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) \ const char *buf, size_t count) \
{ \ { \
return set_in_min(dev, buf, count, offset); \ 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) \ const char *buf, size_t count) \
{ \ { \
return set_in_max(dev, buf, count, offset); \ return set_in_max(dev, buf, count, offset); \
...@@ -264,19 +264,19 @@ show_in_offset(5); ...@@ -264,19 +264,19 @@ show_in_offset(5);
show_in_offset(6); show_in_offset(6);
/* Temperature */ /* 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); struct lm78_data *data = lm78_update_device(dev);
return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp)); 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); struct lm78_data *data = lm78_update_device(dev);
return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_over)); 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 i2c_client *client = to_i2c_client(dev);
struct lm78_data *data = i2c_get_clientdata(client); struct lm78_data *data = i2c_get_clientdata(client);
...@@ -289,13 +289,13 @@ static ssize_t set_temp_over(struct device *dev, const char *buf, size_t count) ...@@ -289,13 +289,13 @@ static ssize_t set_temp_over(struct device *dev, const char *buf, size_t count)
return count; return 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); struct lm78_data *data = lm78_update_device(dev);
return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_hyst)); 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 i2c_client *client = to_i2c_client(dev);
struct lm78_data *data = i2c_get_clientdata(client); struct lm78_data *data = i2c_get_clientdata(client);
...@@ -398,19 +398,19 @@ static ssize_t set_fan_div(struct device *dev, const char *buf, ...@@ -398,19 +398,19 @@ static ssize_t set_fan_div(struct device *dev, const char *buf,
} }
#define show_fan_offset(offset) \ #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); \ 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); \ 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); \ 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) \ const char *buf, size_t count) \
{ \ { \
return set_fan_min(dev, buf, count, offset - 1); \ return set_fan_min(dev, buf, count, offset - 1); \
...@@ -419,13 +419,13 @@ static DEVICE_ATTR(fan##offset##_input, S_IRUGO, show_fan_##offset, NULL);\ ...@@ -419,13 +419,13 @@ static DEVICE_ATTR(fan##offset##_input, S_IRUGO, show_fan_##offset, NULL);\
static DEVICE_ATTR(fan##offset##_min, S_IRUGO | S_IWUSR, \ static DEVICE_ATTR(fan##offset##_min, S_IRUGO | S_IWUSR, \
show_fan_##offset##_min, set_fan_##offset##_min); 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) size_t count)
{ {
return set_fan_div(dev, buf, count, 0) ; 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) size_t count)
{ {
return set_fan_div(dev, buf, count, 1) ; return set_fan_div(dev, buf, count, 1) ;
...@@ -443,7 +443,7 @@ static DEVICE_ATTR(fan2_div, S_IRUGO | S_IWUSR, ...@@ -443,7 +443,7 @@ static DEVICE_ATTR(fan2_div, S_IRUGO | S_IWUSR,
static DEVICE_ATTR(fan3_div, S_IRUGO, show_fan_3_div, NULL); static DEVICE_ATTR(fan3_div, S_IRUGO, show_fan_3_div, NULL);
/* VID */ /* 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); struct lm78_data *data = lm78_update_device(dev);
return sprintf(buf, "%d\n", VID_FROM_REG(data->vid)); return sprintf(buf, "%d\n", VID_FROM_REG(data->vid));
...@@ -451,7 +451,7 @@ static ssize_t show_vid(struct device *dev, char *buf) ...@@ -451,7 +451,7 @@ static ssize_t show_vid(struct device *dev, char *buf)
static DEVICE_ATTR(cpu0_vid, S_IRUGO, show_vid, NULL); static DEVICE_ATTR(cpu0_vid, S_IRUGO, show_vid, NULL);
/* Alarms */ /* 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); struct lm78_data *data = lm78_update_device(dev);
return sprintf(buf, "%u\n", data->alarms); return sprintf(buf, "%u\n", data->alarms);
......
drivers/i2c/chips/lm80.c
View file @ 8627f9ba
...@@ -156,7 +156,7 @@ static struct i2c_driver lm80_driver = { ...@@ -156,7 +156,7 @@ static struct i2c_driver lm80_driver = {
*/ */
#define show_in(suffix, value) \ #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); \ struct lm80_data *data = lm80_update_device(dev); \
return sprintf(buf, "%d\n", IN_FROM_REG(data->value)); \ return sprintf(buf, "%d\n", IN_FROM_REG(data->value)); \
...@@ -184,7 +184,7 @@ show_in(input5, in[5]); ...@@ -184,7 +184,7 @@ show_in(input5, in[5]);
show_in(input6, in[6]); show_in(input6, in[6]);
#define set_in(suffix, value, reg) \ #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) \ size_t count) \
{ \ { \
struct i2c_client *client = to_i2c_client(dev); \ struct i2c_client *client = to_i2c_client(dev); \
...@@ -213,7 +213,7 @@ set_in(max5, in_max[5], LM80_REG_IN_MAX(5)); ...@@ -213,7 +213,7 @@ set_in(max5, in_max[5], LM80_REG_IN_MAX(5));
set_in(max6, in_max[6], LM80_REG_IN_MAX(6)); set_in(max6, in_max[6], LM80_REG_IN_MAX(6));
#define show_fan(suffix, value, div) \ #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); \ struct lm80_data *data = lm80_update_device(dev); \
return sprintf(buf, "%d\n", FAN_FROM_REG(data->value, \ return sprintf(buf, "%d\n", FAN_FROM_REG(data->value, \
...@@ -225,7 +225,7 @@ show_fan(input1, fan[0], fan_div[0]); ...@@ -225,7 +225,7 @@ show_fan(input1, fan[0], fan_div[0]);
show_fan(input2, fan[1], fan_div[1]); show_fan(input2, fan[1], fan_div[1]);
#define show_fan_div(suffix, value) \ #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); \ struct lm80_data *data = lm80_update_device(dev); \
return sprintf(buf, "%d\n", DIV_FROM_REG(data->value)); \ return sprintf(buf, "%d\n", DIV_FROM_REG(data->value)); \
...@@ -234,7 +234,7 @@ show_fan_div(1, fan_div[0]); ...@@ -234,7 +234,7 @@ show_fan_div(1, fan_div[0]);
show_fan_div(2, fan_div[1]); show_fan_div(2, fan_div[1]);
#define set_fan(suffix, value, reg, div) \ #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) \ size_t count) \
{ \ { \
struct i2c_client *client = to_i2c_client(dev); \ struct i2c_client *client = to_i2c_client(dev); \
...@@ -292,7 +292,7 @@ static ssize_t set_fan_div(struct device *dev, const char *buf, ...@@ -292,7 +292,7 @@ static ssize_t set_fan_div(struct device *dev, const char *buf,
} }
#define set_fan_div(number) \ #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) \ size_t count) \
{ \ { \
return set_fan_div(dev, buf, count, number - 1); \ return set_fan_div(dev, buf, count, number - 1); \
...@@ -300,14 +300,14 @@ static ssize_t set_fan_div##number(struct device *dev, const char *buf, \ ...@@ -300,14 +300,14 @@ static ssize_t set_fan_div##number(struct device *dev, const char *buf, \
set_fan_div(1); set_fan_div(1);
set_fan_div(2); 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); struct lm80_data *data = lm80_update_device(dev);
return sprintf(buf, "%ld\n", TEMP_FROM_REG(data->temp)); return sprintf(buf, "%ld\n", TEMP_FROM_REG(data->temp));
} }
#define show_temp(suffix, value) \ #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); \ struct lm80_data *data = lm80_update_device(dev); \
return sprintf(buf, "%d\n", TEMP_LIMIT_FROM_REG(data->value)); \ return sprintf(buf, "%d\n", TEMP_LIMIT_FROM_REG(data->value)); \
...@@ -318,7 +318,7 @@ show_temp(os_max, temp_os_max); ...@@ -318,7 +318,7 @@ show_temp(os_max, temp_os_max);
show_temp(os_hyst, temp_os_hyst); show_temp(os_hyst, temp_os_hyst);
#define set_temp(suffix, value, reg) \ #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) \ size_t count) \
{ \ { \
struct i2c_client *client = to_i2c_client(dev); \ struct i2c_client *client = to_i2c_client(dev); \
...@@ -336,7 +336,7 @@ set_temp(hot_hyst, temp_hot_hyst, LM80_REG_TEMP_HOT_HYST); ...@@ -336,7 +336,7 @@ set_temp(hot_hyst, temp_hot_hyst, LM80_REG_TEMP_HOT_HYST);
set_temp(os_max, temp_os_max, LM80_REG_TEMP_OS_MAX); set_temp(os_max, temp_os_max, LM80_REG_TEMP_OS_MAX);
set_temp(os_hyst, temp_os_hyst, LM80_REG_TEMP_OS_HYST); 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); struct lm80_data *data = lm80_update_device(dev);
return sprintf(buf, "%u\n", data->alarms); return sprintf(buf, "%u\n", data->alarms);
......
drivers/i2c/chips/lm83.c
View file @ 8627f9ba
...@@ -155,7 +155,7 @@ struct lm83_data { ...@@ -155,7 +155,7 @@ struct lm83_data {
*/ */
#define show_temp(suffix, value) \ #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); \ struct lm83_data *data = lm83_update_device(dev); \
return sprintf(buf, "%d\n", TEMP_FROM_REG(data->value)); \ return sprintf(buf, "%d\n", TEMP_FROM_REG(data->value)); \
...@@ -171,7 +171,7 @@ show_temp(high4, temp_high[3]); ...@@ -171,7 +171,7 @@ show_temp(high4, temp_high[3]);
show_temp(crit, temp_crit); show_temp(crit, temp_crit);
#define set_temp(suffix, value, reg) \ #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) \ size_t count) \
{ \ { \
struct i2c_client *client = to_i2c_client(dev); \ struct i2c_client *client = to_i2c_client(dev); \
...@@ -190,7 +190,7 @@ set_temp(high3, temp_high[2], LM83_REG_W_REMOTE2_HIGH); ...@@ -190,7 +190,7 @@ set_temp(high3, temp_high[2], LM83_REG_W_REMOTE2_HIGH);
set_temp(high4, temp_high[3], LM83_REG_W_REMOTE3_HIGH); set_temp(high4, temp_high[3], LM83_REG_W_REMOTE3_HIGH);
set_temp(crit, temp_crit, LM83_REG_W_TCRIT); 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); struct lm83_data *data = lm83_update_device(dev);
return sprintf(buf, "%d\n", data->alarms); return sprintf(buf, "%d\n", data->alarms);
......
drivers/i2c/chips/lm85.c
View file @ 8627f9ba
...@@ -426,15 +426,15 @@ static ssize_t set_fan_min(struct device *dev, const char *buf, ...@@ -426,15 +426,15 @@ static ssize_t set_fan_min(struct device *dev, const char *buf,
} }
#define show_fan_offset(offset) \ #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); \ 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); \ return show_fan_min(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) \ const char *buf, size_t count) \
{ \ { \
return set_fan_min(dev, buf, count, offset - 1); \ return set_fan_min(dev, buf, count, offset - 1); \
...@@ -451,7 +451,7 @@ show_fan_offset(4); ...@@ -451,7 +451,7 @@ show_fan_offset(4);
/* vid, vrm, alarms */ /* vid, vrm, alarms */
static ssize_t show_vid_reg(struct device *dev, char *buf) static ssize_t show_vid_reg(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct lm85_data *data = lm85_update_device(dev); struct lm85_data *data = lm85_update_device(dev);
return sprintf(buf, "%ld\n", (long) vid_from_reg(data->vid, data->vrm)); return sprintf(buf, "%ld\n", (long) vid_from_reg(data->vid, data->vrm));
...@@ -459,13 +459,13 @@ static ssize_t show_vid_reg(struct device *dev, char *buf) ...@@ -459,13 +459,13 @@ static ssize_t show_vid_reg(struct device *dev, char *buf)
static DEVICE_ATTR(cpu0_vid, S_IRUGO, show_vid_reg, NULL); static DEVICE_ATTR(cpu0_vid, S_IRUGO, show_vid_reg, NULL);
static ssize_t show_vrm_reg(struct device *dev, char *buf) static ssize_t show_vrm_reg(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct lm85_data *data = lm85_update_device(dev); struct lm85_data *data = lm85_update_device(dev);
return sprintf(buf, "%ld\n", (long) data->vrm); return sprintf(buf, "%ld\n", (long) data->vrm);
} }
static ssize_t store_vrm_reg(struct device *dev, const char *buf, size_t count) static ssize_t store_vrm_reg(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
{ {
struct i2c_client *client = to_i2c_client(dev); struct i2c_client *client = to_i2c_client(dev);
struct lm85_data *data = i2c_get_clientdata(client); struct lm85_data *data = i2c_get_clientdata(client);
...@@ -478,7 +478,7 @@ static ssize_t store_vrm_reg(struct device *dev, const char *buf, size_t count) ...@@ -478,7 +478,7 @@ static ssize_t store_vrm_reg(struct device *dev, const char *buf, size_t count)
static DEVICE_ATTR(vrm, S_IRUGO | S_IWUSR, show_vrm_reg, store_vrm_reg); static DEVICE_ATTR(vrm, S_IRUGO | S_IWUSR, show_vrm_reg, store_vrm_reg);
static ssize_t show_alarms_reg(struct device *dev, char *buf) static ssize_t show_alarms_reg(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct lm85_data *data = lm85_update_device(dev); struct lm85_data *data = lm85_update_device(dev);
return sprintf(buf, "%ld\n", (long) ALARMS_FROM_REG(data->alarms)); return sprintf(buf, "%ld\n", (long) ALARMS_FROM_REG(data->alarms));
...@@ -516,16 +516,16 @@ static ssize_t show_pwm_enable(struct device *dev, char *buf, int nr) ...@@ -516,16 +516,16 @@ static ssize_t show_pwm_enable(struct device *dev, char *buf, int nr)
} }
#define show_pwm_reg(offset) \ #define show_pwm_reg(offset) \
static ssize_t show_pwm_##offset (struct device *dev, char *buf) \ static ssize_t show_pwm_##offset (struct device *dev, struct device_attribute *attr, char *buf) \
{ \ { \
return show_pwm(dev, buf, offset - 1); \ return show_pwm(dev, buf, offset - 1); \
} \ } \
static ssize_t set_pwm_##offset (struct device *dev, \ static ssize_t set_pwm_##offset (struct device *dev, struct device_attribute *attr, \
const char *buf, size_t count) \ const char *buf, size_t count) \
{ \ { \
return set_pwm(dev, buf, count, offset - 1); \ return set_pwm(dev, buf, count, offset - 1); \
} \ } \
static ssize_t show_pwm_enable##offset (struct device *dev, char *buf) \ static ssize_t show_pwm_enable##offset (struct device *dev, struct device_attribute *attr, char *buf) \
{ \ { \
return show_pwm_enable(dev, buf, offset - 1); \ return show_pwm_enable(dev, buf, offset - 1); \
} \ } \
...@@ -585,24 +585,24 @@ static ssize_t set_in_max(struct device *dev, const char *buf, ...@@ -585,24 +585,24 @@ static ssize_t set_in_max(struct device *dev, const char *buf,
return count; return count;
} }
#define show_in_reg(offset) \ #define show_in_reg(offset) \
static ssize_t show_in_##offset (struct device *dev, char *buf) \ static ssize_t show_in_##offset (struct device *dev, struct device_attribute *attr, char *buf) \
{ \ { \
return show_in(dev, buf, offset); \ return show_in(dev, buf, offset); \
} \ } \
static ssize_t show_in_##offset##_min (struct device *dev, char *buf) \ static ssize_t show_in_##offset##_min (struct device *dev, struct device_attribute *attr, char *buf) \
{ \ { \
return show_in_min(dev, buf, offset); \ return show_in_min(dev, buf, offset); \
} \ } \
static ssize_t show_in_##offset##_max (struct device *dev, char *buf) \ static ssize_t show_in_##offset##_max (struct device *dev, struct device_attribute *attr, char *buf) \
{ \ { \
return show_in_max(dev, buf, offset); \ 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) \ const char *buf, size_t count) \
{ \ { \
return set_in_min(dev, buf, count, offset); \ 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) \ const char *buf, size_t count) \
{ \ { \
return set_in_max(dev, buf, count, offset); \ return set_in_max(dev, buf, count, offset); \
...@@ -666,24 +666,24 @@ static ssize_t set_temp_max(struct device *dev, const char *buf, ...@@ -666,24 +666,24 @@ static ssize_t set_temp_max(struct device *dev, const char *buf,
return count; return count;
} }
#define show_temp_reg(offset) \ #define show_temp_reg(offset) \
static ssize_t show_temp_##offset (struct device *dev, char *buf) \ static ssize_t show_temp_##offset (struct device *dev, struct device_attribute *attr, char *buf) \
{ \ { \
return show_temp(dev, buf, offset - 1); \ return show_temp(dev, buf, offset - 1); \
} \ } \
static ssize_t show_temp_##offset##_min (struct device *dev, char *buf) \ static ssize_t show_temp_##offset##_min (struct device *dev, struct device_attribute *attr, char *buf) \
{ \ { \
return show_temp_min(dev, buf, offset - 1); \ return show_temp_min(dev, buf, offset - 1); \
} \ } \
static ssize_t show_temp_##offset##_max (struct device *dev, char *buf) \ static ssize_t show_temp_##offset##_max (struct device *dev, struct device_attribute *attr, char *buf) \
{ \ { \
return show_temp_max(dev, buf, offset - 1); \ return show_temp_max(dev, buf, offset - 1); \
} \ } \
static ssize_t set_temp_##offset##_min (struct device *dev, \ static ssize_t set_temp_##offset##_min (struct device *dev, struct device_attribute *attr, \
const char *buf, size_t count) \ const char *buf, size_t count) \
{ \ { \
return set_temp_min(dev, buf, count, offset - 1); \ return set_temp_min(dev, buf, count, offset - 1); \
} \ } \
static ssize_t set_temp_##offset##_max (struct device *dev, \ static ssize_t set_temp_##offset##_max (struct device *dev, struct device_attribute *attr, \
const char *buf, size_t count) \ const char *buf, size_t count) \
{ \ { \
return set_temp_max(dev, buf, count, offset - 1); \ return set_temp_max(dev, buf, count, offset - 1); \
...@@ -786,42 +786,42 @@ static ssize_t set_pwm_auto_pwm_freq(struct device *dev, const char *buf, ...@@ -786,42 +786,42 @@ static ssize_t set_pwm_auto_pwm_freq(struct device *dev, const char *buf,
return count; return count;
} }
#define pwm_auto(offset) \ #define pwm_auto(offset) \
static ssize_t show_pwm##offset##_auto_channels (struct device *dev, \ static ssize_t show_pwm##offset##_auto_channels (struct device *dev, struct device_attribute *attr, \
char *buf) \ char *buf) \
{ \ { \
return show_pwm_auto_channels(dev, buf, offset - 1); \ return show_pwm_auto_channels(dev, buf, offset - 1); \
} \ } \
static ssize_t set_pwm##offset##_auto_channels (struct device *dev, \ static ssize_t set_pwm##offset##_auto_channels (struct device *dev, struct device_attribute *attr, \
const char *buf, size_t count) \ const char *buf, size_t count) \
{ \ { \
return set_pwm_auto_channels(dev, buf, count, offset - 1); \ return set_pwm_auto_channels(dev, buf, count, offset - 1); \
} \ } \
static ssize_t show_pwm##offset##_auto_pwm_min (struct device *dev, \ static ssize_t show_pwm##offset##_auto_pwm_min (struct device *dev, struct device_attribute *attr, \
char *buf) \ char *buf) \
{ \ { \
return show_pwm_auto_pwm_min(dev, buf, offset - 1); \ return show_pwm_auto_pwm_min(dev, buf, offset - 1); \
} \ } \
static ssize_t set_pwm##offset##_auto_pwm_min (struct device *dev, \ static ssize_t set_pwm##offset##_auto_pwm_min (struct device *dev, struct device_attribute *attr, \
const char *buf, size_t count) \ const char *buf, size_t count) \
{ \ { \
return set_pwm_auto_pwm_min(dev, buf, count, offset - 1); \ return set_pwm_auto_pwm_min(dev, buf, count, offset - 1); \
} \ } \
static ssize_t show_pwm##offset##_auto_pwm_minctl (struct device *dev, \ static ssize_t show_pwm##offset##_auto_pwm_minctl (struct device *dev, struct device_attribute *attr, \
char *buf) \ char *buf) \
{ \ { \
return show_pwm_auto_pwm_minctl(dev, buf, offset - 1); \ return show_pwm_auto_pwm_minctl(dev, buf, offset - 1); \
} \ } \
static ssize_t set_pwm##offset##_auto_pwm_minctl (struct device *dev, \ static ssize_t set_pwm##offset##_auto_pwm_minctl (struct device *dev, struct device_attribute *attr, \
const char *buf, size_t count) \ const char *buf, size_t count) \
{ \ { \
return set_pwm_auto_pwm_minctl(dev, buf, count, offset - 1); \ return set_pwm_auto_pwm_minctl(dev, buf, count, offset - 1); \
} \ } \
static ssize_t show_pwm##offset##_auto_pwm_freq (struct device *dev, \ static ssize_t show_pwm##offset##_auto_pwm_freq (struct device *dev, struct device_attribute *attr, \
char *buf) \ char *buf) \
{ \ { \
return show_pwm_auto_pwm_freq(dev, buf, offset - 1); \ return show_pwm_auto_pwm_freq(dev, buf, offset - 1); \
} \ } \
static ssize_t set_pwm##offset##_auto_pwm_freq(struct device *dev, \ static ssize_t set_pwm##offset##_auto_pwm_freq(struct device *dev, struct device_attribute *attr, \
const char *buf, size_t count) \ const char *buf, size_t count) \
{ \ { \
return set_pwm_auto_pwm_freq(dev, buf, count, offset - 1); \ return set_pwm_auto_pwm_freq(dev, buf, count, offset - 1); \
...@@ -962,42 +962,42 @@ static ssize_t set_temp_auto_temp_crit(struct device *dev, const char *buf, ...@@ -962,42 +962,42 @@ static ssize_t set_temp_auto_temp_crit(struct device *dev, const char *buf,
return count; return count;
} }
#define temp_auto(offset) \ #define temp_auto(offset) \
static ssize_t show_temp##offset##_auto_temp_off (struct device *dev, \ static ssize_t show_temp##offset##_auto_temp_off (struct device *dev, struct device_attribute *attr, \
char *buf) \ char *buf) \
{ \ { \
return show_temp_auto_temp_off(dev, buf, offset - 1); \ return show_temp_auto_temp_off(dev, buf, offset - 1); \
} \ } \
static ssize_t set_temp##offset##_auto_temp_off (struct device *dev, \ static ssize_t set_temp##offset##_auto_temp_off (struct device *dev, struct device_attribute *attr, \
const char *buf, size_t count) \ const char *buf, size_t count) \
{ \ { \
return set_temp_auto_temp_off(dev, buf, count, offset - 1); \ return set_temp_auto_temp_off(dev, buf, count, offset - 1); \
} \ } \
static ssize_t show_temp##offset##_auto_temp_min (struct device *dev, \ static ssize_t show_temp##offset##_auto_temp_min (struct device *dev, struct device_attribute *attr, \
char *buf) \ char *buf) \
{ \ { \
return show_temp_auto_temp_min(dev, buf, offset - 1); \ return show_temp_auto_temp_min(dev, buf, offset - 1); \
} \ } \
static ssize_t set_temp##offset##_auto_temp_min (struct device *dev, \ static ssize_t set_temp##offset##_auto_temp_min (struct device *dev, struct device_attribute *attr, \
const char *buf, size_t count) \ const char *buf, size_t count) \
{ \ { \
return set_temp_auto_temp_min(dev, buf, count, offset - 1); \ return set_temp_auto_temp_min(dev, buf, count, offset - 1); \
} \ } \
static ssize_t show_temp##offset##_auto_temp_max (struct device *dev, \ static ssize_t show_temp##offset##_auto_temp_max (struct device *dev, struct device_attribute *attr, \
char *buf) \ char *buf) \
{ \ { \
return show_temp_auto_temp_max(dev, buf, offset - 1); \ return show_temp_auto_temp_max(dev, buf, offset - 1); \
} \ } \
static ssize_t set_temp##offset##_auto_temp_max (struct device *dev, \ static ssize_t set_temp##offset##_auto_temp_max (struct device *dev, struct device_attribute *attr, \
const char *buf, size_t count) \ const char *buf, size_t count) \
{ \ { \
return set_temp_auto_temp_max(dev, buf, count, offset - 1); \ return set_temp_auto_temp_max(dev, buf, count, offset - 1); \
} \ } \
static ssize_t show_temp##offset##_auto_temp_crit (struct device *dev, \ static ssize_t show_temp##offset##_auto_temp_crit (struct device *dev, struct device_attribute *attr, \
char *buf) \ char *buf) \
{ \ { \
return show_temp_auto_temp_crit(dev, buf, offset - 1); \ return show_temp_auto_temp_crit(dev, buf, offset - 1); \
} \ } \
static ssize_t set_temp##offset##_auto_temp_crit (struct device *dev, \ static ssize_t set_temp##offset##_auto_temp_crit (struct device *dev, struct device_attribute *attr, \
const char *buf, size_t count) \ const char *buf, size_t count) \
{ \ { \
return set_temp_auto_temp_crit(dev, buf, count, offset - 1); \ return set_temp_auto_temp_crit(dev, buf, count, offset - 1); \
......
drivers/i2c/chips/lm87.c
View file @ 8627f9ba
...@@ -218,19 +218,19 @@ static inline int lm87_write_value(struct i2c_client *client, u8 reg, u8 value) ...@@ -218,19 +218,19 @@ static inline int lm87_write_value(struct i2c_client *client, u8 reg, u8 value)
} }
#define show_in(offset) \ #define show_in(offset) \
static ssize_t show_in##offset##_input(struct device *dev, char *buf) \ static ssize_t show_in##offset##_input(struct device *dev, struct device_attribute *attr, char *buf) \
{ \ { \
struct lm87_data *data = lm87_update_device(dev); \ struct lm87_data *data = lm87_update_device(dev); \
return sprintf(buf, "%u\n", IN_FROM_REG(data->in[offset], \ return sprintf(buf, "%u\n", IN_FROM_REG(data->in[offset], \
data->in_scale[offset])); \ data->in_scale[offset])); \
} \ } \
static ssize_t show_in##offset##_min(struct device *dev, char *buf) \ static ssize_t show_in##offset##_min(struct device *dev, struct device_attribute *attr, char *buf) \
{ \ { \
struct lm87_data *data = lm87_update_device(dev); \ struct lm87_data *data = lm87_update_device(dev); \
return sprintf(buf, "%u\n", IN_FROM_REG(data->in_min[offset], \ return sprintf(buf, "%u\n", IN_FROM_REG(data->in_min[offset], \
data->in_scale[offset])); \ data->in_scale[offset])); \
} \ } \
static ssize_t show_in##offset##_max(struct device *dev, char *buf) \ static ssize_t show_in##offset##_max(struct device *dev, struct device_attribute *attr, char *buf) \
{ \ { \
struct lm87_data *data = lm87_update_device(dev); \ struct lm87_data *data = lm87_update_device(dev); \
return sprintf(buf, "%u\n", IN_FROM_REG(data->in_max[offset], \ return sprintf(buf, "%u\n", IN_FROM_REG(data->in_max[offset], \
...@@ -274,13 +274,13 @@ static void set_in_max(struct device *dev, const char *buf, int nr) ...@@ -274,13 +274,13 @@ static void set_in_max(struct device *dev, const char *buf, int nr)
} }
#define set_in(offset) \ #define set_in(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) \ const char *buf, size_t count) \
{ \ { \
set_in_min(dev, buf, offset); \ set_in_min(dev, buf, offset); \
return count; \ return count; \
} \ } \
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) \ const char *buf, size_t count) \
{ \ { \
set_in_max(dev, buf, offset); \ set_in_max(dev, buf, offset); \
...@@ -300,17 +300,17 @@ set_in(6); ...@@ -300,17 +300,17 @@ set_in(6);
set_in(7); set_in(7);
#define show_temp(offset) \ #define show_temp(offset) \
static ssize_t show_temp##offset##_input(struct device *dev, char *buf) \ static ssize_t show_temp##offset##_input(struct device *dev, struct device_attribute *attr, char *buf) \
{ \ { \
struct lm87_data *data = lm87_update_device(dev); \ struct lm87_data *data = lm87_update_device(dev); \
return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp[offset-1])); \ return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp[offset-1])); \
} \ } \
static ssize_t show_temp##offset##_low(struct device *dev, char *buf) \ static ssize_t show_temp##offset##_low(struct device *dev, struct device_attribute *attr, char *buf) \
{ \ { \
struct lm87_data *data = lm87_update_device(dev); \ struct lm87_data *data = lm87_update_device(dev); \
return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_low[offset-1])); \ return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_low[offset-1])); \
} \ } \
static ssize_t show_temp##offset##_high(struct device *dev, char *buf) \ static ssize_t show_temp##offset##_high(struct device *dev, struct device_attribute *attr, char *buf) \
{ \ { \
struct lm87_data *data = lm87_update_device(dev); \ struct lm87_data *data = lm87_update_device(dev); \
return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_high[offset-1])); \ return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_high[offset-1])); \
...@@ -346,13 +346,13 @@ static void set_temp_high(struct device *dev, const char *buf, int nr) ...@@ -346,13 +346,13 @@ static void set_temp_high(struct device *dev, const char *buf, int nr)
} }
#define set_temp(offset) \ #define set_temp(offset) \
static ssize_t set_temp##offset##_low(struct device *dev, \ static ssize_t set_temp##offset##_low(struct device *dev, struct device_attribute *attr, \
const char *buf, size_t count) \ const char *buf, size_t count) \
{ \ { \
set_temp_low(dev, buf, offset-1); \ set_temp_low(dev, buf, offset-1); \
return count; \ return count; \
} \ } \
static ssize_t set_temp##offset##_high(struct device *dev, \ static ssize_t set_temp##offset##_high(struct device *dev, struct device_attribute *attr, \
const char *buf, size_t count) \ const char *buf, size_t count) \
{ \ { \
set_temp_high(dev, buf, offset-1); \ set_temp_high(dev, buf, offset-1); \
...@@ -366,13 +366,13 @@ set_temp(1); ...@@ -366,13 +366,13 @@ set_temp(1);
set_temp(2); set_temp(2);
set_temp(3); set_temp(3);
static ssize_t show_temp_crit_int(struct device *dev, char *buf) static ssize_t show_temp_crit_int(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct lm87_data *data = lm87_update_device(dev); struct lm87_data *data = lm87_update_device(dev);
return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_crit_int)); return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_crit_int));
} }
static ssize_t show_temp_crit_ext(struct device *dev, char *buf) static ssize_t show_temp_crit_ext(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct lm87_data *data = lm87_update_device(dev); struct lm87_data *data = lm87_update_device(dev);
return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_crit_ext)); return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_crit_ext));
...@@ -383,19 +383,19 @@ static DEVICE_ATTR(temp2_crit, S_IRUGO, show_temp_crit_ext, NULL); ...@@ -383,19 +383,19 @@ static DEVICE_ATTR(temp2_crit, S_IRUGO, show_temp_crit_ext, NULL);
static DEVICE_ATTR(temp3_crit, S_IRUGO, show_temp_crit_ext, NULL); static DEVICE_ATTR(temp3_crit, S_IRUGO, show_temp_crit_ext, NULL);
#define show_fan(offset) \ #define show_fan(offset) \
static ssize_t show_fan##offset##_input(struct device *dev, char *buf) \ static ssize_t show_fan##offset##_input(struct device *dev, struct device_attribute *attr, char *buf) \
{ \ { \
struct lm87_data *data = lm87_update_device(dev); \ struct lm87_data *data = lm87_update_device(dev); \
return sprintf(buf, "%d\n", FAN_FROM_REG(data->fan[offset-1], \ return sprintf(buf, "%d\n", FAN_FROM_REG(data->fan[offset-1], \
FAN_DIV_FROM_REG(data->fan_div[offset-1]))); \ FAN_DIV_FROM_REG(data->fan_div[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) \
{ \ { \
struct lm87_data *data = lm87_update_device(dev); \ struct lm87_data *data = lm87_update_device(dev); \
return sprintf(buf, "%d\n", FAN_FROM_REG(data->fan_min[offset-1], \ return sprintf(buf, "%d\n", FAN_FROM_REG(data->fan_min[offset-1], \
FAN_DIV_FROM_REG(data->fan_div[offset-1]))); \ FAN_DIV_FROM_REG(data->fan_div[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) \
{ \ { \
struct lm87_data *data = lm87_update_device(dev); \ struct lm87_data *data = lm87_update_device(dev); \
return sprintf(buf, "%d\n", FAN_DIV_FROM_REG(data->fan_div[offset-1])); \ return sprintf(buf, "%d\n", FAN_DIV_FROM_REG(data->fan_div[offset-1])); \
...@@ -465,13 +465,13 @@ static ssize_t set_fan_div(struct device *dev, const char *buf, ...@@ -465,13 +465,13 @@ static ssize_t set_fan_div(struct device *dev, const char *buf,
} }
#define set_fan(offset) \ #define set_fan(offset) \
static ssize_t set_fan##offset##_min(struct device *dev, const char *buf, \ static ssize_t set_fan##offset##_min(struct device *dev, struct device_attribute *attr, const char *buf, \
size_t count) \ size_t count) \
{ \ { \
set_fan_min(dev, buf, offset-1); \ set_fan_min(dev, buf, offset-1); \
return count; \ return count; \
} \ } \
static ssize_t set_fan##offset##_div(struct device *dev, const char *buf, \ static ssize_t set_fan##offset##_div(struct device *dev, struct device_attribute *attr, const char *buf, \
size_t count) \ size_t count) \
{ \ { \
return set_fan_div(dev, buf, count, offset-1); \ return set_fan_div(dev, buf, count, offset-1); \
...@@ -483,26 +483,26 @@ static DEVICE_ATTR(fan##offset##_div, S_IRUGO | S_IWUSR, \ ...@@ -483,26 +483,26 @@ static DEVICE_ATTR(fan##offset##_div, S_IRUGO | S_IWUSR, \
set_fan(1); set_fan(1);
set_fan(2); set_fan(2);
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 lm87_data *data = lm87_update_device(dev); struct lm87_data *data = lm87_update_device(dev);
return sprintf(buf, "%d\n", data->alarms); return sprintf(buf, "%d\n", data->alarms);
} }
static DEVICE_ATTR(alarms, S_IRUGO, show_alarms, NULL); static DEVICE_ATTR(alarms, S_IRUGO, show_alarms, NULL);
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 lm87_data *data = lm87_update_device(dev); struct lm87_data *data = lm87_update_device(dev);
return sprintf(buf, "%d\n", vid_from_reg(data->vid, data->vrm)); return sprintf(buf, "%d\n", vid_from_reg(data->vid, data->vrm));
} }
static DEVICE_ATTR(cpu0_vid, S_IRUGO, show_vid, NULL); static DEVICE_ATTR(cpu0_vid, S_IRUGO, show_vid, NULL);
static ssize_t show_vrm(struct device *dev, char *buf) static ssize_t show_vrm(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct lm87_data *data = lm87_update_device(dev); struct lm87_data *data = lm87_update_device(dev);
return sprintf(buf, "%d\n", data->vrm); return sprintf(buf, "%d\n", data->vrm);
} }
static ssize_t set_vrm(struct device *dev, const char *buf, size_t count) static ssize_t set_vrm(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
{ {
struct i2c_client *client = to_i2c_client(dev); struct i2c_client *client = to_i2c_client(dev);
struct lm87_data *data = i2c_get_clientdata(client); struct lm87_data *data = i2c_get_clientdata(client);
...@@ -511,12 +511,12 @@ static ssize_t set_vrm(struct device *dev, const char *buf, size_t count) ...@@ -511,12 +511,12 @@ static ssize_t set_vrm(struct device *dev, const char *buf, size_t count)
} }
static DEVICE_ATTR(vrm, S_IRUGO | S_IWUSR, show_vrm, set_vrm); static DEVICE_ATTR(vrm, S_IRUGO | S_IWUSR, show_vrm, set_vrm);
static ssize_t show_aout(struct device *dev, char *buf) static ssize_t show_aout(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct lm87_data *data = lm87_update_device(dev); struct lm87_data *data = lm87_update_device(dev);
return sprintf(buf, "%d\n", AOUT_FROM_REG(data->aout)); return sprintf(buf, "%d\n", AOUT_FROM_REG(data->aout));
} }
static ssize_t set_aout(struct device *dev, const char *buf, size_t count) static ssize_t set_aout(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
{ {
struct i2c_client *client = to_i2c_client(dev); struct i2c_client *client = to_i2c_client(dev);
struct lm87_data *data = i2c_get_clientdata(client); struct lm87_data *data = i2c_get_clientdata(client);
......
drivers/i2c/chips/lm90.c
View file @ 8627f9ba
...@@ -218,7 +218,7 @@ struct lm90_data { ...@@ -218,7 +218,7 @@ struct lm90_data {
*/ */
#define show_temp(value, converter) \ #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); \ struct lm90_data *data = lm90_update_device(dev); \
return sprintf(buf, "%d\n", converter(data->value)); \ return sprintf(buf, "%d\n", converter(data->value)); \
...@@ -233,7 +233,7 @@ show_temp(temp_crit1, TEMP1_FROM_REG); ...@@ -233,7 +233,7 @@ show_temp(temp_crit1, TEMP1_FROM_REG);
show_temp(temp_crit2, TEMP1_FROM_REG); show_temp(temp_crit2, TEMP1_FROM_REG);
#define set_temp1(value, 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) \ size_t count) \
{ \ { \
struct i2c_client *client = to_i2c_client(dev); \ struct i2c_client *client = to_i2c_client(dev); \
...@@ -250,7 +250,7 @@ static ssize_t set_##value(struct device *dev, const char *buf, \ ...@@ -250,7 +250,7 @@ static ssize_t set_##value(struct device *dev, const char *buf, \
return count; \ return count; \
} }
#define set_temp2(value, regh, regl) \ #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) \ size_t count) \
{ \ { \
struct i2c_client *client = to_i2c_client(dev); \ struct i2c_client *client = to_i2c_client(dev); \
...@@ -275,7 +275,7 @@ set_temp1(temp_crit1, LM90_REG_W_LOCAL_CRIT); ...@@ -275,7 +275,7 @@ set_temp1(temp_crit1, LM90_REG_W_LOCAL_CRIT);
set_temp1(temp_crit2, LM90_REG_W_REMOTE_CRIT); set_temp1(temp_crit2, LM90_REG_W_REMOTE_CRIT);
#define show_temp_hyst(value, basereg) \ #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); \ struct lm90_data *data = lm90_update_device(dev); \
return sprintf(buf, "%d\n", TEMP1_FROM_REG(data->basereg) \ return sprintf(buf, "%d\n", TEMP1_FROM_REG(data->basereg) \
...@@ -284,7 +284,7 @@ static ssize_t show_##value(struct device *dev, char *buf) \ ...@@ -284,7 +284,7 @@ static ssize_t show_##value(struct device *dev, char *buf) \
show_temp_hyst(temp_hyst1, temp_crit1); show_temp_hyst(temp_hyst1, temp_crit1);
show_temp_hyst(temp_hyst2, temp_crit2); 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) size_t count)
{ {
struct i2c_client *client = to_i2c_client(dev); struct i2c_client *client = to_i2c_client(dev);
...@@ -300,7 +300,7 @@ static ssize_t set_temp_hyst1(struct device *dev, const char *buf, ...@@ -300,7 +300,7 @@ static ssize_t set_temp_hyst1(struct device *dev, const char *buf,
return count; return 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); struct lm90_data *data = lm90_update_device(dev);
return sprintf(buf, "%d\n", data->alarms); return sprintf(buf, "%d\n", data->alarms);
......
drivers/i2c/chips/lm92.c
View file @ 8627f9ba
...@@ -140,7 +140,7 @@ static struct lm92_data *lm92_update_device(struct device *dev) ...@@ -140,7 +140,7 @@ static struct lm92_data *lm92_update_device(struct device *dev)
} }
#define show_temp(value) \ #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); \ struct lm92_data *data = lm92_update_device(dev); \
return sprintf(buf, "%d\n", TEMP_FROM_REG(data->value)); \ return sprintf(buf, "%d\n", TEMP_FROM_REG(data->value)); \
...@@ -151,7 +151,7 @@ show_temp(temp1_min); ...@@ -151,7 +151,7 @@ show_temp(temp1_min);
show_temp(temp1_max); show_temp(temp1_max);
#define set_temp(value, reg) \ #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) \ size_t count) \
{ \ { \
struct i2c_client *client = to_i2c_client(dev); \ struct i2c_client *client = to_i2c_client(dev); \
...@@ -168,26 +168,26 @@ set_temp(temp1_crit, LM92_REG_TEMP_CRIT); ...@@ -168,26 +168,26 @@ set_temp(temp1_crit, LM92_REG_TEMP_CRIT);
set_temp(temp1_min, LM92_REG_TEMP_LOW); set_temp(temp1_min, LM92_REG_TEMP_LOW);
set_temp(temp1_max, LM92_REG_TEMP_HIGH); 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); struct lm92_data *data = lm92_update_device(dev);
return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp1_crit) return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp1_crit)
- TEMP_FROM_REG(data->temp1_hyst)); - 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); struct lm92_data *data = lm92_update_device(dev);
return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp1_max) return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp1_max)
- TEMP_FROM_REG(data->temp1_hyst)); - 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); struct lm92_data *data = lm92_update_device(dev);
return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp1_min) return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp1_min)
+ TEMP_FROM_REG(data->temp1_hyst)); + 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) size_t count)
{ {
struct i2c_client *client = to_i2c_client(dev); struct i2c_client *client = to_i2c_client(dev);
...@@ -202,7 +202,7 @@ static ssize_t set_temp1_crit_hyst(struct device *dev, const char *buf, ...@@ -202,7 +202,7 @@ static ssize_t set_temp1_crit_hyst(struct device *dev, const char *buf,
return count; return 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); struct lm92_data *data = lm92_update_device(dev);
return sprintf(buf, "%d\n", ALARMS_FROM_REG(data->temp1_input)); return sprintf(buf, "%d\n", ALARMS_FROM_REG(data->temp1_input));
......
drivers/i2c/chips/max1619.c
View file @ 8627f9ba
...@@ -122,7 +122,7 @@ struct max1619_data { ...@@ -122,7 +122,7 @@ struct max1619_data {
*/ */
#define show_temp(value) \ #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); \ struct max1619_data *data = max1619_update_device(dev); \
return sprintf(buf, "%d\n", TEMP_FROM_REG(data->value)); \ return sprintf(buf, "%d\n", TEMP_FROM_REG(data->value)); \
...@@ -135,7 +135,7 @@ show_temp(temp_crit2); ...@@ -135,7 +135,7 @@ show_temp(temp_crit2);
show_temp(temp_hyst2); show_temp(temp_hyst2);
#define set_temp2(value, reg) \ #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) \ size_t count) \
{ \ { \
struct i2c_client *client = to_i2c_client(dev); \ struct i2c_client *client = to_i2c_client(dev); \
...@@ -154,7 +154,7 @@ set_temp2(temp_high2, MAX1619_REG_W_REMOTE_HIGH); ...@@ -154,7 +154,7 @@ set_temp2(temp_high2, MAX1619_REG_W_REMOTE_HIGH);
set_temp2(temp_crit2, MAX1619_REG_W_REMOTE_CRIT); set_temp2(temp_crit2, MAX1619_REG_W_REMOTE_CRIT);
set_temp2(temp_hyst2, MAX1619_REG_W_TCRIT_HYST); 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); struct max1619_data *data = max1619_update_device(dev);
return sprintf(buf, "%d\n", data->alarms); return sprintf(buf, "%d\n", data->alarms);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment