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

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

[PATCH] Driver Core: drivers/i2c/chips/w83781d.c -... 


[PATCH] Driver Core: drivers/i2c/chips/w83781d.c - drivers/s390/block/dcssblk.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 a5099cfc

drivers/i2c/chips/w83781d.c

+26 −26
Original line number Diff line number Diff line
@@ -309,18 +309,18 @@ store_in_reg(MAX, max); 


#define sysfs_in_offset(offset) \

static ssize_t \

show_regs_in_##offset (struct device *dev, char *buf) \

show_regs_in_##offset (struct device *dev, struct device_attribute *attr, char *buf) \

{ \

        return show_in(dev, buf, offset); \

} \

static DEVICE_ATTR(in##offset##_input, S_IRUGO, show_regs_in_##offset, NULL);



#define sysfs_in_reg_offset(reg, offset) \

static ssize_t show_regs_in_##reg##offset (struct device *dev, char *buf) \

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

{ \

	return show_in_##reg (dev, buf, offset); \

} \

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, struct device_attribute *attr, const char *buf, size_t count) \

{ \

	return store_in_##reg (dev, buf, count, offset); \

} \
@@ -378,18 +378,18 @@ store_fan_min(struct device *dev, const char *buf, size_t count, int nr) 
}



#define sysfs_fan_offset(offset) \

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

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

{ \

	return show_fan(dev, buf, offset); \

} \

static DEVICE_ATTR(fan##offset##_input, S_IRUGO, show_regs_fan_##offset, NULL);



#define sysfs_fan_min_offset(offset) \

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

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

{ \

	return show_fan_min(dev, buf, offset); \

} \

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, struct device_attribute *attr, const char *buf, size_t count) \

{ \

	return store_fan_min(dev, buf, count, offset); \

} \
@@ -452,18 +452,18 @@ store_temp_reg(HYST, max_hyst); 


#define sysfs_temp_offset(offset) \

static ssize_t \

show_regs_temp_##offset (struct device *dev, char *buf) \

show_regs_temp_##offset (struct device *dev, struct device_attribute *attr, char *buf) \

{ \

	return show_temp(dev, buf, offset); \

} \

static DEVICE_ATTR(temp##offset##_input, S_IRUGO, show_regs_temp_##offset, NULL);



#define sysfs_temp_reg_offset(reg, offset) \

static ssize_t show_regs_temp_##reg##offset (struct device *dev, char *buf) \

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

{ \

	return show_temp_##reg (dev, buf, offset); \

} \

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, struct device_attribute *attr, const char *buf, size_t count) \

{ \

	return store_temp_##reg (dev, buf, count, offset); \

} \
@@ -486,7 +486,7 @@ device_create_file(&client->dev, &dev_attr_temp##offset##_max_hyst); \ 
} while (0)



static ssize_t

show_vid_reg(struct device *dev, char *buf)

show_vid_reg(struct device *dev, struct device_attribute *attr, char *buf)

