Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a5099cfc authored by Yani Ioannou's avatar Yani Ioannou Committed by Greg Kroah-Hartman
Browse files

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



Signed-off-by: default avatarYani Ioannou <yani.ioannou@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 8627f9ba

drivers/i2c/chips/pc87360.c

+34 −34
Original line number Diff line number Diff line
@@ -282,31 +282,31 @@ static ssize_t set_fan_min(struct device *dev, const char *buf, 
}



#define show_and_set_fan(offset) \

static ssize_t show_fan##offset##_input(struct device *dev, char *buf) \

static ssize_t show_fan##offset##_input(struct device *dev, struct device_attribute *attr, char *buf) \

{ \

	struct pc87360_data *data = pc87360_update_device(dev); \

	return sprintf(buf, "%u\n", FAN_FROM_REG(data->fan[offset-1], \

		       FAN_DIV_FROM_REG(data->fan_status[offset-1]))); \

} \

static ssize_t show_fan##offset##_min(struct device *dev, char *buf) \

static ssize_t show_fan##offset##_min(struct device *dev, struct device_attribute *attr, char *buf) \

{ \

	struct pc87360_data *data = pc87360_update_device(dev); \

	return sprintf(buf, "%u\n", FAN_FROM_REG(data->fan_min[offset-1], \

		       FAN_DIV_FROM_REG(data->fan_status[offset-1]))); \

} \

static ssize_t show_fan##offset##_div(struct device *dev, char *buf) \

static ssize_t show_fan##offset##_div(struct device *dev, struct device_attribute *attr, char *buf) \

{ \

	struct pc87360_data *data = pc87360_update_device(dev); \

	return sprintf(buf, "%u\n", \

		       FAN_DIV_FROM_REG(data->fan_status[offset-1])); \

} \

static ssize_t show_fan##offset##_status(struct device *dev, char *buf) \

static ssize_t show_fan##offset##_status(struct device *dev, struct device_attribute *attr, char *buf) \

{ \

	struct pc87360_data *data = pc87360_update_device(dev); \

	return sprintf(buf, "%u\n", \

		       FAN_STATUS_FROM_REG(data->fan_status[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) \

{ \

	return set_fan_min(dev, buf, count, offset-1); \
@@ -324,7 +324,7 @@ show_and_set_fan(2) 
show_and_set_fan(3)



#define show_and_set_pwm(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) \

{ \

	struct pc87360_data *data = pc87360_update_device(dev); \

	return sprintf(buf, "%u\n", \
@@ -332,7 +332,7 @@ static ssize_t show_pwm##offset(struct device *dev, char *buf) \ 
				    FAN_CONFIG_INVERT(data->fan_conf, \

						      offset-1))); \

} \

static ssize_t set_pwm##offset(struct device *dev, const char *buf, \

static ssize_t set_pwm##offset(struct device *dev, struct device_attribute *attr, const char *buf, \

	size_t count) \

{ \

	struct i2c_client *client = to_i2c_client(dev); \
@@ -354,30 +354,30 @@ show_and_set_pwm(2) 
show_and_set_pwm(3)



#define show_and_set_in(offset) \

static ssize_t show_in##offset##_input(struct device *dev, char *buf) \

static ssize_t show_in##offset##_input(struct device *dev, struct device_attribute *attr, char *buf) \

{ \

	struct pc87360_data *data = pc87360_update_device(dev); \

	return sprintf(buf, "%u\n", IN_FROM_REG(data->in[offset], \

		       data->in_vref)); \

} \

static ssize_t show_in##offset##_min(struct device *dev, char *buf) \

static ssize_t show_in##offset##_min(struct device *dev, struct device_attribute *attr, char *buf) \

{ \

	struct pc87360_data *data = pc87360_update_device(dev); \

	return sprintf(buf, "%u\n", IN_FROM_REG(data->in_min[offset], \

		       data->in_vref)); \

} \

static ssize_t show_in##offset##_max(struct device *dev, char *buf) \

static ssize_t show_in##offset##_max(struct device *dev, struct device_attribute *attr, char *buf) \

{ \

	struct pc87360_data *data = pc87360_update_device(dev); \

	return sprintf(buf, "%u\n", IN_FROM_REG(data->in_max[offset], \

		       data->in_vref)); \

} \

static ssize_t show_in##offset##_status(struct device *dev, char *buf) \

static ssize_t show_in##offset##_status(struct device *dev, struct device_attribute *attr, char *buf) \

{ \

	struct pc87360_data *data = pc87360_update_device(dev); \

	return sprintf(buf, "%u\n", data->in_status[offset]); \

} \

static ssize_t set_in##offset##_min(struct device *dev, const char *buf, \

static ssize_t set_in##offset##_min(struct device *dev, struct device_attribute *attr, const char *buf, \

	size_t count) \

{ \

	struct i2c_client *client = to_i2c_client(dev); \
@@ -391,7 +391,7 @@ static ssize_t set_in##offset##_min(struct device *dev, const char *buf, \ 
	up(&data->update_lock); \

	return count; \

} \

static ssize_t set_in##offset##_max(struct device *dev, const char *buf, \

static ssize_t set_in##offset##_max(struct device *dev, struct device_attribute *attr, const char *buf, \

	size_t count) \

{ \

	struct i2c_client *client = to_i2c_client(dev); \
@@ -427,36 +427,36 @@ show_and_set_in(9) 
show_and_set_in(10)



#define show_and_set_therm(offset) \

static ssize_t show_temp##offset##_input(struct device *dev, char *buf) \

static ssize_t show_temp##offset##_input(struct device *dev, struct device_attribute *attr, char *buf) \

{ \

	struct pc87360_data *data = pc87360_update_device(dev); \

	return sprintf(buf, "%u\n", IN_FROM_REG(data->in[offset+7], \

		       data->in_vref)); \

} \

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) \

{ \

	struct pc87360_data *data = pc87360_update_device(dev); \

	return sprintf(buf, "%u\n", IN_FROM_REG(data->in_min[offset+7], \

		       data->in_vref)); \

} \

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) \

