Skip to content

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

[PATCH] Driver Core: drivers/i2c/chips/pc87360.c - w83627hf.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 8627f9ba
Expand all Show whitespace changes
Inline Side-by-side
Showing with 115 additions and 115 deletions
drivers/i2c/chips/pc87360.c
View file @ a5099cfc
This diff is collapsed.
drivers/i2c/chips/pcf8574.c
View file @ a5099cfc
...@@ -76,7 +76,7 @@ static struct i2c_driver pcf8574_driver = { ...@@ -76,7 +76,7 @@ static struct i2c_driver pcf8574_driver = {
}; };
/* following are the sysfs callback functions */ /* following are the sysfs callback functions */
static ssize_t show_read(struct device *dev, char *buf) static ssize_t show_read(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct i2c_client *client = to_i2c_client(dev); struct i2c_client *client = to_i2c_client(dev);
struct pcf8574_data *data = i2c_get_clientdata(client); struct pcf8574_data *data = i2c_get_clientdata(client);
...@@ -86,13 +86,13 @@ static ssize_t show_read(struct device *dev, char *buf) ...@@ -86,13 +86,13 @@ static ssize_t show_read(struct device *dev, char *buf)
static DEVICE_ATTR(read, S_IRUGO, show_read, NULL); static DEVICE_ATTR(read, S_IRUGO, show_read, NULL);
static ssize_t show_write(struct device *dev, char *buf) static ssize_t show_write(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct pcf8574_data *data = i2c_get_clientdata(to_i2c_client(dev)); struct pcf8574_data *data = i2c_get_clientdata(to_i2c_client(dev));
return sprintf(buf, "%u\n", data->write); return sprintf(buf, "%u\n", data->write);
} }
static ssize_t set_write(struct device *dev, const char *buf, static ssize_t set_write(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);
......
drivers/i2c/chips/pcf8591.c
View file @ a5099cfc
...@@ -100,7 +100,7 @@ static struct i2c_driver pcf8591_driver = { ...@@ -100,7 +100,7 @@ static struct i2c_driver pcf8591_driver = {
/* following are the sysfs callback functions */ /* following are the sysfs callback functions */
#define show_in_channel(channel) \ #define show_in_channel(channel) \
static ssize_t show_in##channel##_input(struct device *dev, char *buf) \ static ssize_t show_in##channel##_input(struct device *dev, struct device_attribute *attr, char *buf) \
{ \ { \
return sprintf(buf, "%d\n", pcf8591_read_channel(dev, channel));\ return sprintf(buf, "%d\n", pcf8591_read_channel(dev, channel));\
} \ } \
...@@ -112,13 +112,13 @@ show_in_channel(1); ...@@ -112,13 +112,13 @@ show_in_channel(1);
show_in_channel(2); show_in_channel(2);
show_in_channel(3); show_in_channel(3);
static ssize_t show_out0_ouput(struct device *dev, char *buf) static ssize_t show_out0_ouput(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct pcf8591_data *data = i2c_get_clientdata(to_i2c_client(dev)); struct pcf8591_data *data = i2c_get_clientdata(to_i2c_client(dev));
return sprintf(buf, "%d\n", data->aout * 10); return sprintf(buf, "%d\n", data->aout * 10);
} }
static ssize_t set_out0_output(struct device *dev, const char *buf, size_t count) static ssize_t set_out0_output(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
{ {
unsigned int value; unsigned int value;
struct i2c_client *client = to_i2c_client(dev); struct i2c_client *client = to_i2c_client(dev);
...@@ -134,13 +134,13 @@ static ssize_t set_out0_output(struct device *dev, const char *buf, size_t count ...@@ -134,13 +134,13 @@ static ssize_t set_out0_output(struct device *dev, const char *buf, size_t count
static DEVICE_ATTR(out0_output, S_IWUSR | S_IRUGO, static DEVICE_ATTR(out0_output, S_IWUSR | S_IRUGO,
show_out0_ouput, set_out0_output); show_out0_ouput, set_out0_output);
static ssize_t show_out0_enable(struct device *dev, char *buf) static ssize_t show_out0_enable(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct pcf8591_data *data = i2c_get_clientdata(to_i2c_client(dev)); struct pcf8591_data *data = i2c_get_clientdata(to_i2c_client(dev));
return sprintf(buf, "%u\n", !(!(data->control & PCF8591_CONTROL_AOEF))); return sprintf(buf, "%u\n", !(!(data->control & PCF8591_CONTROL_AOEF)));
} }
static ssize_t set_out0_enable(struct device *dev, const char *buf, size_t count) static ssize_t set_out0_enable(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 pcf8591_data *data = i2c_get_clientdata(client); struct pcf8591_data *data = i2c_get_clientdata(client);
......
drivers/i2c/chips/sis5595.c
View file @ a5099cfc
...@@ -256,28 +256,28 @@ static ssize_t set_in_max(struct device *dev, const char *buf, ...@@ -256,28 +256,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); \
...@@ -294,19 +294,19 @@ show_in_offset(3); ...@@ -294,19 +294,19 @@ show_in_offset(3);
show_in_offset(4); show_in_offset(4);
/* 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 sis5595_data *data = sis5595_update_device(dev); struct sis5595_data *data = sis5595_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 sis5595_data *data = sis5595_update_device(dev); struct sis5595_data *data = sis5595_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 sis5595_data *data = i2c_get_clientdata(client); struct sis5595_data *data = i2c_get_clientdata(client);
...@@ -319,13 +319,13 @@ static ssize_t set_temp_over(struct device *dev, const char *buf, size_t count) ...@@ -319,13 +319,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 sis5595_data *data = sis5595_update_device(dev); struct sis5595_data *data = sis5595_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 sis5595_data *data = i2c_get_clientdata(client); struct sis5595_data *data = i2c_get_clientdata(client);
...@@ -426,19 +426,19 @@ static ssize_t set_fan_div(struct device *dev, const char *buf, ...@@ -426,19 +426,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); \
...@@ -450,13 +450,13 @@ static DEVICE_ATTR(fan##offset##_min, S_IRUGO | S_IWUSR, \ ...@@ -450,13 +450,13 @@ static DEVICE_ATTR(fan##offset##_min, S_IRUGO | S_IWUSR, \
show_fan_offset(1); show_fan_offset(1);
show_fan_offset(2); show_fan_offset(2);
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) ;
...@@ -467,7 +467,7 @@ static DEVICE_ATTR(fan2_div, S_IRUGO | S_IWUSR, ...@@ -467,7 +467,7 @@ static DEVICE_ATTR(fan2_div, S_IRUGO | S_IWUSR,
show_fan_2_div, set_fan_2_div); show_fan_2_div, set_fan_2_div);
/* 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 sis5595_data *data = sis5595_update_device(dev); struct sis5595_data *data = sis5595_update_device(dev);
return sprintf(buf, "%d\n", data->alarms); return sprintf(buf, "%d\n", data->alarms);
......
drivers/i2c/chips/smsc47b397.c
View file @ a5099cfc
...@@ -172,7 +172,7 @@ static ssize_t show_temp(struct device *dev, char *buf, int nr) ...@@ -172,7 +172,7 @@ static ssize_t show_temp(struct device *dev, char *buf, int nr)
} }
#define sysfs_temp(num) \ #define sysfs_temp(num) \
static ssize_t show_temp##num(struct device *dev, char *buf) \ static ssize_t show_temp##num(struct device *dev, struct device_attribute *attr, char *buf) \
{ \ { \
return show_temp(dev, buf, num-1); \ return show_temp(dev, buf, num-1); \
} \ } \
...@@ -201,7 +201,7 @@ static ssize_t show_fan(struct device *dev, char *buf, int nr) ...@@ -201,7 +201,7 @@ static ssize_t show_fan(struct device *dev, char *buf, int nr)
} }
#define sysfs_fan(num) \ #define sysfs_fan(num) \
static ssize_t show_fan##num(struct device *dev, char *buf) \ static ssize_t show_fan##num(struct device *dev, struct device_attribute *attr, char *buf) \
{ \ { \
return show_fan(dev, buf, num-1); \ return show_fan(dev, buf, num-1); \
} \ } \
......
drivers/i2c/chips/smsc47m1.c
View file @ a5099cfc
...@@ -184,7 +184,7 @@ static ssize_t get_pwm_en(struct device *dev, char *buf, int nr) ...@@ -184,7 +184,7 @@ static ssize_t get_pwm_en(struct device *dev, char *buf, int nr)
return sprintf(buf, "%d\n", PWM_EN_FROM_REG(data->pwm[nr])); return sprintf(buf, "%d\n", PWM_EN_FROM_REG(data->pwm[nr]));
} }
static ssize_t get_alarms(struct device *dev, char *buf) static ssize_t get_alarms(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct smsc47m1_data *data = smsc47m1_update_device(dev, 0); struct smsc47m1_data *data = smsc47m1_update_device(dev, 0);
return sprintf(buf, "%d\n", data->alarms); return sprintf(buf, "%d\n", data->alarms);
...@@ -298,42 +298,42 @@ static ssize_t set_pwm_en(struct device *dev, const char *buf, ...@@ -298,42 +298,42 @@ static ssize_t set_pwm_en(struct device *dev, const char *buf,
} }
#define fan_present(offset) \ #define fan_present(offset) \
static ssize_t get_fan##offset (struct device *dev, char *buf) \ static ssize_t get_fan##offset (struct device *dev, struct device_attribute *attr, char *buf) \
{ \ { \
return get_fan(dev, buf, offset - 1); \ return get_fan(dev, buf, offset - 1); \
} \ } \
static ssize_t get_fan##offset##_min (struct device *dev, char *buf) \ static ssize_t get_fan##offset##_min (struct device *dev, struct device_attribute *attr, char *buf) \
{ \ { \
return get_fan_min(dev, buf, offset - 1); \ return get_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); \
} \ } \
static ssize_t get_fan##offset##_div (struct device *dev, char *buf) \ static ssize_t get_fan##offset##_div (struct device *dev, struct device_attribute *attr, char *buf) \
{ \ { \
return get_fan_div(dev, buf, offset - 1); \ return get_fan_div(dev, buf, offset - 1); \
} \ } \
static ssize_t set_fan##offset##_div (struct device *dev, \ static ssize_t set_fan##offset##_div (struct device *dev, struct device_attribute *attr, \
const char *buf, size_t count) \ const char *buf, size_t count) \
{ \ { \
return set_fan_div(dev, buf, count, offset - 1); \ return set_fan_div(dev, buf, count, offset - 1); \
} \ } \
static ssize_t get_pwm##offset (struct device *dev, char *buf) \ static ssize_t get_pwm##offset (struct device *dev, struct device_attribute *attr, char *buf) \
{ \ { \
return get_pwm(dev, buf, offset - 1); \ return get_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 get_pwm##offset##_en (struct device *dev, char *buf) \ static ssize_t get_pwm##offset##_en (struct device *dev, struct device_attribute *attr, char *buf) \
{ \ { \
return get_pwm_en(dev, buf, offset - 1); \ return get_pwm_en(dev, buf, offset - 1); \
} \ } \
static ssize_t set_pwm##offset##_en (struct device *dev, \ static ssize_t set_pwm##offset##_en (struct device *dev, struct device_attribute *attr, \
const char *buf, size_t count) \ const char *buf, size_t count) \
{ \ { \
return set_pwm_en(dev, buf, count, offset - 1); \ return set_pwm_en(dev, buf, count, offset - 1); \
......
drivers/i2c/chips/via686a.c
View file @ a5099cfc
...@@ -386,26 +386,26 @@ static ssize_t set_in_max(struct device *dev, const char *buf, ...@@ -386,26 +386,26 @@ 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 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); \
...@@ -460,26 +460,26 @@ static ssize_t set_temp_hyst(struct device *dev, const char *buf, ...@@ -460,26 +460,26 @@ static ssize_t set_temp_hyst(struct device *dev, const char *buf,
return count; return count;
} }
#define show_temp_offset(offset) \ #define show_temp_offset(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 \ static ssize_t \
show_temp_##offset##_over (struct device *dev, char *buf) \ show_temp_##offset##_over (struct device *dev, struct device_attribute *attr, char *buf) \
{ \ { \
return show_temp_over(dev, buf, offset - 1); \ return show_temp_over(dev, buf, offset - 1); \
} \ } \
static ssize_t \ static ssize_t \
show_temp_##offset##_hyst (struct device *dev, char *buf) \ show_temp_##offset##_hyst (struct device *dev, struct device_attribute *attr, char *buf) \
{ \ { \
return show_temp_hyst(dev, buf, offset - 1); \ return show_temp_hyst(dev, buf, offset - 1); \
} \ } \
static ssize_t set_temp_##offset##_over (struct device *dev, \ static ssize_t set_temp_##offset##_over (struct device *dev, struct device_attribute *attr, \
const char *buf, size_t count) \ const char *buf, size_t count) \
{ \ { \
return set_temp_over(dev, buf, count, offset - 1); \ return set_temp_over(dev, buf, count, offset - 1); \
} \ } \
static ssize_t set_temp_##offset##_hyst (struct device *dev, \ static ssize_t set_temp_##offset##_hyst (struct device *dev, struct device_attribute *attr, \
const char *buf, size_t count) \ const char *buf, size_t count) \
{ \ { \
return set_temp_hyst(dev, buf, count, offset - 1); \ return set_temp_hyst(dev, buf, count, offset - 1); \
...@@ -538,24 +538,24 @@ static ssize_t set_fan_div(struct device *dev, const char *buf, ...@@ -538,24 +538,24 @@ 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); \
} \ } \
static ssize_t set_fan_##offset##_div (struct device *dev, \ static ssize_t set_fan_##offset##_div (struct device *dev, struct device_attribute *attr, \
const char *buf, size_t count) \ const char *buf, size_t count) \
{ \ { \
return set_fan_div(dev, buf, count, offset - 1); \ return set_fan_div(dev, buf, count, offset - 1); \
...@@ -570,7 +570,7 @@ show_fan_offset(1); ...@@ -570,7 +570,7 @@ show_fan_offset(1);
show_fan_offset(2); show_fan_offset(2);
/* 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 via686a_data *data = via686a_update_device(dev); struct via686a_data *data = via686a_update_device(dev);
return sprintf(buf,"%d\n", ALARMS_FROM_REG(data->alarms)); return sprintf(buf,"%d\n", ALARMS_FROM_REG(data->alarms));
} }
......
drivers/i2c/chips/w83627hf.c
View file @ a5099cfc
...@@ -368,19 +368,19 @@ store_in_reg(MAX, max) ...@@ -368,19 +368,19 @@ store_in_reg(MAX, max)
#define sysfs_in_offset(offset) \ #define sysfs_in_offset(offset) \
static ssize_t \ static ssize_t \
show_regs_in_##offset (struct device *dev, char *buf) \ show_regs_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, show_regs_in_##offset, NULL); static DEVICE_ATTR(in##offset##_input, S_IRUGO, show_regs_in_##offset, NULL);
#define sysfs_in_reg_offset(reg, offset) \ #define sysfs_in_reg_offset(reg, offset) \
static ssize_t show_regs_in_##reg##offset (struct device *dev, char *buf) \ static ssize_t show_regs_in_##reg##offset (struct device *dev, struct device_attribute *attr, char *buf) \
{ \ { \
return show_in_##reg (dev, buf, offset); \ return show_in_##reg (dev, buf, offset); \
} \ } \
static ssize_t \ static ssize_t \
store_regs_in_##reg##offset (struct device *dev, \ store_regs_in_##reg##offset (struct device *dev, struct device_attribute *attr, \
const char *buf, size_t count) \ const char *buf, size_t count) \
{ \ { \
return store_in_##reg (dev, buf, count, offset); \ return store_in_##reg (dev, buf, count, offset); \
...@@ -419,25 +419,25 @@ static ssize_t show_in_0(struct w83627hf_data *data, char *buf, u8 reg) ...@@ -419,25 +419,25 @@ static ssize_t show_in_0(struct w83627hf_data *data, char *buf, u8 reg)
return sprintf(buf,"%ld\n", in0); return sprintf(buf,"%ld\n", in0);
} }
static ssize_t show_regs_in_0(struct device *dev, char *buf) static ssize_t show_regs_in_0(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct w83627hf_data *data = w83627hf_update_device(dev); struct w83627hf_data *data = w83627hf_update_device(dev);
return show_in_0(data, buf, data->in[0]); return show_in_0(data, buf, data->in[0]);
} }
static ssize_t show_regs_in_min0(struct device *dev, char *buf) static ssize_t show_regs_in_min0(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct w83627hf_data *data = w83627hf_update_device(dev); struct w83627hf_data *data = w83627hf_update_device(dev);
return show_in_0(data, buf, data->in_min[0]); return show_in_0(data, buf, data->in_min[0]);
} }
static ssize_t show_regs_in_max0(struct device *dev, char *buf) static ssize_t show_regs_in_max0(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct w83627hf_data *data = w83627hf_update_device(dev); struct w83627hf_data *data = w83627hf_update_device(dev);
return show_in_0(data, buf, data->in_max[0]); return show_in_0(data, buf, data->in_max[0]);
} }
static ssize_t store_regs_in_min0(struct device *dev, static ssize_t store_regs_in_min0(struct device *dev, struct device_attribute *attr,
const char *buf, size_t count) const char *buf, size_t count)
{ {
struct i2c_client *client = to_i2c_client(dev); struct i2c_client *client = to_i2c_client(dev);
...@@ -462,7 +462,7 @@ static ssize_t store_regs_in_min0(struct device *dev, ...@@ -462,7 +462,7 @@ static ssize_t store_regs_in_min0(struct device *dev,
return count; return count;
} }
static ssize_t store_regs_in_max0(struct device *dev, static ssize_t store_regs_in_max0(struct device *dev, struct device_attribute *attr,
const char *buf, size_t count) const char *buf, size_t count)
{ {
struct i2c_client *client = to_i2c_client(dev); struct i2c_client *client = to_i2c_client(dev);
...@@ -531,19 +531,19 @@ store_fan_min(struct device *dev, const char *buf, size_t count, int nr) ...@@ -531,19 +531,19 @@ store_fan_min(struct device *dev, const char *buf, size_t count, int nr)
} }
#define sysfs_fan_offset(offset) \ #define sysfs_fan_offset(offset) \
static ssize_t show_regs_fan_##offset (struct device *dev, char *buf) \ static ssize_t show_regs_fan_##offset (struct device *dev, struct device_attribute *attr, char *buf) \
{ \ { \
return show_fan(dev, buf, offset); \ return show_fan(dev, buf, offset); \
} \ } \
static DEVICE_ATTR(fan##offset##_input, S_IRUGO, show_regs_fan_##offset, NULL); static DEVICE_ATTR(fan##offset##_input, S_IRUGO, show_regs_fan_##offset, NULL);
#define sysfs_fan_min_offset(offset) \ #define sysfs_fan_min_offset(offset) \
static ssize_t show_regs_fan_min##offset (struct device *dev, char *buf) \ static ssize_t show_regs_fan_min##offset (struct device *dev, struct device_attribute *attr, char *buf) \
{ \ { \
return show_fan_min(dev, buf, offset); \ return show_fan_min(dev, buf, offset); \
} \ } \
static ssize_t \ static ssize_t \
store_regs_fan_min##offset (struct device *dev, const char *buf, size_t count) \ store_regs_fan_min##offset (struct device *dev, struct device_attribute *attr, const char *buf, size_t count) \
{ \ { \
return store_fan_min(dev, buf, count, offset); \ return store_fan_min(dev, buf, count, offset); \
} \ } \
...@@ -608,19 +608,19 @@ store_temp_reg(HYST, max_hyst); ...@@ -608,19 +608,19 @@ store_temp_reg(HYST, max_hyst);
#define sysfs_temp_offset(offset) \ #define sysfs_temp_offset(offset) \
static ssize_t \ static ssize_t \
show_regs_temp_##offset (struct device *dev, char *buf) \ show_regs_temp_##offset (struct device *dev, struct device_attribute *attr, char *buf) \
{ \ { \
return show_temp(dev, buf, offset); \ return show_temp(dev, buf, offset); \
} \ } \
static DEVICE_ATTR(temp##offset##_input, S_IRUGO, show_regs_temp_##offset, NULL); static DEVICE_ATTR(temp##offset##_input, S_IRUGO, show_regs_temp_##offset, NULL);
#define sysfs_temp_reg_offset(reg, offset) \ #define sysfs_temp_reg_offset(reg, offset) \
static ssize_t show_regs_temp_##reg##offset (struct device *dev, char *buf) \ static ssize_t show_regs_temp_##reg##offset (struct device *dev, struct device_attribute *attr, char *buf) \
{ \ { \
return show_temp_##reg (dev, buf, offset); \ return show_temp_##reg (dev, buf, offset); \
} \ } \
static ssize_t \ static ssize_t \
store_regs_temp_##reg##offset (struct device *dev, \ store_regs_temp_##reg##offset (struct device *dev, struct device_attribute *attr, \
const char *buf, size_t count) \ const char *buf, size_t count) \
{ \ { \
return store_temp_##reg (dev, buf, count, offset); \ return store_temp_##reg (dev, buf, count, offset); \
...@@ -645,7 +645,7 @@ device_create_file(&client->dev, &dev_attr_temp##offset##_max_hyst); \ ...@@ -645,7 +645,7 @@ device_create_file(&client->dev, &dev_attr_temp##offset##_max_hyst); \
} while (0) } while (0)
static ssize_t static ssize_t
show_vid_reg(struct device *dev, char *buf) show_vid_reg(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct w83627hf_data *data = w83627hf_update_device(dev); struct w83627hf_data *data = w83627hf_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));
...@@ -655,13 +655,13 @@ static DEVICE_ATTR(cpu0_vid, S_IRUGO, show_vid_reg, NULL); ...@@ -655,13 +655,13 @@ static DEVICE_ATTR(cpu0_vid, S_IRUGO, show_vid_reg, NULL);
device_create_file(&client->dev, &dev_attr_cpu0_vid) device_create_file(&client->dev, &dev_attr_cpu0_vid)
static ssize_t static ssize_t
show_vrm_reg(struct device *dev, char *buf) show_vrm_reg(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct w83627hf_data *data = w83627hf_update_device(dev); struct w83627hf_data *data = w83627hf_update_device(dev);
return sprintf(buf, "%ld\n", (long) data->vrm); return sprintf(buf, "%ld\n", (long) data->vrm);
} }
static ssize_t static ssize_t
store_vrm_reg(struct device *dev, const char *buf, size_t count) 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 w83627hf_data *data = i2c_get_clientdata(client); struct w83627hf_data *data = i2c_get_clientdata(client);
...@@ -677,7 +677,7 @@ static DEVICE_ATTR(vrm, S_IRUGO | S_IWUSR, show_vrm_reg, store_vrm_reg); ...@@ -677,7 +677,7 @@ static DEVICE_ATTR(vrm, S_IRUGO | S_IWUSR, show_vrm_reg, store_vrm_reg);
device_create_file(&client->dev, &dev_attr_vrm) device_create_file(&client->dev, &dev_attr_vrm)
static ssize_t static ssize_t
show_alarms_reg(struct device *dev, char *buf) show_alarms_reg(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct w83627hf_data *data = w83627hf_update_device(dev); struct w83627hf_data *data = w83627hf_update_device(dev);
return sprintf(buf, "%ld\n", (long) data->alarms); return sprintf(buf, "%ld\n", (long) data->alarms);
...@@ -687,7 +687,7 @@ static DEVICE_ATTR(alarms, S_IRUGO, show_alarms_reg, NULL); ...@@ -687,7 +687,7 @@ static DEVICE_ATTR(alarms, S_IRUGO, show_alarms_reg, NULL);
device_create_file(&client->dev, &dev_attr_alarms) device_create_file(&client->dev, &dev_attr_alarms)
#define show_beep_reg(REG, reg) \ #define show_beep_reg(REG, reg) \
static ssize_t show_beep_##reg (struct device *dev, char *buf) \ static ssize_t show_beep_##reg (struct device *dev, struct device_attribute *attr, char *buf) \
{ \ { \
struct w83627hf_data *data = w83627hf_update_device(dev); \ struct w83627hf_data *data = w83627hf_update_device(dev); \
return sprintf(buf,"%ld\n", \ return sprintf(buf,"%ld\n", \
...@@ -732,12 +732,12 @@ store_beep_reg(struct device *dev, const char *buf, size_t count, ...@@ -732,12 +732,12 @@ store_beep_reg(struct device *dev, const char *buf, size_t count,
} }
#define sysfs_beep(REG, reg) \ #define sysfs_beep(REG, reg) \
static ssize_t show_regs_beep_##reg (struct device *dev, char *buf) \ static ssize_t show_regs_beep_##reg (struct device *dev, struct device_attribute *attr, char *buf) \
{ \ { \
return show_beep_##reg(dev, buf); \ return show_beep_##reg(dev, attr, buf); \
} \ } \
static ssize_t \ static ssize_t \
store_regs_beep_##reg (struct device *dev, const char *buf, size_t count) \ store_regs_beep_##reg (struct device *dev, struct device_attribute *attr, const char *buf, size_t count) \
{ \ { \
return store_beep_reg(dev, buf, count, BEEP_##REG); \ return store_beep_reg(dev, buf, count, BEEP_##REG); \
} \ } \
...@@ -801,12 +801,12 @@ store_fan_div_reg(struct device *dev, const char *buf, size_t count, int nr) ...@@ -801,12 +801,12 @@ store_fan_div_reg(struct device *dev, const char *buf, size_t count, int nr)
} }
#define sysfs_fan_div(offset) \ #define sysfs_fan_div(offset) \
static ssize_t show_regs_fan_div_##offset (struct device *dev, char *buf) \ static ssize_t show_regs_fan_div_##offset (struct device *dev, struct device_attribute *attr, char *buf) \
{ \ { \
return show_fan_div_reg(dev, buf, offset); \ return show_fan_div_reg(dev, buf, offset); \
} \ } \
static ssize_t \ static ssize_t \
store_regs_fan_div_##offset (struct device *dev, \ store_regs_fan_div_##offset (struct device *dev, struct device_attribute *attr, \
const char *buf, size_t count) \ const char *buf, size_t count) \
{ \ { \
return store_fan_div_reg(dev, buf, count, offset - 1); \ return store_fan_div_reg(dev, buf, count, offset - 1); \
...@@ -861,12 +861,12 @@ store_pwm_reg(struct device *dev, const char *buf, size_t count, int nr) ...@@ -861,12 +861,12 @@ store_pwm_reg(struct device *dev, const char *buf, size_t count, int nr)
} }
#define sysfs_pwm(offset) \ #define sysfs_pwm(offset) \
static ssize_t show_regs_pwm_##offset (struct device *dev, char *buf) \ static ssize_t show_regs_pwm_##offset (struct device *dev, struct device_attribute *attr, char *buf) \
{ \ { \
return show_pwm_reg(dev, buf, offset); \ return show_pwm_reg(dev, buf, offset); \
} \ } \
static ssize_t \ static ssize_t \
store_regs_pwm_##offset (struct device *dev, const char *buf, size_t count) \ store_regs_pwm_##offset (struct device *dev, struct device_attribute *attr, const char *buf, size_t count) \
{ \ { \
return store_pwm_reg(dev, buf, count, offset); \ return store_pwm_reg(dev, buf, count, offset); \
} \ } \
...@@ -937,12 +937,12 @@ store_sensor_reg(struct device *dev, const char *buf, size_t count, int nr) ...@@ -937,12 +937,12 @@ store_sensor_reg(struct device *dev, const char *buf, size_t count, int nr)
} }
#define sysfs_sensor(offset) \ #define sysfs_sensor(offset) \
static ssize_t show_regs_sensor_##offset (struct device *dev, char *buf) \ static ssize_t show_regs_sensor_##offset (struct device *dev, struct device_attribute *attr, char *buf) \
{ \ { \
return show_sensor_reg(dev, buf, offset); \ return show_sensor_reg(dev, buf, offset); \
} \ } \
static ssize_t \ static ssize_t \
store_regs_sensor_##offset (struct device *dev, const char *buf, size_t count) \ store_regs_sensor_##offset (struct device *dev, struct device_attribute *attr, const char *buf, size_t count) \
{ \ { \
return store_sensor_reg(dev, buf, count, offset); \ return store_sensor_reg(dev, buf, count, offset); \
} \ } \
......
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