Skip to content

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

[PATCH] Driver Core: drivers/i2c/chips/adm1031.c - lm75.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 74880c06
Hide whitespace changes
Inline Side-by-side
Showing with 109 additions and 109 deletions
drivers/i2c/chips/adm1031.c
View file @ 30f74292
...@@ -292,11 +292,11 @@ set_fan_auto_channel(struct device *dev, const char *buf, size_t count, int nr) ...@@ -292,11 +292,11 @@ set_fan_auto_channel(struct device *dev, const char *buf, size_t count, int nr)
} }
#define fan_auto_channel_offset(offset) \ #define fan_auto_channel_offset(offset) \
static ssize_t show_fan_auto_channel_##offset (struct device *dev, char *buf) \ static ssize_t show_fan_auto_channel_##offset (struct device *dev, struct device_attribute *attr, char *buf) \
{ \ { \
return show_fan_auto_channel(dev, buf, offset - 1); \ return show_fan_auto_channel(dev, buf, offset - 1); \
} \ } \
static ssize_t set_fan_auto_channel_##offset (struct device *dev, \ static ssize_t set_fan_auto_channel_##offset (struct device *dev, struct device_attribute *attr, \
const char *buf, size_t count) \ const char *buf, size_t count) \
{ \ { \
return set_fan_auto_channel(dev, buf, count, offset - 1); \ return set_fan_auto_channel(dev, buf, count, offset - 1); \
...@@ -357,24 +357,24 @@ set_auto_temp_max(struct device *dev, const char *buf, size_t count, int nr) ...@@ -357,24 +357,24 @@ set_auto_temp_max(struct device *dev, const char *buf, size_t count, int nr)
} }
#define auto_temp_reg(offset) \ #define auto_temp_reg(offset) \
static ssize_t show_auto_temp_##offset##_off (struct device *dev, char *buf) \ static ssize_t show_auto_temp_##offset##_off (struct device *dev, struct device_attribute *attr, char *buf) \
{ \ { \
return show_auto_temp_off(dev, buf, offset - 1); \ return show_auto_temp_off(dev, buf, offset - 1); \
} \ } \
static ssize_t show_auto_temp_##offset##_min (struct device *dev, char *buf) \ static ssize_t show_auto_temp_##offset##_min (struct device *dev, struct device_attribute *attr, char *buf) \
{ \ { \
return show_auto_temp_min(dev, buf, offset - 1); \ return show_auto_temp_min(dev, buf, offset - 1); \
} \ } \
static ssize_t show_auto_temp_##offset##_max (struct device *dev, char *buf) \ static ssize_t show_auto_temp_##offset##_max (struct device *dev, struct device_attribute *attr, char *buf) \
{ \ { \
return show_auto_temp_max(dev, buf, offset - 1); \ return show_auto_temp_max(dev, buf, offset - 1); \
} \ } \
static ssize_t set_auto_temp_##offset##_min (struct device *dev, \ static ssize_t set_auto_temp_##offset##_min (struct device *dev, struct device_attribute *attr, \
const char *buf, size_t count) \ const char *buf, size_t count) \
{ \ { \
return set_auto_temp_min(dev, buf, count, offset - 1); \ return set_auto_temp_min(dev, buf, count, offset - 1); \
} \ } \
static ssize_t set_auto_temp_##offset##_max (struct device *dev, \ static ssize_t set_auto_temp_##offset##_max (struct device *dev, struct device_attribute *attr, \
const char *buf, size_t count) \ const char *buf, size_t count) \
{ \ { \
return set_auto_temp_max(dev, buf, count, offset - 1); \ return set_auto_temp_max(dev, buf, count, offset - 1); \
...@@ -421,11 +421,11 @@ set_pwm(struct device *dev, const char *buf, size_t count, int nr) ...@@ -421,11 +421,11 @@ set_pwm(struct device *dev, const char *buf, size_t count, int nr)
} }
#define pwm_reg(offset) \ #define 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); \
...@@ -557,24 +557,24 @@ set_fan_div(struct device *dev, const char *buf, size_t count, int nr) ...@@ -557,24 +557,24 @@ set_fan_div(struct device *dev, const char *buf, size_t count, int nr)
} }
#define fan_offset(offset) \ #define 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); \
...@@ -667,33 +667,33 @@ set_temp_crit(struct device *dev, const char *buf, size_t count, int nr) ...@@ -667,33 +667,33 @@ set_temp_crit(struct device *dev, const char *buf, size_t count, int nr)
} }
#define temp_reg(offset) \ #define 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 show_temp_##offset##_crit (struct device *dev, char *buf) \ static ssize_t show_temp_##offset##_crit (struct device *dev, struct device_attribute *attr, char *buf) \
{ \ { \
return show_temp_crit(dev, buf, offset - 1); \ return show_temp_crit(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); \
} \ } \
static ssize_t set_temp_##offset##_crit (struct device *dev, \ static ssize_t set_temp_##offset##_crit (struct device *dev, struct device_attribute *attr, \
const char *buf, size_t count) \ const char *buf, size_t count) \
{ \ { \
return set_temp_crit(dev, buf, count, offset - 1); \ return set_temp_crit(dev, buf, count, offset - 1); \
...@@ -712,7 +712,7 @@ temp_reg(2); ...@@ -712,7 +712,7 @@ temp_reg(2);
temp_reg(3); temp_reg(3);
/* 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 adm1031_data *data = adm1031_update_device(dev); struct adm1031_data *data = adm1031_update_device(dev);
return sprintf(buf, "%d\n", data->alarm); return sprintf(buf, "%d\n", data->alarm);
......
drivers/i2c/chips/asb100.c
View file @ 30f74292
...@@ -260,28 +260,28 @@ set_in_reg(MAX, max) ...@@ -260,28 +260,28 @@ set_in_reg(MAX, max)
#define sysfs_in(offset) \ #define sysfs_in(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); \
...@@ -389,24 +389,24 @@ static ssize_t set_fan_div(struct device *dev, const char *buf, ...@@ -389,24 +389,24 @@ static ssize_t set_fan_div(struct device *dev, const char *buf,
} }
#define sysfs_fan(offset) \ #define sysfs_fan(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, 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) \
{ \ { \
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, 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); \
...@@ -482,27 +482,27 @@ set_temp_reg(MAX, temp_max); ...@@ -482,27 +482,27 @@ set_temp_reg(MAX, temp_max);
set_temp_reg(HYST, temp_hyst); set_temp_reg(HYST, temp_hyst);
#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); \
} \ } \
static DEVICE_ATTR(temp##num##_input, S_IRUGO, show_temp##num, NULL); \ static DEVICE_ATTR(temp##num##_input, S_IRUGO, show_temp##num, NULL); \
static ssize_t show_temp_max##num(struct device *dev, char *buf) \ static ssize_t show_temp_max##num(struct device *dev, struct device_attribute *attr, char *buf) \
{ \ { \
return show_temp_max(dev, buf, num-1); \ return show_temp_max(dev, buf, num-1); \
} \ } \
static ssize_t set_temp_max##num(struct device *dev, const char *buf, \ static ssize_t set_temp_max##num(struct device *dev, struct device_attribute *attr, const char *buf, \
size_t count) \ size_t count) \
{ \ { \
return set_temp_max(dev, buf, count, num-1); \ return set_temp_max(dev, buf, count, num-1); \
} \ } \
static DEVICE_ATTR(temp##num##_max, S_IRUGO | S_IWUSR, \ static DEVICE_ATTR(temp##num##_max, S_IRUGO | S_IWUSR, \
show_temp_max##num, set_temp_max##num); \ show_temp_max##num, set_temp_max##num); \
static ssize_t show_temp_hyst##num(struct device *dev, char *buf) \ static ssize_t show_temp_hyst##num(struct device *dev, struct device_attribute *attr, char *buf) \
{ \ { \
return show_temp_hyst(dev, buf, num-1); \ return show_temp_hyst(dev, buf, num-1); \
} \ } \
static ssize_t set_temp_hyst##num(struct device *dev, const char *buf, \ static ssize_t set_temp_hyst##num(struct device *dev, struct device_attribute *attr, const char *buf, \
size_t count) \ size_t count) \
{ \ { \
return set_temp_hyst(dev, buf, count, num-1); \ return set_temp_hyst(dev, buf, count, num-1); \
...@@ -522,7 +522,7 @@ sysfs_temp(4); ...@@ -522,7 +522,7 @@ sysfs_temp(4);
device_create_file(&client->dev, &dev_attr_temp##num##_max_hyst); \ device_create_file(&client->dev, &dev_attr_temp##num##_max_hyst); \
} while (0) } while (0)
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 asb100_data *data = asb100_update_device(dev); struct asb100_data *data = asb100_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));
...@@ -533,13 +533,13 @@ static DEVICE_ATTR(cpu0_vid, S_IRUGO, show_vid, NULL); ...@@ -533,13 +533,13 @@ static DEVICE_ATTR(cpu0_vid, S_IRUGO, show_vid, NULL);
device_create_file(&client->dev, &dev_attr_cpu0_vid) device_create_file(&client->dev, &dev_attr_cpu0_vid)
/* VRM */ /* VRM */
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 asb100_data *data = asb100_update_device(dev); struct asb100_data *data = asb100_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 asb100_data *data = i2c_get_clientdata(client); struct asb100_data *data = i2c_get_clientdata(client);
...@@ -553,7 +553,7 @@ static DEVICE_ATTR(vrm, S_IRUGO | S_IWUSR, show_vrm, set_vrm); ...@@ -553,7 +553,7 @@ static DEVICE_ATTR(vrm, S_IRUGO | S_IWUSR, show_vrm, set_vrm);
#define device_create_file_vrm(client) \ #define device_create_file_vrm(client) \
device_create_file(&client->dev, &dev_attr_vrm); device_create_file(&client->dev, &dev_attr_vrm);
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 asb100_data *data = asb100_update_device(dev); struct asb100_data *data = asb100_update_device(dev);
return sprintf(buf, "%d\n", ALARMS_FROM_REG(data->alarms)); return sprintf(buf, "%d\n", ALARMS_FROM_REG(data->alarms));
...@@ -564,13 +564,13 @@ static DEVICE_ATTR(alarms, S_IRUGO, show_alarms, NULL); ...@@ -564,13 +564,13 @@ static DEVICE_ATTR(alarms, S_IRUGO, show_alarms, NULL);
device_create_file(&client->dev, &dev_attr_alarms) device_create_file(&client->dev, &dev_attr_alarms)
/* 1 PWM */ /* 1 PWM */
static ssize_t show_pwm1(struct device *dev, char *buf) static ssize_t show_pwm1(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct asb100_data *data = asb100_update_device(dev); struct asb100_data *data = asb100_update_device(dev);
return sprintf(buf, "%d\n", ASB100_PWM_FROM_REG(data->pwm & 0x0f)); return sprintf(buf, "%d\n", ASB100_PWM_FROM_REG(data->pwm & 0x0f));
} }
static ssize_t set_pwm1(struct device *dev, const char *buf, size_t count) static ssize_t set_pwm1(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 asb100_data *data = i2c_get_clientdata(client); struct asb100_data *data = i2c_get_clientdata(client);
...@@ -584,13 +584,13 @@ static ssize_t set_pwm1(struct device *dev, const char *buf, size_t count) ...@@ -584,13 +584,13 @@ static ssize_t set_pwm1(struct device *dev, const char *buf, size_t count)
return count; return count;
} }
static ssize_t show_pwm_enable1(struct device *dev, char *buf) static ssize_t show_pwm_enable1(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct asb100_data *data = asb100_update_device(dev); struct asb100_data *data = asb100_update_device(dev);
return sprintf(buf, "%d\n", (data->pwm & 0x80) ? 1 : 0); return sprintf(buf, "%d\n", (data->pwm & 0x80) ? 1 : 0);
} }
static ssize_t set_pwm_enable1(struct device *dev, const char *buf, static ssize_t set_pwm_enable1(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/ds1621.c
View file @ 30f74292
...@@ -137,7 +137,7 @@ static void ds1621_init_client(struct i2c_client *client) ...@@ -137,7 +137,7 @@ static void ds1621_init_client(struct i2c_client *client)
} }
#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 ds1621_data *data = ds1621_update_client(dev); \ struct ds1621_data *data = ds1621_update_client(dev); \
return sprintf(buf, "%d\n", LM75_TEMP_FROM_REG(data->value)); \ return sprintf(buf, "%d\n", LM75_TEMP_FROM_REG(data->value)); \
...@@ -148,7 +148,7 @@ show(temp_min); ...@@ -148,7 +148,7 @@ show(temp_min);
show(temp_max); show(temp_max);
#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); \
...@@ -165,7 +165,7 @@ static ssize_t set_temp_##suffix(struct device *dev, const char *buf, \ ...@@ -165,7 +165,7 @@ static ssize_t set_temp_##suffix(struct device *dev, const char *buf, \
set_temp(min, temp_min, DS1621_REG_TEMP_MIN); set_temp(min, temp_min, DS1621_REG_TEMP_MIN);
set_temp(max, temp_max, DS1621_REG_TEMP_MAX); set_temp(max, temp_max, DS1621_REG_TEMP_MAX);
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 ds1621_data *data = ds1621_update_client(dev); struct ds1621_data *data = ds1621_update_client(dev);
return sprintf(buf, "%d\n", ALARMS_FROM_REG(data->conf)); return sprintf(buf, "%d\n", ALARMS_FROM_REG(data->conf));
......
drivers/i2c/chips/fscher.c
View file @ 30f74292
...@@ -157,8 +157,8 @@ struct fscher_data { ...@@ -157,8 +157,8 @@ struct fscher_data {
#define sysfs_r(kind, sub, offset, reg) \ #define sysfs_r(kind, sub, offset, reg) \
static ssize_t show_##kind##sub (struct fscher_data *, char *, int); \ static ssize_t show_##kind##sub (struct fscher_data *, char *, int); \
static ssize_t show_##kind##offset##sub (struct device *, char *); \ static ssize_t show_##kind##offset##sub (struct device *, struct device_attribute *attr, char *); \
static ssize_t show_##kind##offset##sub (struct device *dev, char *buf) \ static ssize_t show_##kind##offset##sub (struct device *dev, struct device_attribute *attr, char *buf) \
{ \ { \
struct fscher_data *data = fscher_update_device(dev); \ struct fscher_data *data = fscher_update_device(dev); \
return show_##kind##sub(data, buf, (offset)); \ return show_##kind##sub(data, buf, (offset)); \
...@@ -166,8 +166,8 @@ static ssize_t show_##kind##offset##sub (struct device *dev, char *buf) \ ...@@ -166,8 +166,8 @@ static ssize_t show_##kind##offset##sub (struct device *dev, char *buf) \
#define sysfs_w(kind, sub, offset, reg) \ #define sysfs_w(kind, sub, offset, reg) \
static ssize_t set_##kind##sub (struct i2c_client *, struct fscher_data *, const char *, size_t, int, int); \ static ssize_t set_##kind##sub (struct i2c_client *, struct fscher_data *, const char *, size_t, int, int); \
static ssize_t set_##kind##offset##sub (struct device *, const char *, size_t); \ static ssize_t set_##kind##offset##sub (struct device *, struct device_attribute *attr, const char *, size_t); \
static ssize_t set_##kind##offset##sub (struct device *dev, const char *buf, size_t count) \ static ssize_t set_##kind##offset##sub (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 fscher_data *data = i2c_get_clientdata(client); \ struct fscher_data *data = i2c_get_clientdata(client); \
......
drivers/i2c/chips/fscpos.c
View file @ 30f74292
...@@ -245,19 +245,19 @@ static void reset_fan_alarm(struct i2c_client *client, int nr) ...@@ -245,19 +245,19 @@ static void reset_fan_alarm(struct i2c_client *client, int nr)
/* Volts */ /* Volts */
#define VOLT_FROM_REG(val, mult) ((val) * (mult) / 255) #define VOLT_FROM_REG(val, mult) ((val) * (mult) / 255)
static ssize_t show_volt_12(struct device *dev, char *buf) static ssize_t show_volt_12(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct fscpos_data *data = fscpos_update_device(dev); struct fscpos_data *data = fscpos_update_device(dev);
return sprintf(buf, "%u\n", VOLT_FROM_REG(data->volt[0], 14200)); return sprintf(buf, "%u\n", VOLT_FROM_REG(data->volt[0], 14200));
} }
static ssize_t show_volt_5(struct device *dev, char *buf) static ssize_t show_volt_5(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct fscpos_data *data = fscpos_update_device(dev); struct fscpos_data *data = fscpos_update_device(dev);
return sprintf(buf, "%u\n", VOLT_FROM_REG(data->volt[1], 6600)); return sprintf(buf, "%u\n", VOLT_FROM_REG(data->volt[1], 6600));
} }
static ssize_t show_volt_batt(struct device *dev, char *buf) static ssize_t show_volt_batt(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct fscpos_data *data = fscpos_update_device(dev); struct fscpos_data *data = fscpos_update_device(dev);
return sprintf(buf, "%u\n", VOLT_FROM_REG(data->volt[2], 3300)); return sprintf(buf, "%u\n", VOLT_FROM_REG(data->volt[2], 3300));
...@@ -327,7 +327,7 @@ static ssize_t set_wdog_preset(struct i2c_client *client, struct fscpos_data ...@@ -327,7 +327,7 @@ static ssize_t set_wdog_preset(struct i2c_client *client, struct fscpos_data
} }
/* Event */ /* Event */
static ssize_t show_event(struct device *dev, char *buf) static ssize_t show_event(struct device *dev, struct device_attribute *attr, char *buf)
{ {
/* bits 5..7 reserved => mask with 0x1f */ /* bits 5..7 reserved => mask with 0x1f */
struct fscpos_data *data = fscpos_update_device(dev); struct fscpos_data *data = fscpos_update_device(dev);
...@@ -338,14 +338,14 @@ static ssize_t show_event(struct device *dev, char *buf) ...@@ -338,14 +338,14 @@ static ssize_t show_event(struct device *dev, char *buf)
* Sysfs stuff * Sysfs stuff
*/ */
#define create_getter(kind, sub) \ #define create_getter(kind, sub) \
static ssize_t sysfs_show_##kind##sub(struct device *dev, char *buf) \ static ssize_t sysfs_show_##kind##sub(struct device *dev, struct device_attribute *attr, char *buf) \
{ \ { \
struct fscpos_data *data = fscpos_update_device(dev); \ struct fscpos_data *data = fscpos_update_device(dev); \
return show_##kind##sub(data, buf); \ return show_##kind##sub(data, buf); \
} }
#define create_getter_n(kind, offset, sub) \ #define create_getter_n(kind, offset, sub) \
static ssize_t sysfs_show_##kind##offset##sub(struct device *dev, char\ static ssize_t sysfs_show_##kind##offset##sub(struct device *dev, struct device_attribute *attr, char\
*buf) \ *buf) \
{ \ { \
struct fscpos_data *data = fscpos_update_device(dev); \ struct fscpos_data *data = fscpos_update_device(dev); \
...@@ -353,7 +353,7 @@ static ssize_t show_event(struct device *dev, char *buf) ...@@ -353,7 +353,7 @@ static ssize_t show_event(struct device *dev, char *buf)
} }
#define create_setter(kind, sub, reg) \ #define create_setter(kind, sub, reg) \
static ssize_t sysfs_set_##kind##sub (struct device *dev, const char \ static ssize_t sysfs_set_##kind##sub (struct device *dev, struct device_attribute *attr, const char \
*buf, size_t count) \ *buf, size_t count) \
{ \ { \
struct i2c_client *client = to_i2c_client(dev); \ struct i2c_client *client = to_i2c_client(dev); \
...@@ -362,7 +362,7 @@ static ssize_t show_event(struct device *dev, char *buf) ...@@ -362,7 +362,7 @@ static ssize_t show_event(struct device *dev, char *buf)
} }
#define create_setter_n(kind, offset, sub, reg) \ #define create_setter_n(kind, offset, sub, reg) \
static ssize_t sysfs_set_##kind##offset##sub (struct device *dev, \ static ssize_t sysfs_set_##kind##offset##sub (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); \
......
drivers/i2c/chips/gl518sm.c
View file @ 30f74292
...@@ -164,14 +164,14 @@ static struct i2c_driver gl518_driver = { ...@@ -164,14 +164,14 @@ static struct i2c_driver gl518_driver = {
*/ */
#define show(type, suffix, value) \ #define show(type, suffix, value) \
static ssize_t show_##suffix(struct device *dev, char *buf) \ static ssize_t show_##suffix(struct device *dev, struct device_attribute *attr, char *buf) \
{ \ { \
struct gl518_data *data = gl518_update_device(dev); \ struct gl518_data *data = gl518_update_device(dev); \
return sprintf(buf, "%d\n", type##_FROM_REG(data->value)); \ return sprintf(buf, "%d\n", type##_FROM_REG(data->value)); \
} }
#define show_fan(suffix, value, index) \ #define show_fan(suffix, value, index) \
static ssize_t show_##suffix(struct device *dev, char *buf) \ static ssize_t show_##suffix(struct device *dev, struct device_attribute *attr, char *buf) \
{ \ { \
struct gl518_data *data = gl518_update_device(dev); \ struct gl518_data *data = gl518_update_device(dev); \
return sprintf(buf, "%d\n", FAN_FROM_REG(data->value[index], \ return sprintf(buf, "%d\n", FAN_FROM_REG(data->value[index], \
...@@ -205,7 +205,7 @@ show(BOOL, beep_enable, beep_enable); ...@@ -205,7 +205,7 @@ show(BOOL, beep_enable, beep_enable);
show(BEEP_MASK, beep_mask, beep_mask); show(BEEP_MASK, beep_mask, beep_mask);
#define set(type, suffix, value, reg) \ #define set(type, suffix, value, reg) \
static ssize_t set_##suffix(struct device *dev, const char *buf, \ static ssize_t set_##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); \
...@@ -220,7 +220,7 @@ static ssize_t set_##suffix(struct device *dev, const char *buf, \ ...@@ -220,7 +220,7 @@ static ssize_t set_##suffix(struct device *dev, const char *buf, \
} }
#define set_bits(type, suffix, value, reg, mask, shift) \ #define set_bits(type, suffix, value, reg, mask, shift) \
static ssize_t set_##suffix(struct device *dev, const char *buf, \ static ssize_t set_##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); \
...@@ -258,7 +258,7 @@ set_high(IN, in_max3, voltage_max[3], GL518_REG_VIN3_LIMIT); ...@@ -258,7 +258,7 @@ set_high(IN, in_max3, voltage_max[3], GL518_REG_VIN3_LIMIT);
set_bits(BOOL, beep_enable, beep_enable, GL518_REG_CONF, 0x04, 2); set_bits(BOOL, beep_enable, beep_enable, GL518_REG_CONF, 0x04, 2);
set(BEEP_MASK, beep_mask, beep_mask, GL518_REG_ALARM); set(BEEP_MASK, beep_mask, beep_mask, GL518_REG_ALARM);
static ssize_t set_fan_min1(struct device *dev, const char *buf, size_t count) static ssize_t set_fan_min1(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 gl518_data *data = i2c_get_clientdata(client); struct gl518_data *data = i2c_get_clientdata(client);
...@@ -284,7 +284,7 @@ static ssize_t set_fan_min1(struct device *dev, const char *buf, size_t count) ...@@ -284,7 +284,7 @@ static ssize_t set_fan_min1(struct device *dev, const char *buf, size_t count)
return count; return count;
} }
static ssize_t set_fan_min2(struct device *dev, const char *buf, size_t count) static ssize_t set_fan_min2(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 gl518_data *data = i2c_get_clientdata(client); struct gl518_data *data = i2c_get_clientdata(client);
......
drivers/i2c/chips/gl520sm.c
View file @ 30f74292
...@@ -148,8 +148,8 @@ struct gl520_data { ...@@ -148,8 +148,8 @@ struct gl520_data {
#define sysfs_r(type, n, item, reg) \ #define sysfs_r(type, n, item, reg) \
static ssize_t get_##type##item (struct gl520_data *, char *, int); \ static ssize_t get_##type##item (struct gl520_data *, char *, int); \
static ssize_t get_##type##n##item (struct device *, char *); \ static ssize_t get_##type##n##item (struct device *, struct device_attribute *attr, char *); \
static ssize_t get_##type##n##item (struct device *dev, char *buf) \ static ssize_t get_##type##n##item (struct device *dev, struct device_attribute *attr, char *buf) \
{ \ { \
struct gl520_data *data = gl520_update_device(dev); \ struct gl520_data *data = gl520_update_device(dev); \
return get_##type##item(data, buf, (n)); \ return get_##type##item(data, buf, (n)); \
...@@ -157,8 +157,8 @@ static ssize_t get_##type##n##item (struct device *dev, char *buf) \ ...@@ -157,8 +157,8 @@ static ssize_t get_##type##n##item (struct device *dev, char *buf) \
#define sysfs_w(type, n, item, reg) \ #define sysfs_w(type, n, item, reg) \
static ssize_t set_##type##item (struct i2c_client *, struct gl520_data *, const char *, size_t, int, int); \ static ssize_t set_##type##item (struct i2c_client *, struct gl520_data *, const char *, size_t, int, int); \
static ssize_t set_##type##n##item (struct device *, const char *, size_t); \ static ssize_t set_##type##n##item (struct device *, struct device_attribute *attr, const char *, size_t); \
static ssize_t set_##type##n##item (struct device *dev, const char *buf, size_t count) \ static ssize_t set_##type##n##item (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 gl520_data *data = i2c_get_clientdata(client); \ struct gl520_data *data = i2c_get_clientdata(client); \
......
drivers/i2c/chips/it87.c
View file @ 30f74292
...@@ -290,7 +290,7 @@ static ssize_t set_in_max(struct device *dev, const char *buf, ...@@ -290,7 +290,7 @@ 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); \
} \ } \
...@@ -298,21 +298,21 @@ static DEVICE_ATTR(in##offset##_input, S_IRUGO, show_in##offset, NULL); ...@@ -298,21 +298,21 @@ static DEVICE_ATTR(in##offset##_input, S_IRUGO, show_in##offset, NULL);
#define limit_in_offset(offset) \ #define limit_in_offset(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); \
...@@ -383,26 +383,26 @@ static ssize_t set_temp_min(struct device *dev, const char *buf, ...@@ -383,26 +383,26 @@ static ssize_t set_temp_min(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##_max (struct device *dev, char *buf) \ 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 \ static ssize_t \
show_temp_##offset##_min (struct device *dev, char *buf) \ 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 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); \
} \ } \
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); \
...@@ -453,11 +453,11 @@ static ssize_t set_sensor(struct device *dev, const char *buf, ...@@ -453,11 +453,11 @@ static ssize_t set_sensor(struct device *dev, const char *buf,
return count; return count;
} }
#define show_sensor_offset(offset) \ #define show_sensor_offset(offset) \
static ssize_t show_sensor_##offset (struct device *dev, char *buf) \ static ssize_t show_sensor_##offset (struct device *dev, struct device_attribute *attr, char *buf) \
{ \ { \
return show_sensor(dev, buf, offset - 1); \ return show_sensor(dev, buf, offset - 1); \
} \ } \
static ssize_t set_sensor_##offset (struct device *dev, \ static ssize_t set_sensor_##offset (struct device *dev, struct device_attribute *attr, \
const char *buf, size_t count) \ const char *buf, size_t count) \
{ \ { \
return set_sensor(dev, buf, count, offset - 1); \ return set_sensor(dev, buf, count, offset - 1); \
...@@ -600,24 +600,24 @@ static ssize_t set_pwm(struct device *dev, const char *buf, ...@@ -600,24 +600,24 @@ static ssize_t set_pwm(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); \
...@@ -633,21 +633,21 @@ show_fan_offset(2); ...@@ -633,21 +633,21 @@ show_fan_offset(2);
show_fan_offset(3); show_fan_offset(3);
#define show_pwm_offset(offset) \ #define show_pwm_offset(offset) \
static ssize_t show_pwm##offset##_enable (struct device *dev, \ static ssize_t show_pwm##offset##_enable (struct device *dev, struct device_attribute *attr, \
char *buf) \ char *buf) \
{ \ { \
return show_pwm_enable(dev, buf, offset - 1); \ return show_pwm_enable(dev, buf, offset - 1); \
} \ } \
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##_enable (struct device *dev, \ static ssize_t set_pwm##offset##_enable (struct device *dev, struct device_attribute *attr, \
const char *buf, size_t count) \ const char *buf, size_t count) \
{ \ { \
return set_pwm_enable(dev, buf, count, offset - 1); \ return set_pwm_enable(dev, buf, count, 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); \
...@@ -663,7 +663,7 @@ show_pwm_offset(2); ...@@ -663,7 +663,7 @@ show_pwm_offset(2);
show_pwm_offset(3); show_pwm_offset(3);
/* 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 it87_data *data = it87_update_device(dev); struct it87_data *data = it87_update_device(dev);
return sprintf(buf,"%d\n", ALARMS_FROM_REG(data->alarms)); return sprintf(buf,"%d\n", ALARMS_FROM_REG(data->alarms));
...@@ -671,13 +671,13 @@ static ssize_t show_alarms(struct device *dev, char *buf) ...@@ -671,13 +671,13 @@ static ssize_t show_alarms(struct device *dev, char *buf)
static DEVICE_ATTR(alarms, S_IRUGO, show_alarms, NULL); static DEVICE_ATTR(alarms, S_IRUGO, show_alarms, NULL);
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 it87_data *data = it87_update_device(dev); struct it87_data *data = it87_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 it87_data *data = i2c_get_clientdata(client); struct it87_data *data = i2c_get_clientdata(client);
...@@ -693,7 +693,7 @@ static DEVICE_ATTR(vrm, S_IRUGO | S_IWUSR, show_vrm_reg, store_vrm_reg); ...@@ -693,7 +693,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_vid_reg(struct device *dev, char *buf) show_vid_reg(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct it87_data *data = it87_update_device(dev); struct it87_data *data = it87_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));
......
drivers/i2c/chips/lm63.c
View file @ 30f74292
...@@ -177,7 +177,7 @@ struct lm63_data { ...@@ -177,7 +177,7 @@ struct lm63_data {
*/ */
#define show_fan(value) \ #define show_fan(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 lm63_data *data = lm63_update_device(dev); \ struct lm63_data *data = lm63_update_device(dev); \
return sprintf(buf, "%d\n", FAN_FROM_REG(data->value)); \ return sprintf(buf, "%d\n", FAN_FROM_REG(data->value)); \
...@@ -185,7 +185,7 @@ static ssize_t show_##value(struct device *dev, char *buf) \ ...@@ -185,7 +185,7 @@ static ssize_t show_##value(struct device *dev, char *buf) \
show_fan(fan1_input); show_fan(fan1_input);
show_fan(fan1_low); show_fan(fan1_low);
static ssize_t set_fan1_low(struct device *dev, const char *buf, static ssize_t set_fan1_low(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_fan1_low(struct device *dev, const char *buf, ...@@ -202,7 +202,7 @@ static ssize_t set_fan1_low(struct device *dev, const char *buf,
return count; return count;
} }
static ssize_t show_pwm1(struct device *dev, char *buf) static ssize_t show_pwm1(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct lm63_data *data = lm63_update_device(dev); struct lm63_data *data = lm63_update_device(dev);
return sprintf(buf, "%d\n", data->pwm1_value >= 2 * data->pwm1_freq ? return sprintf(buf, "%d\n", data->pwm1_value >= 2 * data->pwm1_freq ?
...@@ -210,7 +210,7 @@ static ssize_t show_pwm1(struct device *dev, char *buf) ...@@ -210,7 +210,7 @@ static ssize_t show_pwm1(struct device *dev, char *buf)
(2 * data->pwm1_freq)); (2 * data->pwm1_freq));
} }
static ssize_t set_pwm1(struct device *dev, const char *buf, size_t count) static ssize_t set_pwm1(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 lm63_data *data = i2c_get_clientdata(client); struct lm63_data *data = i2c_get_clientdata(client);
...@@ -229,20 +229,20 @@ static ssize_t set_pwm1(struct device *dev, const char *buf, size_t count) ...@@ -229,20 +229,20 @@ static ssize_t set_pwm1(struct device *dev, const char *buf, size_t count)
return count; return count;
} }
static ssize_t show_pwm1_enable(struct device *dev, char *buf) static ssize_t show_pwm1_enable(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct lm63_data *data = lm63_update_device(dev); struct lm63_data *data = lm63_update_device(dev);
return sprintf(buf, "%d\n", data->config_fan & 0x20 ? 1 : 2); return sprintf(buf, "%d\n", data->config_fan & 0x20 ? 1 : 2);
} }
#define show_temp8(value) \ #define show_temp8(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 lm63_data *data = lm63_update_device(dev); \ struct lm63_data *data = lm63_update_device(dev); \
return sprintf(buf, "%d\n", TEMP8_FROM_REG(data->value)); \ return sprintf(buf, "%d\n", TEMP8_FROM_REG(data->value)); \
} }
#define show_temp11(value) \ #define show_temp11(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 lm63_data *data = lm63_update_device(dev); \ struct lm63_data *data = lm63_update_device(dev); \
return sprintf(buf, "%d\n", TEMP11_FROM_REG(data->value)); \ return sprintf(buf, "%d\n", TEMP11_FROM_REG(data->value)); \
...@@ -255,7 +255,7 @@ show_temp11(temp2_low); ...@@ -255,7 +255,7 @@ show_temp11(temp2_low);
show_temp8(temp2_crit); show_temp8(temp2_crit);
#define set_temp8(value, reg) \ #define set_temp8(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); \
...@@ -269,7 +269,7 @@ static ssize_t set_##value(struct device *dev, const char *buf, \ ...@@ -269,7 +269,7 @@ static ssize_t set_##value(struct device *dev, const char *buf, \
return count; \ return count; \
} }
#define set_temp11(value, reg_msb, reg_lsb) \ #define set_temp11(value, reg_msb, reg_lsb) \
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); \
...@@ -289,7 +289,7 @@ set_temp11(temp2_low, LM63_REG_REMOTE_LOW_MSB, LM63_REG_REMOTE_LOW_LSB); ...@@ -289,7 +289,7 @@ set_temp11(temp2_low, LM63_REG_REMOTE_LOW_MSB, LM63_REG_REMOTE_LOW_LSB);
/* Hysteresis register holds a relative value, while we want to present /* Hysteresis register holds a relative value, while we want to present
an absolute to user-space */ an absolute to user-space */
static ssize_t show_temp2_crit_hyst(struct device *dev, char *buf) static ssize_t show_temp2_crit_hyst(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct lm63_data *data = lm63_update_device(dev); struct lm63_data *data = lm63_update_device(dev);
return sprintf(buf, "%d\n", TEMP8_FROM_REG(data->temp2_crit) return sprintf(buf, "%d\n", TEMP8_FROM_REG(data->temp2_crit)
...@@ -298,7 +298,7 @@ static ssize_t show_temp2_crit_hyst(struct device *dev, char *buf) ...@@ -298,7 +298,7 @@ static ssize_t show_temp2_crit_hyst(struct device *dev, char *buf)
/* And now the other way around, user-space provides an absolute /* And now the other way around, user-space provides an absolute
hysteresis value and we have to store a relative one */ hysteresis value and we have to store a relative one */
static ssize_t set_temp2_crit_hyst(struct device *dev, const char *buf, static ssize_t set_temp2_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);
...@@ -314,7 +314,7 @@ static ssize_t set_temp2_crit_hyst(struct device *dev, const char *buf, ...@@ -314,7 +314,7 @@ static ssize_t set_temp2_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 lm63_data *data = lm63_update_device(dev); struct lm63_data *data = lm63_update_device(dev);
return sprintf(buf, "%u\n", data->alarms); return sprintf(buf, "%u\n", data->alarms);
......
drivers/i2c/chips/lm75.c
View file @ 30f74292
...@@ -75,7 +75,7 @@ static struct i2c_driver lm75_driver = { ...@@ -75,7 +75,7 @@ static struct i2c_driver lm75_driver = {
}; };
#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 lm75_data *data = lm75_update_device(dev); \ struct lm75_data *data = lm75_update_device(dev); \
return sprintf(buf, "%d\n", LM75_TEMP_FROM_REG(data->value)); \ return sprintf(buf, "%d\n", LM75_TEMP_FROM_REG(data->value)); \
...@@ -85,7 +85,7 @@ show(temp_hyst); ...@@ -85,7 +85,7 @@ show(temp_hyst);
show(temp_input); show(temp_input);
#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 lm75_data *data = i2c_get_clientdata(client); \ struct lm75_data *data = i2c_get_clientdata(client); \
......
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