{ \

	struct pc87360_data *data = pc87360_update_device(dev); \

	return sprintf(buf, "%u\n", IN_FROM_REG(data->in_max[offset+7], \

		       data->in_vref)); \

} \

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) \

{ \

	struct pc87360_data *data = pc87360_update_device(dev); \

	return sprintf(buf, "%u\n", IN_FROM_REG(data->in_crit[offset-4], \

		       data->in_vref)); \

} \

static ssize_t show_temp##offset##_status(struct device *dev, char *buf) \

static ssize_t show_temp##offset##_status(struct device *dev, struct device_attribute *attr, char *buf) \

{ \

	struct pc87360_data *data = pc87360_update_device(dev); \

	return sprintf(buf, "%u\n", data->in_status[offset+7]); \

} \

static ssize_t set_temp##offset##_min(struct device *dev, const char *buf, \

static ssize_t set_temp##offset##_min(struct device *dev, struct device_attribute *attr, const char *buf, \

	size_t count) \

{ \

	struct i2c_client *client = to_i2c_client(dev); \
@@ -470,7 +470,7 @@ static ssize_t set_temp##offset##_min(struct device *dev, const char *buf, \ 
	up(&data->update_lock); \

	return count; \

} \

static ssize_t set_temp##offset##_max(struct device *dev, const char *buf, \

static ssize_t set_temp##offset##_max(struct device *dev, struct device_attribute *attr, const char *buf, \

	size_t count) \

{ \

	struct i2c_client *client = to_i2c_client(dev); \
@@ -484,7 +484,7 @@ static ssize_t set_temp##offset##_max(struct device *dev, const char *buf, \ 
	up(&data->update_lock); \

	return count; \

} \

static ssize_t set_temp##offset##_crit(struct device *dev, const char *buf, \

static ssize_t set_temp##offset##_crit(struct device *dev, struct device_attribute *attr, const char *buf, \

	size_t count) \

{ \

	struct i2c_client *client = to_i2c_client(dev); \
@@ -512,19 +512,19 @@ show_and_set_therm(4) 
show_and_set_therm(5)

show_and_set_therm(6)



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 pc87360_data *data = pc87360_update_device(dev);

	return sprintf(buf, "%u\n", vid_from_reg(data->vid, data->vrm));

}

static DEVICE_ATTR(cpu0_vid, S_IRUGO, show_vid, NULL);



static ssize_t show_vrm(struct device *dev, char *buf)

static ssize_t show_vrm(struct device *dev, struct device_attribute *attr, char *buf)

