Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 2715
b: refs/heads/master
c: 6f637a6
h: refs/heads/master
i:
  2713: 1df9419
  2711: b149dc7
v: v3
  • Loading branch information
Greg Kroah-Hartman committed Jun 22, 2005
1 parent b07ea01 commit 8f994bf
Show file tree
Hide file tree
Showing 4 changed files with 62 additions and 35 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 563db2fe9e0843da9d1d85d824f022be0ada4a3c
refs/heads/master: 6f637a6494a1872c613fe68f64ea4831c3e5b037
54 changes: 37 additions & 17 deletions trunk/drivers/i2c/chips/adm9240.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,9 @@ static int adm9240_write_value(struct i2c_client *client, u8 reg, u8 value)

/* temperature */
#define show_temp(value, scale) \
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 adm9240_data *data = adm9240_update_device(dev); \
return sprintf(buf, "%d\n", data->value * scale); \
Expand All @@ -195,8 +197,9 @@ show_temp(temp_hyst, 1000);
show_temp(temp, 500); /* 0.5'C per bit */

#define set_temp(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 adm9240_data *data = adm9240_update_device(dev); \
Expand Down Expand Up @@ -266,26 +269,36 @@ static ssize_t set_in_max(struct device *dev, const char *buf,
}

#define show_in_offset(offset) \
static ssize_t show_in##offset(struct device *dev, char *buf) \
static ssize_t show_in##offset(struct device *dev, \
struct device_attribute *attr, \
char *buf) \
{ \
return show_in(dev, buf, offset); \
} \
static DEVICE_ATTR(in##offset##_input, S_IRUGO, show_in##offset, NULL); \
static ssize_t show_in##offset##_min(struct device *dev, char *buf) \
static ssize_t show_in##offset##_min(struct device *dev, \
struct device_attribute *attr, \
char *buf) \
{ \
return show_in_min(dev, buf, offset); \
} \
static ssize_t show_in##offset##_max(struct device *dev, char *buf) \
static ssize_t show_in##offset##_max(struct device *dev, \
struct device_attribute *attr, \
char *buf) \
{ \
return show_in_max(dev, buf, offset); \
} \
static ssize_t \
set_in##offset##_min(struct device *dev, const char *buf, size_t count) \
set_in##offset##_min(struct device *dev, \
struct device_attribute *attr, const char *buf, \
size_t count) \
{ \
return set_in_min(dev, buf, count, offset); \
} \
static ssize_t \
set_in##offset##_max(struct device *dev, const char *buf, size_t count) \
set_in##offset##_max(struct device *dev, \
struct device_attribute *attr, const char *buf, \
size_t count) \
{ \
return set_in_max(dev, buf, count, offset); \
} \
Expand Down Expand Up @@ -401,20 +414,27 @@ static ssize_t set_fan_min(struct device *dev, const char *buf,
}

#define show_fan_offset(offset) \
static ssize_t show_fan_##offset (struct device *dev, char *buf) \
static ssize_t show_fan_##offset (struct device *dev, \
struct device_attribute *attr, \
char *buf) \
{ \
return show_fan(dev, buf, offset - 1); \
} \
static ssize_t show_fan_##offset##_div (struct device *dev, char *buf) \
static ssize_t show_fan_##offset##_div (struct device *dev, \
struct device_attribute *attr, \
char *buf) \
{ \
return show_fan_div(dev, buf, offset - 1); \
} \
static ssize_t show_fan_##offset##_min (struct device *dev, char *buf) \
static ssize_t show_fan_##offset##_min (struct device *dev, \
struct device_attribute *attr, \
char *buf) \
{ \
return show_fan_min(dev, buf, offset - 1); \
} \
static ssize_t set_fan_##offset##_min (struct device *dev, \
const char *buf, size_t count) \
struct device_attribute *attr, \
const char *buf, size_t count) \
{ \
return set_fan_min(dev, buf, count, offset - 1); \
} \
Expand All @@ -429,29 +449,29 @@ show_fan_offset(1);
show_fan_offset(2);

