Skip to content

L
linux
Commit 8efe751d authored by Mark M. Hoffman's avatar Mark M. Hoffman Committed by Greg Kroah-Hartman
Browse files
Options

[PATCH] i2c: kill some sensors driver macro abuse 

This patch kills a specific kind of ugly and ultimately useless macro
abuse found in many sensors chip drivers.  Compile tested only.
Signed-off-by: default avatarMark M. Hoffman <mhoffman@lightlink.com>
Signed-off-by: default avatarGreg Kroah-Hartman <greg@kroah.com>
parent 439b1408
Hide whitespace changes
Inline Side-by-side
Showing with 110 additions and 110 deletions
drivers/i2c/chips/adm1031.c
View file @ 8efe751d
...@@ -298,12 +298,12 @@ set_fan_auto_channel(struct device *dev, const char *buf, size_t count, int nr) ...@@ -298,12 +298,12 @@ 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, char *buf) \
{ \ { \
return show_fan_auto_channel(dev, buf, 0x##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, \
const char *buf, size_t count) \ const char *buf, size_t count) \
{ \ { \
return set_fan_auto_channel(dev, buf, count, 0x##offset - 1); \ return set_fan_auto_channel(dev, buf, count, offset - 1); \
} \ } \
static DEVICE_ATTR(auto_fan##offset##_channel, S_IRUGO | S_IWUSR, \ static DEVICE_ATTR(auto_fan##offset##_channel, S_IRUGO | S_IWUSR, \
show_fan_auto_channel_##offset, \ show_fan_auto_channel_##offset, \
...@@ -365,25 +365,25 @@ set_auto_temp_max(struct device *dev, const char *buf, size_t count, int nr) ...@@ -365,25 +365,25 @@ 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, char *buf) \
{ \ { \
return show_auto_temp_off(dev, buf, 0x##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, char *buf) \
{ \ { \
return show_auto_temp_min(dev, buf, 0x##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, char *buf) \
{ \ { \
return show_auto_temp_max(dev, buf, 0x##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, \
const char *buf, size_t count) \ const char *buf, size_t count) \
{ \ { \
return set_auto_temp_min(dev, buf, count, 0x##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, \
const char *buf, size_t count) \ const char *buf, size_t count) \
{ \ { \
return set_auto_temp_max(dev, buf, count, 0x##offset - 1); \ return set_auto_temp_max(dev, buf, count, offset - 1); \
} \ } \
static DEVICE_ATTR(auto_temp##offset##_off, S_IRUGO, \ static DEVICE_ATTR(auto_temp##offset##_off, S_IRUGO, \
show_auto_temp_##offset##_off, NULL); \ show_auto_temp_##offset##_off, NULL); \
...@@ -429,12 +429,12 @@ set_pwm(struct device *dev, const char *buf, size_t count, int nr) ...@@ -429,12 +429,12 @@ 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, char *buf) \
{ \ { \
return show_pwm(dev, buf, 0x##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, \
const char *buf, size_t count) \ const char *buf, size_t count) \
{ \ { \
return set_pwm(dev, buf, count, 0x##offset - 1); \ return set_pwm(dev, buf, count, offset - 1); \
} \ } \
static DEVICE_ATTR(pwm##offset, S_IRUGO | S_IWUSR, \ static DEVICE_ATTR(pwm##offset, S_IRUGO | S_IWUSR, \
show_pwm_##offset, set_pwm_##offset) show_pwm_##offset, set_pwm_##offset)
...@@ -565,25 +565,25 @@ set_fan_div(struct device *dev, const char *buf, size_t count, int nr) ...@@ -565,25 +565,25 @@ 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, char *buf) \
{ \ { \
return show_fan(dev, buf, 0x##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, char *buf) \
{ \ { \
return show_fan_min(dev, buf, 0x##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, char *buf) \
{ \ { \
return show_fan_div(dev, buf, 0x##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, \
const char *buf, size_t count) \ const char *buf, size_t count) \
{ \ { \
return set_fan_min(dev, buf, count, 0x##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, \
const char *buf, size_t count) \ const char *buf, size_t count) \
{ \ { \
return set_fan_div(dev, buf, count, 0x##offset - 1); \ return set_fan_div(dev, buf, count, offset - 1); \
} \ } \
static DEVICE_ATTR(fan##offset##_input, S_IRUGO, show_fan_##offset, \ static DEVICE_ATTR(fan##offset##_input, S_IRUGO, show_fan_##offset, \
NULL); \ NULL); \
...@@ -675,34 +675,34 @@ set_temp_crit(struct device *dev, const char *buf, size_t count, int nr) ...@@ -675,34 +675,34 @@ 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, char *buf) \
{ \ { \
return show_temp(dev, buf, 0x##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, char *buf) \
{ \ { \
return show_temp_min(dev, buf, 0x##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, char *buf) \
{ \ { \
return show_temp_max(dev, buf, 0x##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, char *buf) \
{ \ { \
return show_temp_crit(dev, buf, 0x##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, \
const char *buf, size_t count) \ const char *buf, size_t count) \
{ \ { \
return set_temp_min(dev, buf, count, 0x##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, \
const char *buf, size_t count) \ const char *buf, size_t count) \
{ \ { \
return set_temp_max(dev, buf, count, 0x##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, \
const char *buf, size_t count) \ const char *buf, size_t count) \
{ \ { \
return set_temp_crit(dev, buf, count, 0x##offset - 1); \ return set_temp_crit(dev, buf, count, offset - 1); \
} \ } \
static DEVICE_ATTR(temp##offset##_input, S_IRUGO, show_temp_##offset, \ static DEVICE_ATTR(temp##offset##_input, S_IRUGO, show_temp_##offset, \
NULL); \ NULL); \
......
drivers/i2c/chips/asb100.c
View file @ 8efe751d
...@@ -266,29 +266,29 @@ set_in_reg(MAX, max) ...@@ -266,29 +266,29 @@ set_in_reg(MAX, max)
static ssize_t \ static ssize_t \
show_in##offset (struct device *dev, char *buf) \ show_in##offset (struct device *dev, char *buf) \
{ \ { \
return show_in(dev, buf, 0x##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, char *buf) \
{ \ { \
return show_in_min(dev, buf, 0x##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, char *buf) \
{ \ { \
return show_in_max(dev, buf, 0x##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, \
const char *buf, size_t count) \ const char *buf, size_t count) \
{ \ { \
return set_in_min(dev, buf, count, 0x##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, \
const char *buf, size_t count) \ const char *buf, size_t count) \
{ \ { \
return set_in_max(dev, buf, count, 0x##offset); \ return set_in_max(dev, buf, count, offset); \
} \ } \
static DEVICE_ATTR(in##offset##_min, S_IRUGO | S_IWUSR, \ static DEVICE_ATTR(in##offset##_min, S_IRUGO | S_IWUSR, \
show_in##offset##_min, set_in##offset##_min); \ show_in##offset##_min, set_in##offset##_min); \
......
drivers/i2c/chips/it87.c
View file @ 8efe751d
...@@ -273,7 +273,7 @@ static ssize_t set_in_max(struct device *dev, const char *buf, ...@@ -273,7 +273,7 @@ static ssize_t set_in_max(struct device *dev, const char *buf,
static ssize_t \ static ssize_t \
show_in##offset (struct device *dev, char *buf) \ show_in##offset (struct device *dev, char *buf) \
{ \ { \
return show_in(dev, buf, 0x##offset); \ return show_in(dev, buf, offset); \
} \ } \
static DEVICE_ATTR(in##offset##_input, S_IRUGO, show_in##offset, NULL); static DEVICE_ATTR(in##offset##_input, S_IRUGO, show_in##offset, NULL);
...@@ -281,22 +281,22 @@ static DEVICE_ATTR(in##offset##_input, S_IRUGO, show_in##offset, NULL); ...@@ -281,22 +281,22 @@ static DEVICE_ATTR(in##offset##_input, S_IRUGO, 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, char *buf) \
{ \ { \
return show_in_min(dev, buf, 0x##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, char *buf) \
{ \ { \
return show_in_max(dev, buf, 0x##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, \
const char *buf, size_t count) \ const char *buf, size_t count) \
{ \ { \
return set_in_min(dev, buf, count, 0x##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, \
const char *buf, size_t count) \ const char *buf, size_t count) \
{ \ { \
return set_in_max(dev, buf, count, 0x##offset); \ return set_in_max(dev, buf, count, offset); \
} \ } \
static DEVICE_ATTR(in##offset##_min, S_IRUGO | S_IWUSR, \ static DEVICE_ATTR(in##offset##_min, S_IRUGO | S_IWUSR, \
show_in##offset##_min, set_in##offset##_min); \ show_in##offset##_min, set_in##offset##_min); \
...@@ -360,27 +360,27 @@ static ssize_t set_temp_min(struct device *dev, const char *buf, ...@@ -360,27 +360,27 @@ static ssize_t set_temp_min(struct device *dev, const char *buf,
#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, char *buf) \
{ \ { \
return show_temp(dev, buf, 0x##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, char *buf) \
{ \ { \
return show_temp_max(dev, buf, 0x##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, char *buf) \
{ \ { \
return show_temp_min(dev, buf, 0x##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, \
const char *buf, size_t count) \ const char *buf, size_t count) \
{ \ { \
return set_temp_max(dev, buf, count, 0x##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, \
const char *buf, size_t count) \ const char *buf, size_t count) \
{ \ { \
return set_temp_min(dev, buf, count, 0x##offset - 1); \ return set_temp_min(dev, buf, count, offset - 1); \
} \ } \
static DEVICE_ATTR(temp##offset##_input, S_IRUGO, show_temp_##offset, NULL); \ static DEVICE_ATTR(temp##offset##_input, S_IRUGO, show_temp_##offset, NULL); \
static DEVICE_ATTR(temp##offset##_max, S_IRUGO | S_IWUSR, \ static DEVICE_ATTR(temp##offset##_max, S_IRUGO | S_IWUSR, \
...@@ -423,12 +423,12 @@ static ssize_t set_sensor(struct device *dev, const char *buf, ...@@ -423,12 +423,12 @@ static ssize_t set_sensor(struct device *dev, const char *buf,
#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, char *buf) \
{ \ { \
return show_sensor(dev, buf, 0x##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, \
const char *buf, size_t count) \ const char *buf, size_t count) \
{ \ { \
return set_sensor(dev, buf, count, 0x##offset - 1); \ return set_sensor(dev, buf, count, offset - 1); \
} \ } \
static DEVICE_ATTR(temp##offset##_type, S_IRUGO | S_IWUSR, \ static DEVICE_ATTR(temp##offset##_type, S_IRUGO | S_IWUSR, \
show_sensor_##offset, set_sensor_##offset); show_sensor_##offset, set_sensor_##offset);
...@@ -505,25 +505,25 @@ static ssize_t set_fan_div(struct device *dev, const char *buf, ...@@ -505,25 +505,25 @@ 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, char *buf) \
{ \ { \
return show_fan(dev, buf, 0x##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, char *buf) \
{ \ { \
return show_fan_min(dev, buf, 0x##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, char *buf) \
{ \ { \
return show_fan_div(dev, buf, 0x##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, \
const char *buf, size_t count) \ const char *buf, size_t count) \
{ \ { \
return set_fan_min(dev, buf, count, 0x##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, \
const char *buf, size_t count) \ const char *buf, size_t count) \
{ \ { \
return set_fan_div(dev, buf, count, 0x##offset - 1); \ return set_fan_div(dev, buf, count, offset - 1); \
} \ } \
static DEVICE_ATTR(fan##offset##_input, S_IRUGO, show_fan_##offset, NULL); \ 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, \
......
drivers/i2c/chips/lm78.c
View file @ 8efe751d
...@@ -229,29 +229,29 @@ static ssize_t set_in_max(struct device *dev, const char *buf, ...@@ -229,29 +229,29 @@ static ssize_t set_in_max(struct device *dev, const char *buf,
static ssize_t \ static ssize_t \
show_in##offset (struct device *dev, char *buf) \ show_in##offset (struct device *dev, char *buf) \
{ \ { \
return show_in(dev, buf, 0x##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, char *buf) \
{ \ { \
return show_in_min(dev, buf, 0x##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, char *buf) \
{ \ { \
return show_in_max(dev, buf, 0x##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, \
const char *buf, size_t count) \ const char *buf, size_t count) \
{ \ { \
return set_in_min(dev, buf, count, 0x##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, \
const char *buf, size_t count) \ const char *buf, size_t count) \
{ \ { \
return set_in_max(dev, buf, count, 0x##offset); \ return set_in_max(dev, buf, count, offset); \
} \ } \
static DEVICE_ATTR(in##offset##_min, S_IRUGO | S_IWUSR, \ static DEVICE_ATTR(in##offset##_min, S_IRUGO | S_IWUSR, \
show_in##offset##_min, set_in##offset##_min); \ show_in##offset##_min, set_in##offset##_min); \
...@@ -375,20 +375,20 @@ static ssize_t set_fan_div(struct device *dev, const char *buf, ...@@ -375,20 +375,20 @@ 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, char *buf) \
{ \ { \
return show_fan(dev, buf, 0x##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, char *buf) \
{ \ { \
return show_fan_min(dev, buf, 0x##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, char *buf) \
{ \ { \
return show_fan_div(dev, buf, 0x##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, \
const char *buf, size_t count) \ const char *buf, size_t count) \
{ \ { \
return set_fan_min(dev, buf, count, 0x##offset - 1); \ return set_fan_min(dev, buf, count, offset - 1); \
} \ } \
static DEVICE_ATTR(fan##offset##_input, S_IRUGO, show_fan_##offset, NULL);\ 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, \
......
drivers/i2c/chips/lm85.c
View file @ 8efe751d
...@@ -437,16 +437,16 @@ static ssize_t set_fan_min(struct device *dev, const char *buf, ...@@ -437,16 +437,16 @@ 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, char *buf) \
{ \ { \
return show_fan(dev, buf, 0x##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, char *buf) \
{ \ { \
return show_fan_min(dev, buf, 0x##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, \
const char *buf, size_t count) \ const char *buf, size_t count) \
{ \ { \
return set_fan_min(dev, buf, count, 0x##offset - 1); \ return set_fan_min(dev, buf, count, offset - 1); \
} \ } \
static DEVICE_ATTR(fan##offset##_input, S_IRUGO, show_fan_##offset, NULL);\ 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, \
...@@ -527,16 +527,16 @@ static ssize_t show_pwm_enable(struct device *dev, char *buf, int nr) ...@@ -527,16 +527,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, char *buf) \
{ \ { \
return show_pwm(dev, buf, 0x##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, \
const char *buf, size_t count) \ const char *buf, size_t count) \
{ \ { \
return set_pwm(dev, buf, count, 0x##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, char *buf) \
{ \ { \
return show_pwm_enable(dev, buf, 0x##offset - 1); \ return show_pwm_enable(dev, buf, offset - 1); \
} \ } \
static DEVICE_ATTR(pwm##offset, S_IRUGO | S_IWUSR, \ static DEVICE_ATTR(pwm##offset, S_IRUGO | S_IWUSR, \
show_pwm_##offset, set_pwm_##offset); \ show_pwm_##offset, set_pwm_##offset); \
...@@ -595,25 +595,25 @@ static ssize_t set_in_max(struct device *dev, const char *buf, ...@@ -595,25 +595,25 @@ static ssize_t set_in_max(struct device *dev, const char *buf,
#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, char *buf) \
{ \ { \
return show_in(dev, buf, 0x##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, char *buf) \
{ \ { \
return show_in_min(dev, buf, 0x##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, char *buf) \
{ \ { \
return show_in_max(dev, buf, 0x##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, \
const char *buf, size_t count) \ const char *buf, size_t count) \
{ \ { \
return set_in_min(dev, buf, count, 0x##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, \
const char *buf, size_t count) \ const char *buf, size_t count) \
{ \ { \
return set_in_max(dev, buf, count, 0x##offset); \ return set_in_max(dev, buf, count, offset); \
} \ } \
static DEVICE_ATTR(in##offset##_input, S_IRUGO, show_in_##offset, NULL); \ static DEVICE_ATTR(in##offset##_input, S_IRUGO, show_in_##offset, NULL); \
static DEVICE_ATTR(in##offset##_min, S_IRUGO | S_IWUSR, \ static DEVICE_ATTR(in##offset##_min, S_IRUGO | S_IWUSR, \
...@@ -675,25 +675,25 @@ static ssize_t set_temp_max(struct device *dev, const char *buf, ...@@ -675,25 +675,25 @@ static ssize_t set_temp_max(struct device *dev, const char *buf,
#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, char *buf) \
{ \ { \
return show_temp(dev, buf, 0x##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, char *buf) \
{ \ { \
return show_temp_min(dev, buf, 0x##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, char *buf) \
{ \ { \
return show_temp_max(dev, buf, 0x##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, \
const char *buf, size_t count) \ const char *buf, size_t count) \
{ \ { \
return set_temp_min(dev, buf, count, 0x##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, \
const char *buf, size_t count) \ const char *buf, size_t count) \
{ \ { \
return set_temp_max(dev, buf, count, 0x##offset - 1); \ return set_temp_max(dev, buf, count, offset - 1); \
} \ } \
static DEVICE_ATTR(temp##offset##_input, S_IRUGO, show_temp_##offset, NULL); \ static DEVICE_ATTR(temp##offset##_input, S_IRUGO, show_temp_##offset, NULL); \
static DEVICE_ATTR(temp##offset##_min, S_IRUGO | S_IWUSR, \ static DEVICE_ATTR(temp##offset##_min, S_IRUGO | S_IWUSR, \
......
drivers/i2c/chips/smsc47m1.c
View file @ 8efe751d
...@@ -298,43 +298,43 @@ static ssize_t set_pwm_en(struct device *dev, const char *buf, ...@@ -298,43 +298,43 @@ 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, char *buf) \
{ \ { \
return get_fan(dev, buf, 0x##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, char *buf) \
{ \ { \
return get_fan_min(dev, buf, 0x##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, \
const char *buf, size_t count) \ const char *buf, size_t count) \
{ \ { \
return set_fan_min(dev, buf, count, 0x##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, char *buf) \
{ \ { \
return get_fan_div(dev, buf, 0x##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, \
const char *buf, size_t count) \ const char *buf, size_t count) \
{ \ { \
return set_fan_div(dev, buf, count, 0x##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, char *buf) \
{ \ { \
return get_pwm(dev, buf, 0x##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, \
const char *buf, size_t count) \ const char *buf, size_t count) \
{ \ { \
return set_pwm(dev, buf, count, 0x##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, char *buf) \
{ \ { \
return get_pwm_en(dev, buf, 0x##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, \
const char *buf, size_t count) \ const char *buf, size_t count) \
{ \ { \
return set_pwm_en(dev, buf, count, 0x##offset - 1); \ return set_pwm_en(dev, buf, count, offset - 1); \
} \ } \
static DEVICE_ATTR(fan##offset##_input, S_IRUGO, get_fan##offset, \ static DEVICE_ATTR(fan##offset##_input, S_IRUGO, get_fan##offset, \
NULL); \ NULL); \
......
drivers/i2c/chips/via686a.c
View file @ 8efe751d
...@@ -383,27 +383,27 @@ static ssize_t set_in_max(struct device *dev, const char *buf, ...@@ -383,27 +383,27 @@ static ssize_t set_in_max(struct device *dev, const char *buf,
static ssize_t \ static ssize_t \
show_in##offset (struct device *dev, char *buf) \ show_in##offset (struct device *dev, char *buf) \
{ \ { \
return show_in(dev, buf, 0x##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, char *buf) \
{ \ { \
return show_in_min(dev, buf, 0x##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, char *buf) \
{ \ { \
return show_in_max(dev, buf, 0x##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, \
const char *buf, size_t count) \ const char *buf, size_t count) \
{ \ { \
return set_in_min(dev, buf, count, 0x##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, \
const char *buf, size_t count) \ const char *buf, size_t count) \
{ \ { \
return set_in_max(dev, buf, count, 0x##offset); \ return set_in_max(dev, buf, count, offset); \
} \ } \
static DEVICE_ATTR(in##offset##_input, S_IRUGO, show_in##offset, NULL);\ static DEVICE_ATTR(in##offset##_input, S_IRUGO, show_in##offset, NULL);\
static DEVICE_ATTR(in##offset##_min, S_IRUGO | S_IWUSR, \ static DEVICE_ATTR(in##offset##_min, S_IRUGO | S_IWUSR, \
...@@ -451,27 +451,27 @@ static ssize_t set_temp_hyst(struct device *dev, const char *buf, ...@@ -451,27 +451,27 @@ static ssize_t set_temp_hyst(struct device *dev, const char *buf,
#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, char *buf) \
{ \ { \
return show_temp(dev, buf, 0x##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, char *buf) \
{ \ { \
return show_temp_over(dev, buf, 0x##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, char *buf) \
{ \ { \
return show_temp_hyst(dev, buf, 0x##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, \
const char *buf, size_t count) \ const char *buf, size_t count) \
{ \ { \
return set_temp_over(dev, buf, count, 0x##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, \
const char *buf, size_t count) \ const char *buf, size_t count) \
{ \ { \
return set_temp_hyst(dev, buf, count, 0x##offset - 1); \ return set_temp_hyst(dev, buf, count, offset - 1); \
} \ } \
static DEVICE_ATTR(temp##offset##_input, S_IRUGO, show_temp_##offset, NULL);\ static DEVICE_ATTR(temp##offset##_input, S_IRUGO, show_temp_##offset, NULL);\
static DEVICE_ATTR(temp##offset##_max, S_IRUGO | S_IWUSR, \ static DEVICE_ATTR(temp##offset##_max, S_IRUGO | S_IWUSR, \
...@@ -522,25 +522,25 @@ static ssize_t set_fan_div(struct device *dev, const char *buf, ...@@ -522,25 +522,25 @@ 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, char *buf) \
{ \ { \
return show_fan(dev, buf, 0x##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, char *buf) \
{ \ { \
return show_fan_min(dev, buf, 0x##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, char *buf) \
{ \ { \
return show_fan_div(dev, buf, 0x##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, \
const char *buf, size_t count) \ const char *buf, size_t count) \
{ \ { \
return set_fan_min(dev, buf, count, 0x##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, \
const char *buf, size_t count) \ const char *buf, size_t count) \
{ \ { \
return set_fan_div(dev, buf, count, 0x##offset - 1); \ return set_fan_div(dev, buf, count, offset - 1); \
} \ } \
static DEVICE_ATTR(fan##offset##_input, S_IRUGO, show_fan_##offset, NULL);\ 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, \
......
drivers/i2c/chips/w83627hf.c
View file @ 8efe751d
...@@ -369,20 +369,20 @@ store_in_reg(MAX, max) ...@@ -369,20 +369,20 @@ store_in_reg(MAX, max)
static ssize_t \ static ssize_t \
show_regs_in_##offset (struct device *dev, char *buf) \ show_regs_in_##offset (struct device *dev, char *buf) \
{ \ { \
return show_in(dev, buf, 0x##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, char *buf) \
{ \ { \
return show_in_##reg (dev, buf, 0x##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, \
const char *buf, size_t count) \ const char *buf, size_t count) \
{ \ { \
return store_in_##reg (dev, buf, count, 0x##offset); \ return store_in_##reg (dev, buf, count, offset); \
} \ } \
static DEVICE_ATTR(in##offset##_##reg, S_IRUGO| S_IWUSR, \ static DEVICE_ATTR(in##offset##_##reg, S_IRUGO| S_IWUSR, \
show_regs_in_##reg##offset, store_regs_in_##reg##offset); show_regs_in_##reg##offset, store_regs_in_##reg##offset);
...@@ -521,19 +521,19 @@ store_fan_min(struct device *dev, const char *buf, size_t count, int nr) ...@@ -521,19 +521,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, char *buf) \
{ \ { \
return show_fan(dev, buf, 0x##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, char *buf) \
{ \ { \
return show_fan_min(dev, buf, 0x##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, const char *buf, size_t count) \
{ \ { \
return store_fan_min(dev, buf, count, 0x##offset); \ return store_fan_min(dev, buf, count, offset); \
} \ } \
static DEVICE_ATTR(fan##offset##_min, S_IRUGO | S_IWUSR, \ static DEVICE_ATTR(fan##offset##_min, S_IRUGO | S_IWUSR, \
show_regs_fan_min##offset, store_regs_fan_min##offset); show_regs_fan_min##offset, store_regs_fan_min##offset);
...@@ -595,20 +595,20 @@ store_temp_reg(HYST, max_hyst); ...@@ -595,20 +595,20 @@ store_temp_reg(HYST, max_hyst);
static ssize_t \ static ssize_t \
show_regs_temp_##offset (struct device *dev, char *buf) \ show_regs_temp_##offset (struct device *dev, char *buf) \
{ \ { \
return show_temp(dev, buf, 0x##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, char *buf) \
{ \ { \
return show_temp_##reg (dev, buf, 0x##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, \
const char *buf, size_t count) \ const char *buf, size_t count) \
{ \ { \
return store_temp_##reg (dev, buf, count, 0x##offset); \ return store_temp_##reg (dev, buf, count, offset); \
} \ } \
static DEVICE_ATTR(temp##offset##_##reg, S_IRUGO| S_IWUSR, \ static DEVICE_ATTR(temp##offset##_##reg, S_IRUGO| S_IWUSR, \
show_regs_temp_##reg##offset, store_regs_temp_##reg##offset); show_regs_temp_##reg##offset, store_regs_temp_##reg##offset);
......
drivers/i2c/chips/w83781d.c
View file @ 8efe751d
...@@ -318,18 +318,18 @@ store_in_reg(MAX, max); ...@@ -318,18 +318,18 @@ store_in_reg(MAX, max);
static ssize_t \ static ssize_t \
show_regs_in_##offset (struct device *dev, char *buf) \ show_regs_in_##offset (struct device *dev, char *buf) \
{ \ { \
return show_in(dev, buf, 0x##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, char *buf) \
{ \ { \
return show_in_##reg (dev, buf, 0x##offset); \ return show_in_##reg (dev, buf, offset); \
} \ } \
static ssize_t store_regs_in_##reg##offset (struct device *dev, const char *buf, size_t count) \ static ssize_t store_regs_in_##reg##offset (struct device *dev, const char *buf, size_t count) \
{ \ { \
return store_in_##reg (dev, buf, count, 0x##offset); \ return store_in_##reg (dev, buf, count, offset); \
} \ } \
static DEVICE_ATTR(in##offset##_##reg, S_IRUGO| S_IWUSR, show_regs_in_##reg##offset, store_regs_in_##reg##offset); static DEVICE_ATTR(in##offset##_##reg, S_IRUGO| S_IWUSR, show_regs_in_##reg##offset, store_regs_in_##reg##offset);
...@@ -384,18 +384,18 @@ store_fan_min(struct device *dev, const char *buf, size_t count, int nr) ...@@ -384,18 +384,18 @@ 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, char *buf) \
{ \ { \
return show_fan(dev, buf, 0x##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, char *buf) \
{ \ { \
return show_fan_min(dev, buf, 0x##offset); \ return show_fan_min(dev, buf, offset); \
} \ } \
static ssize_t store_regs_fan_min##offset (struct device *dev, const char *buf, size_t count) \ static ssize_t store_regs_fan_min##offset (struct device *dev, const char *buf, size_t count) \
{ \ { \
return store_fan_min(dev, buf, count, 0x##offset); \ return store_fan_min(dev, buf, count, offset); \
} \ } \
static DEVICE_ATTR(fan##offset##_min, S_IRUGO | S_IWUSR, show_regs_fan_min##offset, store_regs_fan_min##offset); static DEVICE_ATTR(fan##offset##_min, S_IRUGO | S_IWUSR, show_regs_fan_min##offset, store_regs_fan_min##offset);
...@@ -464,18 +464,18 @@ store_temp_reg(HYST, max_hyst); ...@@ -464,18 +464,18 @@ store_temp_reg(HYST, max_hyst);
static ssize_t \ static ssize_t \
show_regs_temp_##offset (struct device *dev, char *buf) \ show_regs_temp_##offset (struct device *dev, char *buf) \
{ \ { \
return show_temp(dev, buf, 0x##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, char *buf) \
{ \ { \
return show_temp_##reg (dev, buf, 0x##offset); \ return show_temp_##reg (dev, buf, offset); \
} \ } \
static ssize_t store_regs_temp_##reg##offset (struct device *dev, const char *buf, size_t count) \ static ssize_t store_regs_temp_##reg##offset (struct device *dev, const char *buf, size_t count) \
{ \ { \
return store_temp_##reg (dev, buf, count, 0x##offset); \ return store_temp_##reg (dev, buf, count, offset); \
} \ } \
static DEVICE_ATTR(temp##offset##_##reg, S_IRUGO| S_IWUSR, show_regs_temp_##reg##offset, store_regs_temp_##reg##offset); static DEVICE_ATTR(temp##offset##_##reg, S_IRUGO| S_IWUSR, show_regs_temp_##reg##offset, store_regs_temp_##reg##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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7