{

	struct pc87360_data *data = pc87360_update_device(dev);

	return sprintf(buf, "%u\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 pc87360_data *data = i2c_get_clientdata(client);
@@ -533,7 +533,7 @@ static ssize_t set_vrm(struct device *dev, const char *buf, size_t count) 
}

static DEVICE_ATTR(vrm, S_IRUGO | S_IWUSR, show_vrm, set_vrm);



static ssize_t show_in_alarms(struct device *dev, char *buf)

static ssize_t show_in_alarms(struct device *dev, struct device_attribute *attr, char *buf)

{

	struct pc87360_data *data = pc87360_update_device(dev);

	return sprintf(buf, "%u\n", data->in_alarms);
@@ -541,32 +541,32 @@ static ssize_t show_in_alarms(struct device *dev, char *buf) 
static DEVICE_ATTR(alarms_in, S_IRUGO, show_in_alarms, NULL);



#define show_and_set_temp(offset) \

static ssize_t show_temp##offset##_input(struct device *dev, char *buf) \

static ssize_t show_temp##offset##_input(struct device *dev, struct device_attribute *attr, char *buf) \

{ \

	struct pc87360_data *data = pc87360_update_device(dev); \

	return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp[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) \

{ \

	struct pc87360_data *data = pc87360_update_device(dev); \

	return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_min[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) \

{ \

	struct pc87360_data *data = pc87360_update_device(dev); \

	return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_max[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) \

{ \

	struct pc87360_data *data = pc87360_update_device(dev); \

	return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_crit[offset-1])); \

}\

static ssize_t show_temp##offset##_status(struct device *dev, char *buf) \

static ssize_t show_temp##offset##_status(struct device *dev, struct device_attribute *attr, char *buf) \

{ \

	struct pc87360_data *data = pc87360_update_device(dev); \

	return sprintf(buf, "%d\n", data->temp_status[offset-1]); \

}\

static ssize_t set_temp##offset##_min(struct device *dev, const char *buf, \

static ssize_t set_temp##offset##_min(struct device *dev, struct device_attribute *attr, const char *buf, \

	size_t count) \

{ \

	struct i2c_client *client = to_i2c_client(dev); \
@@ -580,7 +580,7 @@ static ssize_t set_temp##offset##_min(struct device *dev, const char *buf, \ 
	up(&data->update_lock); \

	return count; \

} \

static ssize_t set_temp##offset##_max(struct device *dev, const char *buf, \

static ssize_t set_temp##offset##_max(struct device *dev, struct device_attribute *attr, const char *buf, \

	size_t count) \

{ \

	struct i2c_client *client = to_i2c_client(dev); \
@@ -594,7 +594,7 @@ static ssize_t set_temp##offset##_max(struct device *dev, const char *buf, \ 
	up(&data->update_lock); \

	return count; \

} \

static ssize_t set_temp##offset##_crit(struct device *dev, const char *buf, \

static ssize_t set_temp##offset##_crit(struct device *dev, struct device_attribute *attr, const char *buf, \

	size_t count) \

{ \

	struct i2c_client *client = to_i2c_client(dev); \
@@ -622,7 +622,7 @@ show_and_set_temp(1) 
show_and_set_temp(2)

show_and_set_temp(3)



static ssize_t show_temp_alarms(struct device *dev, char *buf)

static ssize_t show_temp_alarms(struct device *dev, struct device_attribute *attr, char *buf)

{

	struct pc87360_data *data = pc87360_update_device(dev);

	return sprintf(buf, "%u\n", data->temp_alarms);

drivers/i2c/chips/pcf8574.c

+3 −3
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ static struct i2c_driver pcf8574_driver = { 
};



/* following are the sysfs callback functions */

static ssize_t show_read(struct device *dev, char *buf)

static ssize_t show_read(struct device *dev, struct device_attribute *attr, char *buf)

{

	struct i2c_client *client = to_i2c_client(dev);

	struct pcf8574_data *data = i2c_get_clientdata(client);
@@ -86,13 +86,13 @@ static ssize_t show_read(struct device *dev, char *buf) 


static DEVICE_ATTR(read, S_IRUGO, show_read, NULL);



static ssize_t show_write(struct device *dev, char *buf)

static ssize_t show_write(struct device *dev, struct device_attribute *attr, char *buf)

{

	struct pcf8574_data *data = i2c_get_clientdata(to_i2c_client(dev));

	return sprintf(buf, "%u\n", data->write);

}



static ssize_t set_write(struct device *dev, const char *buf,

static ssize_t set_write(struct device *dev, struct device_attribute *attr, const char *buf,

			 size_t count)

{

	struct i2c_client *client = to_i2c_client(dev);

drivers/i2c/chips/pcf8591.c

+5 −5
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ static struct i2c_driver pcf8591_driver = { 


/* following are the sysfs callback functions */

#define show_in_channel(channel)					\

static ssize_t show_in##channel##_input(struct device *dev, char *buf)	\

static ssize_t show_in##channel##_input(struct device *dev, struct device_attribute *attr, char *buf)	\

{									\

	return sprintf(buf, "%d\n", pcf8591_read_channel(dev, channel));\

}									\
@@ -112,13 +112,13 @@ show_in_channel(1); 
show_in_channel(2);

show_in_channel(3);



static ssize_t show_out0_ouput(struct device *dev, char *buf)

static ssize_t show_out0_ouput(struct device *dev, struct device_attribute *attr, char *buf)

{

	struct pcf8591_data *data = i2c_get_clientdata(to_i2c_client(dev));

	return sprintf(buf, "%d\n", data->aout * 10);

}



static ssize_t set_out0_output(struct device *dev, const char *buf, size_t count)

static ssize_t set_out0_output(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)

{

	unsigned int value;

	struct i2c_client *client = to_i2c_client(dev);
@@ -134,13 +134,13 @@ static ssize_t set_out0_output(struct device *dev, const char *buf, size_t count 
static DEVICE_ATTR(out0_output, S_IWUSR | S_IRUGO, 

		   show_out0_ouput, set_out0_output);



static ssize_t show_out0_enable(struct device *dev, char *buf)

static ssize_t show_out0_enable(struct device *dev, struct device_attribute *attr, char *buf)

{

	struct pcf8591_data *data = i2c_get_clientdata(to_i2c_client(dev));

	return sprintf(buf, "%u\n", !(!(data->control & PCF8591_CONTROL_AOEF)));

}



static ssize_t set_out0_enable(struct device *dev, const char *buf, size_t count)

static ssize_t set_out0_enable(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)

{

	struct i2c_client *client = to_i2c_client(dev);

	struct pcf8591_data *data = i2c_get_clientdata(client);

drivers/i2c/chips/sis5595.c

+17 −17
Original line number Diff line number Diff line
@@ -256,28 +256,28 @@ 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)		\

	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)	\

	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)	\

	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,	\

static ssize_t 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,	\

static ssize_t 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);		\
@@ -294,19 +294,19 @@ show_in_offset(3); 
show_in_offset(4);



/* Temperature */

static ssize_t show_temp(struct device *dev, char *buf)

static ssize_t show_temp(struct device *dev, struct device_attribute *attr, char *buf)

{

	struct sis5595_data *data = sis5595_update_device(dev);

	return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp));

}



static ssize_t show_temp_over(struct device *dev, char *buf)

static ssize_t show_temp_over(struct device *dev, struct device_attribute *attr, char *buf)

{

	struct sis5595_data *data = sis5595_update_device(dev);

	return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_over));

}



static ssize_t set_temp_over(struct device *dev, const char *buf, size_t count)

static ssize_t set_temp_over(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)

{

	struct i2c_client *client = to_i2c_client(dev);

	struct sis5595_data *data = i2c_get_clientdata(client);
@@ -319,13 +319,13 @@ static ssize_t set_temp_over(struct device *dev, const char *buf, size_t count) 
	return count;

}



static ssize_t show_temp_hyst(struct device *dev, char *buf)

static ssize_t show_temp_hyst(struct device *dev, struct device_attribute *attr, char *buf)

{

	struct sis5595_data *data = sis5595_update_device(dev);

	return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_hyst));

}