/* 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 adm9240_data *data = adm9240_update_device(dev);
return sprintf(buf, "%u\n", data->alarms);
}
static DEVICE_ATTR(alarms, S_IRUGO, show_alarms, NULL);

/* vid */
static ssize_t show_vid(struct device *dev, char *buf)
static ssize_t show_vid(struct device *dev, struct device_attribute *attr, char *buf)
{
struct adm9240_data *data = adm9240_update_device(dev);
return sprintf(buf, "%d\n", vid_from_reg(data->vid, data->vrm));
}
static DEVICE_ATTR(cpu0_vid, S_IRUGO, show_vid, NULL);

/* analog output */
static ssize_t show_aout(struct device *dev, char *buf)
static ssize_t show_aout(struct device *dev, struct device_attribute *attr, char *buf)
{
struct adm9240_data *data = adm9240_update_device(dev);
return sprintf(buf, "%d\n", AOUT_FROM_REG(data->aout));
}

static ssize_t set_aout(struct device *dev, const char *buf, size_t count)
static ssize_t set_aout(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
{
struct i2c_client *client = to_i2c_client(dev);
struct adm9240_data *data = i2c_get_clientdata(client);
Expand All @@ -466,7 +486,7 @@ static ssize_t set_aout(struct device *dev, const char *buf, size_t count)
static DEVICE_ATTR(aout_output, S_IRUGO | S_IWUSR, show_aout, set_aout);

/* chassis_clear */
static ssize_t chassis_clear(struct device *dev, const char *buf, size_t count)
static ssize_t chassis_clear(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
{
struct i2c_client *client = to_i2c_client(dev);
unsigned long val = simple_strtol(buf, NULL, 10);
Expand Down
12 changes: 6 additions & 6 deletions trunk/drivers/i2c/chips/atxp1.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ static struct atxp1_data * atxp1_update_device(struct device *dev)
}

/* sys file functions for cpu0_vid */
static ssize_t atxp1_showvcore(struct device *dev, char *buf)
static ssize_t atxp1_showvcore(struct device *dev, struct device_attribute *attr, char *buf)
{
int size;
struct atxp1_data *data;
Expand All @@ -111,7 +111,7 @@ static ssize_t atxp1_showvcore(struct device *dev, char *buf)
return size;
}

static ssize_t atxp1_storevcore(struct device *dev, const char* buf, size_t count)
static ssize_t atxp1_storevcore(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
{
struct atxp1_data *data;
struct i2c_client *client;
Expand Down Expand Up @@ -169,7 +169,7 @@ static ssize_t atxp1_storevcore(struct device *dev, const char* buf, size_t coun
static DEVICE_ATTR(cpu0_vid, S_IRUGO | S_IWUSR, atxp1_showvcore, atxp1_storevcore);

/* sys file functions for GPIO1 */
static ssize_t atxp1_showgpio1(struct device *dev, char *buf)
static ssize_t atxp1_showgpio1(struct device *dev, struct device_attribute *attr, char *buf)
{
int size;
struct atxp1_data *data;
Expand All @@ -181,7 +181,7 @@ static ssize_t atxp1_showgpio1(struct device *dev, char *buf)
return size;
}

static ssize_t atxp1_storegpio1(struct device *dev, const char* buf, size_t count)
static ssize_t atxp1_storegpio1(struct device *dev, struct device_attribute *attr, const char*buf, size_t count)
{
struct atxp1_data *data;
struct i2c_client *client;
Expand Down Expand Up @@ -211,7 +211,7 @@ static ssize_t atxp1_storegpio1(struct device *dev, const char* buf, size_t coun
static DEVICE_ATTR(gpio1, S_IRUGO | S_IWUSR, atxp1_showgpio1, atxp1_storegpio1);

/* sys file functions for GPIO2 */
static ssize_t atxp1_showgpio2(struct device *dev, char *buf)
static ssize_t atxp1_showgpio2(struct device *dev, struct device_attribute *attr, char *buf)
{
int size;
struct atxp1_data *data;
Expand All @@ -223,7 +223,7 @@ static ssize_t atxp1_showgpio2(struct device *dev, char *buf)
return size;
}

static ssize_t atxp1_storegpio2(struct device *dev, const char* buf, size_t count)
static ssize_t atxp1_storegpio2(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
{
struct atxp1_data *data;
struct i2c_client *client;
Expand Down
29 changes: 18 additions & 11 deletions trunk/drivers/i2c/chips/w83627ehf.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -486,7 +486,8 @@ store_fan_min(struct device *dev, const char *buf, size_t count, int nr)

#define sysfs_fan_offset(offset) \
static ssize_t \
show_reg_fan_##offset(struct device *dev, char *buf) \
show_reg_fan_##offset(struct device *dev, struct device_attribute *attr, \
char *buf) \
{ \
return show_fan(dev, buf, offset-1); \
} \
Expand All @@ -495,13 +496,14 @@ static DEVICE_ATTR(fan##offset##_input, S_IRUGO, \

#define sysfs_fan_min_offset(offset) \
static ssize_t \
show_reg_fan##offset##_min(struct device *dev, char *buf) \
show_reg_fan##offset##_min(struct device *dev, struct device_attribute *attr, \
char *buf) \
{ \
return show_fan_min(dev, buf, offset-1); \
} \
static ssize_t \
store_reg_fan##offset##_min(struct device *dev, const char *buf, \
size_t count) \
store_reg_fan##offset##_min(struct device *dev, struct device_attribute *attr, \
const char *buf, size_t count) \
{ \
return store_fan_min(dev, buf, count, offset-1); \
} \
Expand All @@ -511,7 +513,8 @@ static DEVICE_ATTR(fan##offset##_min, S_IRUGO | S_IWUSR, \

#define sysfs_fan_div_offset(offset) \
static ssize_t \
show_reg_fan##offset##_div(struct device *dev, char *buf) \
show_reg_fan##offset##_div(struct device *dev, struct device_attribute *attr, \
char *buf) \
{ \
return show_fan_div(dev, buf, offset - 1); \
} \
Expand All @@ -536,7 +539,8 @@ sysfs_fan_div_offset(5);

#define show_temp1_reg(reg) \
static ssize_t \
show_##reg(struct device *dev, char *buf) \
show_##reg(struct device *dev, struct device_attribute *attr, \
char *buf) \
{ \
struct w83627ehf_data *data = w83627ehf_update_device(dev); \
return sprintf(buf, "%d\n", temp1_from_reg(data->reg)); \
Expand All @@ -547,7 +551,8 @@ show_temp1_reg(temp1_max_hyst);

#define store_temp1_reg(REG, reg) \
static ssize_t \
store_temp1_##reg(struct device *dev, const char *buf, size_t count) \
store_temp1_##reg(struct device *dev, struct device_attribute *attr, \
const char *buf, size_t count) \
{ \
struct i2c_client *client = to_i2c_client(dev); \
struct w83627ehf_data *data = i2c_get_clientdata(client); \
Expand Down Expand Up @@ -601,7 +606,8 @@ store_temp_reg(HYST, temp_max_hyst);

#define sysfs_temp_offset(offset) \
static ssize_t \
show_reg_temp##offset (struct device *dev, char *buf) \
show_reg_temp##offset (struct device *dev, struct device_attribute *attr, \
char *buf) \
{ \
return show_temp(dev, buf, offset - 2); \
} \
Expand All @@ -610,13 +616,14 @@ static DEVICE_ATTR(temp##offset##_input, S_IRUGO, \

#define sysfs_temp_reg_offset(reg, offset) \
static ssize_t \
show_reg_temp##offset##_##reg(struct device *dev, char *buf) \
show_reg_temp##offset##_##reg(struct device *dev, struct device_attribute *attr, \
char *buf) \
{ \
return show_temp_##reg(dev, buf, offset - 2); \
} \
static ssize_t \
store_reg_temp##offset##_##reg(struct device *dev, const char *buf, \
size_t count) \
store_reg_temp##offset##_##reg(struct device *dev, struct device_attribute *attr, \
const char *buf, size_t count) \
{ \
return store_temp_##reg(dev, buf, count, offset - 2); \
} \
Expand Down

0 comments on commit 8f994bf

Please sign in to comment.