{

	struct w83781d_data *data = w83781d_update_device(dev);

	return sprintf(buf, "%ld\n", (long) vid_from_reg(data->vid, data->vrm));
@@ -497,14 +497,14 @@ DEVICE_ATTR(cpu0_vid, S_IRUGO, show_vid_reg, NULL); 
#define device_create_file_vid(client) \

device_create_file(&client->dev, &dev_attr_cpu0_vid);

static ssize_t

show_vrm_reg(struct device *dev, char *buf)

show_vrm_reg(struct device *dev, struct device_attribute *attr, char *buf)

{

	struct w83781d_data *data = w83781d_update_device(dev);

	return sprintf(buf, "%ld\n", (long) data->vrm);

}



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 w83781d_data *data = i2c_get_clientdata(client);
@@ -521,7 +521,7 @@ DEVICE_ATTR(vrm, S_IRUGO | S_IWUSR, show_vrm_reg, store_vrm_reg); 
#define device_create_file_vrm(client) \

device_create_file(&client->dev, &dev_attr_vrm);

static ssize_t

show_alarms_reg(struct device *dev, char *buf)

show_alarms_reg(struct device *dev, struct device_attribute *attr, char *buf)

{

	struct w83781d_data *data = w83781d_update_device(dev);

	return sprintf(buf, "%ld\n", (long) ALARMS_FROM_REG(data->alarms));
@@ -531,13 +531,13 @@ static 
DEVICE_ATTR(alarms, S_IRUGO, show_alarms_reg, NULL);

#define device_create_file_alarms(client) \

device_create_file(&client->dev, &dev_attr_alarms);

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

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

{

	struct w83781d_data *data = w83781d_update_device(dev);

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

		       (long)BEEP_MASK_FROM_REG(data->beep_mask, data->type));

}

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

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

{

	struct w83781d_data *data = w83781d_update_device(dev);

	return sprintf(buf, "%ld\n",
@@ -583,11 +583,11 @@ store_beep_reg(struct device *dev, const char *buf, size_t count, 
}



#define sysfs_beep(REG, reg) \

static ssize_t show_regs_beep_##reg (struct device *dev, char *buf) \

static ssize_t show_regs_beep_##reg (struct device *dev, struct device_attribute *attr, char *buf) \

{ \

	return show_beep_##reg(dev, buf); \

	return show_beep_##reg(dev, attr, buf); \

} \

static ssize_t store_regs_beep_##reg (struct device *dev, const char *buf, size_t count) \

static ssize_t store_regs_beep_##reg (struct device *dev, struct device_attribute *attr, const char *buf, size_t count) \

{ \

	return store_beep_reg(dev, buf, count, BEEP_##REG); \

} \
@@ -653,11 +653,11 @@ store_fan_div_reg(struct device *dev, const char *buf, size_t count, int nr) 
}



#define sysfs_fan_div(offset) \

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

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

{ \

	return show_fan_div_reg(dev, buf, offset); \

} \

static ssize_t store_regs_fan_div_##offset (struct device *dev, const char *buf, size_t count) \

static ssize_t store_regs_fan_div_##offset (struct device *dev, struct device_attribute *attr, const char *buf, size_t count) \

{ \

	return store_fan_div_reg(dev, buf, count, offset - 1); \

} \
@@ -737,11 +737,11 @@ store_pwmenable_reg(struct device *dev, const char *buf, size_t count, int nr) 
}



#define sysfs_pwm(offset) \

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

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

{ \

	return show_pwm_reg(dev, buf, offset); \

} \

static ssize_t store_regs_pwm_##offset (struct device *dev, \

static ssize_t store_regs_pwm_##offset (struct device *dev, struct device_attribute *attr, \

		const char *buf, size_t count) \

{ \

	return store_pwm_reg(dev, buf, count, offset); \
@@ -750,11 +750,11 @@ static DEVICE_ATTR(pwm##offset, S_IRUGO | S_IWUSR, \ 
		show_regs_pwm_##offset, store_regs_pwm_##offset);



#define sysfs_pwmenable(offset) \

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

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

{ \

	return show_pwmenable_reg(dev, buf, offset); \

} \

static ssize_t store_regs_pwmenable_##offset (struct device *dev, \

static ssize_t store_regs_pwmenable_##offset (struct device *dev, struct device_attribute *attr, \

		const char *buf, size_t count) \

{ \

	return store_pwmenable_reg(dev, buf, count, offset); \
@@ -832,11 +832,11 @@ store_sensor_reg(struct device *dev, const char *buf, size_t count, int nr) 
}



#define sysfs_sensor(offset) \

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

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

{ \

    return show_sensor_reg(dev, buf, offset); \

} \

static ssize_t store_regs_sensor_##offset (struct device *dev, const char *buf, size_t count) \

static ssize_t store_regs_sensor_##offset (struct device *dev, struct device_attribute *attr, const char *buf, size_t count) \

{ \

    return store_sensor_reg(dev, buf, count, offset); \

} \

drivers/i2c/chips/w83l785ts.c

+2 −2
Original line number Diff line number Diff line
@@ -118,13 +118,13 @@ struct w83l785ts_data { 
 * Sysfs stuff

 */



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 w83l785ts_data *data = w83l785ts_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 w83l785ts_data *data = w83l785ts_update_device(dev);

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

drivers/i2c/i2c-core.c

+2 −2
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ static struct class i2c_adapter_class = { 
	.release =	&i2c_adapter_class_dev_release,

};



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

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

{

	struct i2c_adapter *adap = dev_to_i2c_adapter(dev);

	return sprintf(buf, "%s\n", adap->name);
@@ -117,7 +117,7 @@ static void i2c_client_release(struct device *dev) 
	complete(&client->released);

}



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

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

{

	struct i2c_client *client = to_i2c_client(dev);

	return sprintf(buf, "%s\n", client->name);

drivers/ieee1394/nodemgr.c

+8 −8
Original line number Diff line number Diff line
@@ -220,7 +220,7 @@ struct device nodemgr_dev_template_host = { 




#define fw_attr(class, class_type, field, type, format_string)		\

static ssize_t fw_show_##class##_##field (struct device *dev, char *buf)\

static ssize_t fw_show_##class##_##field (struct device *dev, struct device_attribute *attr, char *buf)\

{									\

	class_type *class;						\

	class = container_of(dev, class_type, device);			\
@@ -232,7 +232,7 @@ static struct device_attribute dev_attr_##class##_##field = { \ 
};



#define fw_attr_td(class, class_type, td_kv)				\

static ssize_t fw_show_##class##_##td_kv (struct device *dev, char *buf)\

static ssize_t fw_show_##class##_##td_kv (struct device *dev, struct device_attribute *attr, char *buf)\

{									\

	int len;							\

	class_type *class = container_of(dev, class_type, device);	\
@@ -265,7 +265,7 @@ static struct driver_attribute driver_attr_drv_##field = { \ 
};





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

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

{

	struct node_entry *ne = container_of(dev, struct node_entry, device);
@@ -281,7 +281,7 @@ static ssize_t fw_show_ne_bus_options(struct device *dev, char *buf) 
static DEVICE_ATTR(bus_options,S_IRUGO,fw_show_ne_bus_options,NULL);





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

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

{

	struct node_entry *ne = container_of(dev, struct node_entry, device);

	return sprintf(buf, "%d\n", atomic_read(&ne->tpool->count.count) + 1);
@@ -289,7 +289,7 @@ static ssize_t fw_show_ne_tlabels_free(struct device *dev, char *buf) 
static DEVICE_ATTR(tlabels_free,S_IRUGO,fw_show_ne_tlabels_free,NULL);





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

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

{

	struct node_entry *ne = container_of(dev, struct node_entry, device);

	return sprintf(buf, "%u\n", ne->tpool->allocations);
@@ -297,7 +297,7 @@ static ssize_t fw_show_ne_tlabels_allocations(struct device *dev, char *buf) 
static DEVICE_ATTR(tlabels_allocations,S_IRUGO,fw_show_ne_tlabels_allocations,NULL);





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

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

{

	struct node_entry *ne = container_of(dev, struct node_entry, device);

#if (BITS_PER_LONG <= 32)
@@ -309,7 +309,7 @@ static ssize_t fw_show_ne_tlabels_mask(struct device *dev, char *buf) 
static DEVICE_ATTR(tlabels_mask, S_IRUGO, fw_show_ne_tlabels_mask, NULL);





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

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

{

	struct unit_directory *ud = container_of(dev, struct unit_directory, device);

	int state = simple_strtoul(buf, NULL, 10);
@@ -324,7 +324,7 @@ static ssize_t fw_set_ignore_driver(struct device *dev, const char *buf, size_t 


	return count;

}

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

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

{

	struct unit_directory *ud = container_of(dev, struct unit_directory, device);

drivers/ieee1394/sbp2.c

+1 −1
Original line number Diff line number Diff line
@@ -2648,7 +2648,7 @@ static const char *sbp2scsi_info (struct Scsi_Host *host) 
        return "SCSI emulation for IEEE-1394 SBP-2 Devices";

}



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

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

{

	struct scsi_device *sdev;

	struct scsi_id_instance_data *scsi_id;