static ssize_t set_temp_hyst(struct device *dev, const char *buf, size_t count)

static ssize_t set_temp_hyst(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)

{

	struct i2c_client *client = to_i2c_client(dev);

	struct sis5595_data *data = i2c_get_clientdata(client);
@@ -426,19 +426,19 @@ static ssize_t set_fan_div(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##_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 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 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)				\

{									\

	return set_fan_min(dev, buf, count, offset - 1);		\
@@ -450,13 +450,13 @@ static DEVICE_ATTR(fan##offset##_min, S_IRUGO | S_IWUSR, \ 
show_fan_offset(1);

show_fan_offset(2);



static ssize_t set_fan_1_div(struct device *dev, const char *buf,

static ssize_t set_fan_1_div(struct device *dev, struct device_attribute *attr, const char *buf,

		size_t count)

{

	return set_fan_div(dev, buf, count, 0) ;

}



static ssize_t set_fan_2_div(struct device *dev, const char *buf,

static ssize_t set_fan_2_div(struct device *dev, struct device_attribute *attr, const char *buf,

		size_t count)

{

	return set_fan_div(dev, buf, count, 1) ;
@@ -467,7 +467,7 @@ static DEVICE_ATTR(fan2_div, S_IRUGO | S_IWUSR, 
		show_fan_2_div, set_fan_2_div);



/* Alarms */

static ssize_t show_alarms(struct device *dev, char *buf)

static ssize_t show_alarms(struct device *dev, struct device_attribute *attr, char *buf)

{

	struct sis5595_data *data = sis5595_update_device(dev);

	return sprintf(buf, "%d\n", data->alarms);

drivers/i2c/chips/smsc47b397.c

+2 −2
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ static ssize_t show_temp(struct device *dev, char *buf, int nr) 
}



#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); \

} \
@@ -201,7 +201,7 @@ static ssize_t show_fan(struct device *dev, char *buf, int nr) 
}



#define sysfs_fan(num) \

static ssize_t show_fan##num(struct device *dev, char *buf) \

static ssize_t show_fan##num(struct device *dev, struct device_attribute *attr, char *buf) \

{ \

	return show_fan(dev, buf, num-1); \

} \