Skip to content

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

[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
Hide whitespace changes
Inline Side-by-side
Showing with 100 additions and 99 deletions
drivers/i2c/chips/w83781d.c
View file @ e404e274
...@@ -309,18 +309,18 @@ store_in_reg(MAX, max); ...@@ -309,18 +309,18 @@ store_in_reg(MAX, max);
#define sysfs_in_offset(offset) \ #define sysfs_in_offset(offset) \
static ssize_t \ 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); \ 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, struct device_attribute *attr, char *buf) \
{ \ { \
return show_in_##reg (dev, buf, 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, struct device_attribute *attr, const char *buf, size_t count) \
{ \ { \
return store_in_##reg (dev, buf, count, offset); \ 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) ...@@ -378,18 +378,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, struct device_attribute *attr, char *buf) \
{ \ { \
return show_fan(dev, buf, 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, struct device_attribute *attr, char *buf) \
{ \ { \
return show_fan_min(dev, buf, 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, struct device_attribute *attr, const char *buf, size_t count) \
{ \ { \
return store_fan_min(dev, buf, count, offset); \ return store_fan_min(dev, buf, count, offset); \
} \ } \
...@@ -452,18 +452,18 @@ store_temp_reg(HYST, max_hyst); ...@@ -452,18 +452,18 @@ store_temp_reg(HYST, max_hyst);
#define sysfs_temp_offset(offset) \ #define sysfs_temp_offset(offset) \
static ssize_t \ 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); \ 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, struct device_attribute *attr, char *buf) \
{ \ { \
return show_temp_##reg (dev, buf, 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, struct device_attribute *attr, const char *buf, size_t count) \
{ \ { \
return store_temp_##reg (dev, buf, count, offset); \ return store_temp_##reg (dev, buf, count, offset); \
} \ } \
...@@ -486,7 +486,7 @@ device_create_file(&client->dev, &dev_attr_temp##offset##_max_hyst); \ ...@@ -486,7 +486,7 @@ device_create_file(&client->dev, &dev_attr_temp##offset##_max_hyst); \
} while (0) } while (0)
static ssize_t static ssize_t
show_vid_reg(struct device *dev, char *buf) show_vid_reg(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct w83781d_data *data = w83781d_update_device(dev); struct w83781d_data *data = w83781d_update_device(dev);
return sprintf(buf, "%ld\n", (long) vid_from_reg(data->vid, data->vrm)); return sprintf(buf, "%ld\n", (long) vid_from_reg(data->vid, data->vrm));
...@@ -497,14 +497,14 @@ DEVICE_ATTR(cpu0_vid, S_IRUGO, show_vid_reg, NULL); ...@@ -497,14 +497,14 @@ DEVICE_ATTR(cpu0_vid, S_IRUGO, show_vid_reg, NULL);
#define device_create_file_vid(client) \ #define device_create_file_vid(client) \
device_create_file(&client->dev, &dev_attr_cpu0_vid); device_create_file(&client->dev, &dev_attr_cpu0_vid);
static ssize_t static ssize_t
show_vrm_reg(struct device *dev, char *buf) show_vrm_reg(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct w83781d_data *data = w83781d_update_device(dev); struct w83781d_data *data = w83781d_update_device(dev);
return sprintf(buf, "%ld\n", (long) data->vrm); return sprintf(buf, "%ld\n", (long) data->vrm);
} }
static ssize_t static ssize_t
store_vrm_reg(struct device *dev, const char *buf, size_t count) store_vrm_reg(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
{ {
struct i2c_client *client = to_i2c_client(dev); struct i2c_client *client = to_i2c_client(dev);
struct w83781d_data *data = i2c_get_clientdata(client); 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); ...@@ -521,7 +521,7 @@ DEVICE_ATTR(vrm, S_IRUGO | S_IWUSR, show_vrm_reg, store_vrm_reg);
#define device_create_file_vrm(client) \ #define device_create_file_vrm(client) \
device_create_file(&client->dev, &dev_attr_vrm); device_create_file(&client->dev, &dev_attr_vrm);
static ssize_t 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); struct w83781d_data *data = w83781d_update_device(dev);
return sprintf(buf, "%ld\n", (long) ALARMS_FROM_REG(data->alarms)); return sprintf(buf, "%ld\n", (long) ALARMS_FROM_REG(data->alarms));
...@@ -531,13 +531,13 @@ static ...@@ -531,13 +531,13 @@ static
DEVICE_ATTR(alarms, S_IRUGO, show_alarms_reg, NULL); DEVICE_ATTR(alarms, S_IRUGO, show_alarms_reg, NULL);
#define device_create_file_alarms(client) \ #define device_create_file_alarms(client) \
device_create_file(&client->dev, &dev_attr_alarms); 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); struct w83781d_data *data = w83781d_update_device(dev);
return sprintf(buf, "%ld\n", return sprintf(buf, "%ld\n",
(long)BEEP_MASK_FROM_REG(data->beep_mask, data->type)); (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); struct w83781d_data *data = w83781d_update_device(dev);
return sprintf(buf, "%ld\n", return sprintf(buf, "%ld\n",
...@@ -583,11 +583,11 @@ store_beep_reg(struct device *dev, const char *buf, size_t count, ...@@ -583,11 +583,11 @@ store_beep_reg(struct device *dev, const char *buf, size_t count,
} }
#define sysfs_beep(REG, reg) \ #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); \ 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) ...@@ -653,11 +653,11 @@ store_fan_div_reg(struct device *dev, const char *buf, size_t count, int nr)
} }
#define sysfs_fan_div(offset) \ #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); \ 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); \ 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) ...@@ -737,11 +737,11 @@ store_pwmenable_reg(struct device *dev, const char *buf, size_t count, int nr)
} }
#define sysfs_pwm(offset) \ #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); \ 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) \ const char *buf, size_t count) \
{ \ { \
return store_pwm_reg(dev, buf, count, offset); \ return store_pwm_reg(dev, buf, count, offset); \
...@@ -750,11 +750,11 @@ static DEVICE_ATTR(pwm##offset, S_IRUGO | S_IWUSR, \ ...@@ -750,11 +750,11 @@ static DEVICE_ATTR(pwm##offset, S_IRUGO | S_IWUSR, \
show_regs_pwm_##offset, store_regs_pwm_##offset); show_regs_pwm_##offset, store_regs_pwm_##offset);
#define sysfs_pwmenable(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); \ 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) \ const char *buf, size_t count) \
{ \ { \
return store_pwmenable_reg(dev, buf, count, offset); \ 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) ...@@ -832,11 +832,11 @@ store_sensor_reg(struct device *dev, const char *buf, size_t count, int nr)
} }
#define sysfs_sensor(offset) \ #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); \ 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); \ return store_sensor_reg(dev, buf, count, offset); \
} \ } \
......
drivers/i2c/chips/w83l785ts.c
View file @ e404e274
...@@ -118,13 +118,13 @@ struct w83l785ts_data { ...@@ -118,13 +118,13 @@ struct w83l785ts_data {
* Sysfs stuff * 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); struct w83l785ts_data *data = w83l785ts_update_device(dev);
return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp)); 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); struct w83l785ts_data *data = w83l785ts_update_device(dev);
return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_over)); return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_over));
......
drivers/i2c/i2c-core.c
View file @ e404e274
...@@ -103,7 +103,7 @@ static struct class i2c_adapter_class = { ...@@ -103,7 +103,7 @@ static struct class i2c_adapter_class = {
.release = &i2c_adapter_class_dev_release, .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); struct i2c_adapter *adap = dev_to_i2c_adapter(dev);
return sprintf(buf, "%s\n", adap->name); return sprintf(buf, "%s\n", adap->name);
...@@ -117,7 +117,7 @@ static void i2c_client_release(struct device *dev) ...@@ -117,7 +117,7 @@ static void i2c_client_release(struct device *dev)
complete(&client->released); 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); struct i2c_client *client = to_i2c_client(dev);
return sprintf(buf, "%s\n", client->name); return sprintf(buf, "%s\n", client->name);
......
drivers/ieee1394/nodemgr.c
View file @ e404e274
...@@ -220,7 +220,7 @@ struct device nodemgr_dev_template_host = { ...@@ -220,7 +220,7 @@ struct device nodemgr_dev_template_host = {
#define fw_attr(class, class_type, field, type, format_string) \ #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_type *class; \
class = container_of(dev, class_type, device); \ class = container_of(dev, class_type, device); \
...@@ -232,7 +232,7 @@ static struct device_attribute dev_attr_##class##_##field = { \ ...@@ -232,7 +232,7 @@ static struct device_attribute dev_attr_##class##_##field = { \
}; };
#define fw_attr_td(class, class_type, td_kv) \ #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; \ int len; \
class_type *class = container_of(dev, class_type, device); \ class_type *class = container_of(dev, class_type, device); \
...@@ -265,7 +265,7 @@ static struct driver_attribute driver_attr_drv_##field = { \ ...@@ -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); 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) ...@@ -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 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); struct node_entry *ne = container_of(dev, struct node_entry, device);
return sprintf(buf, "%d\n", atomic_read(&ne->tpool->count.count) + 1); 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) ...@@ -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 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); struct node_entry *ne = container_of(dev, struct node_entry, device);
return sprintf(buf, "%u\n", ne->tpool->allocations); 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) ...@@ -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 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); struct node_entry *ne = container_of(dev, struct node_entry, device);
#if (BITS_PER_LONG <= 32) #if (BITS_PER_LONG <= 32)
...@@ -309,7 +309,7 @@ static ssize_t fw_show_ne_tlabels_mask(struct device *dev, char *buf) ...@@ -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 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); struct unit_directory *ud = container_of(dev, struct unit_directory, device);
int state = simple_strtoul(buf, NULL, 10); 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 ...@@ -324,7 +324,7 @@ static ssize_t fw_set_ignore_driver(struct device *dev, const char *buf, size_t
return count; 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); struct unit_directory *ud = container_of(dev, struct unit_directory, device);
......
drivers/ieee1394/sbp2.c
View file @ e404e274
...@@ -2648,7 +2648,7 @@ static const char *sbp2scsi_info (struct Scsi_Host *host) ...@@ -2648,7 +2648,7 @@ static const char *sbp2scsi_info (struct Scsi_Host *host)
return "SCSI emulation for IEEE-1394 SBP-2 Devices"; 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_device *sdev;
struct scsi_id_instance_data *scsi_id; struct scsi_id_instance_data *scsi_id;
......
drivers/input/gameport/gameport.c
View file @ e404e274
...@@ -453,13 +453,13 @@ static int gameport_thread(void *nothing) ...@@ -453,13 +453,13 @@ static int gameport_thread(void *nothing)
* Gameport port operations * Gameport port operations
*/ */
static ssize_t gameport_show_description(struct device *dev, char *buf) static ssize_t gameport_show_description(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct gameport *gameport = to_gameport_port(dev); struct gameport *gameport = to_gameport_port(dev);
return sprintf(buf, "%s\n", gameport->name); return sprintf(buf, "%s\n", gameport->name);
} }
static ssize_t gameport_rebind_driver(struct device *dev, const char *buf, size_t count) static ssize_t gameport_rebind_driver(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
{ {
struct gameport *gameport = to_gameport_port(dev); struct gameport *gameport = to_gameport_port(dev);
struct device_driver *drv; struct device_driver *drv;
......
drivers/input/keyboard/atkbd.c
View file @ e404e274
...@@ -219,11 +219,11 @@ static ssize_t atkbd_attr_set_helper(struct device *dev, const char *buf, size_t ...@@ -219,11 +219,11 @@ static ssize_t atkbd_attr_set_helper(struct device *dev, const char *buf, size_t
#define ATKBD_DEFINE_ATTR(_name) \ #define ATKBD_DEFINE_ATTR(_name) \
static ssize_t atkbd_show_##_name(struct atkbd *, char *); \ static ssize_t atkbd_show_##_name(struct atkbd *, char *); \
static ssize_t atkbd_set_##_name(struct atkbd *, const char *, size_t); \ static ssize_t atkbd_set_##_name(struct atkbd *, const char *, size_t); \
static ssize_t atkbd_do_show_##_name(struct device *d, char *b) \ static ssize_t atkbd_do_show_##_name(struct device *d, struct device_attribute *attr, char *b) \
{ \ { \
return atkbd_attr_show_helper(d, b, atkbd_show_##_name); \ return atkbd_attr_show_helper(d, b, atkbd_show_##_name); \
} \ } \
static ssize_t atkbd_do_set_##_name(struct device *d, const char *b, size_t s) \ static ssize_t atkbd_do_set_##_name(struct device *d, struct device_attribute *attr, const char *b, size_t s) \
{ \ { \
return atkbd_attr_set_helper(d, b, s, atkbd_set_##_name); \ return atkbd_attr_set_helper(d, b, s, atkbd_set_##_name); \
} \ } \
......
drivers/input/mouse/psmouse.h
View file @ e404e274
...@@ -91,11 +91,11 @@ ssize_t psmouse_attr_set_helper(struct device *dev, const char *buf, size_t coun ...@@ -91,11 +91,11 @@ ssize_t psmouse_attr_set_helper(struct device *dev, const char *buf, size_t coun
#define PSMOUSE_DEFINE_ATTR(_name) \ #define PSMOUSE_DEFINE_ATTR(_name) \
static ssize_t psmouse_attr_show_##_name(struct psmouse *, char *); \ static ssize_t psmouse_attr_show_##_name(struct psmouse *, char *); \
static ssize_t psmouse_attr_set_##_name(struct psmouse *, const char *, size_t);\ static ssize_t psmouse_attr_set_##_name(struct psmouse *, const char *, size_t);\
static ssize_t psmouse_do_show_##_name(struct device *d, char *b) \ static ssize_t psmouse_do_show_##_name(struct device *d, struct device_attribute *attr, char *b) \
{ \ { \
return psmouse_attr_show_helper(d, b, psmouse_attr_show_##_name); \ return psmouse_attr_show_helper(d, b, psmouse_attr_show_##_name); \
} \ } \
static ssize_t psmouse_do_set_##_name(struct device *d, const char *b, size_t s)\ static ssize_t psmouse_do_set_##_name(struct device *d, struct device_attribute *attr, const char *b, size_t s)\
{ \ { \
return psmouse_attr_set_helper(d, b, s, psmouse_attr_set_##_name); \ return psmouse_attr_set_helper(d, b, s, psmouse_attr_set_##_name); \
} \ } \
......
drivers/input/serio/serio.c
View file @ e404e274
...@@ -358,31 +358,31 @@ static int serio_thread(void *nothing) ...@@ -358,31 +358,31 @@ static int serio_thread(void *nothing)
* Serio port operations * Serio port operations
*/ */
static ssize_t serio_show_description(struct device *dev, char *buf) static ssize_t serio_show_description(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct serio *serio = to_serio_port(dev); struct serio *serio = to_serio_port(dev);
return sprintf(buf, "%s\n", serio->name); return sprintf(buf, "%s\n", serio->name);
} }
static ssize_t serio_show_id_type(struct device *dev, char *buf) static ssize_t serio_show_id_type(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct serio *serio = to_serio_port(dev); struct serio *serio = to_serio_port(dev);
return sprintf(buf, "%02x\n", serio->id.type); return sprintf(buf, "%02x\n", serio->id.type);
} }
static ssize_t serio_show_id_proto(struct device *dev, char *buf) static ssize_t serio_show_id_proto(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct serio *serio = to_serio_port(dev); struct serio *serio = to_serio_port(dev);
return sprintf(buf, "%02x\n", serio->id.proto); return sprintf(buf, "%02x\n", serio->id.proto);
} }
static ssize_t serio_show_id_id(struct device *dev, char *buf) static ssize_t serio_show_id_id(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct serio *serio = to_serio_port(dev); struct serio *serio = to_serio_port(dev);
return sprintf(buf, "%02x\n", serio->id.id); return sprintf(buf, "%02x\n", serio->id.id);
} }
static ssize_t serio_show_id_extra(struct device *dev, char *buf) static ssize_t serio_show_id_extra(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct serio *serio = to_serio_port(dev); struct serio *serio = to_serio_port(dev);
return sprintf(buf, "%02x\n", serio->id.extra); return sprintf(buf, "%02x\n", serio->id.extra);
...@@ -406,7 +406,7 @@ static struct attribute_group serio_id_attr_group = { ...@@ -406,7 +406,7 @@ static struct attribute_group serio_id_attr_group = {
.attrs = serio_device_id_attrs, .attrs = serio_device_id_attrs,
}; };
static ssize_t serio_rebind_driver(struct device *dev, const char *buf, size_t count) static ssize_t serio_rebind_driver(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
{ {
struct serio *serio = to_serio_port(dev); struct serio *serio = to_serio_port(dev);
struct device_driver *drv; struct device_driver *drv;
...@@ -437,13 +437,13 @@ static ssize_t serio_rebind_driver(struct device *dev, const char *buf, size_t c ...@@ -437,13 +437,13 @@ static ssize_t serio_rebind_driver(struct device *dev, const char *buf, size_t c
return retval; return retval;
} }
static ssize_t serio_show_bind_mode(struct device *dev, char *buf) static ssize_t serio_show_bind_mode(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct serio *serio = to_serio_port(dev); struct serio *serio = to_serio_port(dev);
return sprintf(buf, "%s\n", serio->manual_bind ? "manual" : "auto"); return sprintf(buf, "%s\n", serio->manual_bind ? "manual" : "auto");
} }
static ssize_t serio_set_bind_mode(struct device *dev, const char *buf, size_t count) static ssize_t serio_set_bind_mode(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
{ {
struct serio *serio = to_serio_port(dev); struct serio *serio = to_serio_port(dev);
int retval; int retval;
......
drivers/macintosh/therm_adt746x.c
View file @ e404e274
...@@ -455,21 +455,22 @@ static int attach_one_thermostat(struct i2c_adapter *adapter, int addr, ...@@ -455,21 +455,22 @@ static int attach_one_thermostat(struct i2c_adapter *adapter, int addr,
* pass around to the attribute functions, so we don't really have * pass around to the attribute functions, so we don't really have
* choice but implement a bunch of them... * choice but implement a bunch of them...
* *
* FIXME, it does now...
*/ */
#define BUILD_SHOW_FUNC_INT(name, data) \ #define BUILD_SHOW_FUNC_INT(name, data) \
static ssize_t show_##name(struct device *dev, char *buf) \ static ssize_t show_##name(struct device *dev, struct device_attribute *attr, char *buf) \
{ \ { \
return sprintf(buf, "%d\n", data); \ return sprintf(buf, "%d\n", data); \
} }
#define BUILD_SHOW_FUNC_STR(name, data) \ #define BUILD_SHOW_FUNC_STR(name, data) \
static ssize_t show_##name(struct device *dev, char *buf) \ static ssize_t show_##name(struct device *dev, struct device_attribute *attr, char *buf) \
{ \ { \
return sprintf(buf, "%s\n", data); \ return sprintf(buf, "%s\n", data); \
} }
#define BUILD_SHOW_FUNC_FAN(name, data) \ #define BUILD_SHOW_FUNC_FAN(name, data) \
static ssize_t show_##name(struct device *dev, char *buf) \ static ssize_t show_##name(struct device *dev, struct device_attribute *attr, char *buf) \
{ \ { \
return sprintf(buf, "%d (%d rpm)\n", \ return sprintf(buf, "%d (%d rpm)\n", \
thermostat->last_speed[data], \ thermostat->last_speed[data], \
...@@ -478,7 +479,7 @@ static ssize_t show_##name(struct device *dev, char *buf) \ ...@@ -478,7 +479,7 @@ static ssize_t show_##name(struct device *dev, char *buf) \
} }
#define BUILD_STORE_FUNC_DEG(name, data) \ #define BUILD_STORE_FUNC_DEG(name, data) \
static ssize_t store_##name(struct device *dev, const char *buf, size_t n) \ static ssize_t store_##name(struct device *dev, struct device_attribute *attr, const char *buf, size_t n) \
{ \ { \
int val; \ int val; \
int i; \ int i; \
...@@ -491,7 +492,7 @@ static ssize_t store_##name(struct device *dev, const char *buf, size_t n) \ ...@@ -491,7 +492,7 @@ static ssize_t store_##name(struct device *dev, const char *buf, size_t n) \
} }
#define BUILD_STORE_FUNC_INT(name, data) \ #define BUILD_STORE_FUNC_INT(name, data) \
static ssize_t store_##name(struct device *dev, const char *buf, size_t n) \ static ssize_t store_##name(struct device *dev, struct device_attribute *attr, const char *buf, size_t n) \
{ \ { \
u32 val; \ u32 val; \
val = simple_strtoul(buf, NULL, 10); \ val = simple_strtoul(buf, NULL, 10); \
......
drivers/macintosh/therm_pm72.c
View file @ e404e274
...@@ -685,7 +685,7 @@ static void fetch_cpu_pumps_minmax(void) ...@@ -685,7 +685,7 @@ static void fetch_cpu_pumps_minmax(void)
* the input twice... I accept patches :) * the input twice... I accept patches :)
*/ */
#define BUILD_SHOW_FUNC_FIX(name, data) \ #define BUILD_SHOW_FUNC_FIX(name, data) \
static ssize_t show_##name(struct device *dev, char *buf) \ static ssize_t show_##name(struct device *dev, struct device_attribute *attr, char *buf) \
{ \ { \
ssize_t r; \ ssize_t r; \
down(&driver_lock); \ down(&driver_lock); \
...@@ -694,7 +694,7 @@ static ssize_t show_##name(struct device *dev, char *buf) \ ...@@ -694,7 +694,7 @@ static ssize_t show_##name(struct device *dev, char *buf) \
return r; \ return r; \
} }
#define BUILD_SHOW_FUNC_INT(name, data) \ #define BUILD_SHOW_FUNC_INT(name, data) \
static ssize_t show_##name(struct device *dev, char *buf) \ static ssize_t show_##name(struct device *dev, struct device_attribute *attr, char *buf) \
{ \ { \
return sprintf(buf, "%d", data); \ return sprintf(buf, "%d", data); \
} }
......
drivers/macintosh/therm_windtunnel.c
View file @ e404e274
...@@ -107,13 +107,13 @@ print_temp( const char *s, int temp ) ...@@ -107,13 +107,13 @@ print_temp( const char *s, int temp )
} }
static ssize_t static ssize_t
show_cpu_temperature( struct device *dev, char *buf ) show_cpu_temperature( struct device *dev, struct device_attribute *attr, char *buf )
{ {
return sprintf(buf, "%d.%d\n", x.temp>>8, (x.temp & 255)*10/256 ); return sprintf(buf, "%d.%d\n", x.temp>>8, (x.temp & 255)*10/256 );
} }
static ssize_t static ssize_t
show_case_temperature( struct device *dev, char *buf ) show_case_temperature( struct device *dev, struct device_attribute *attr, char *buf )
{ {
return sprintf(buf, "%d.%d\n", x.casetemp>>8, (x.casetemp & 255)*10/256 ); return sprintf(buf, "%d.%d\n", x.casetemp>>8, (x.casetemp & 255)*10/256 );
} }
......
drivers/mca/mca-bus.c
View file @ e404e274
...@@ -69,7 +69,7 @@ struct bus_type mca_bus_type = { ...@@ -69,7 +69,7 @@ struct bus_type mca_bus_type = {
}; };
EXPORT_SYMBOL (mca_bus_type); EXPORT_SYMBOL (mca_bus_type);
static ssize_t mca_show_pos_id(struct device *dev, char *buf) static ssize_t mca_show_pos_id(struct device *dev, struct device_attribute *attr, char *buf)
{ {
/* four digits, \n and trailing \0 */ /* four digits, \n and trailing \0 */
struct mca_device *mca_dev = to_mca_device(dev); struct mca_device *mca_dev = to_mca_device(dev);
...@@ -81,7 +81,7 @@ static ssize_t mca_show_pos_id(struct device *dev, char *buf) ...@@ -81,7 +81,7 @@ static ssize_t mca_show_pos_id(struct device *dev, char *buf)
len = sprintf(buf, "none\n"); len = sprintf(buf, "none\n");
return len; return len;
} }
static ssize_t mca_show_pos(struct device *dev, char *buf) static ssize_t mca_show_pos(struct device *dev, struct device_attribute *attr, char *buf)
{ {
/* enough for 8 two byte hex chars plus space and new line */ /* enough for 8 two byte hex chars plus space and new line */
int j, len=0; int j, len=0;
......
drivers/message/fusion/mptscsih.c
View file @ e404e274
...@@ -2338,7 +2338,7 @@ mptscsih_slave_configure(struct scsi_device *device) ...@@ -2338,7 +2338,7 @@ mptscsih_slave_configure(struct scsi_device *device)
} }
ssize_t ssize_t
mptscsih_store_queue_depth(struct device *dev, const char *buf, size_t count) mptscsih_store_queue_depth(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
{ {
int depth; int depth;
struct scsi_device *sdev = to_scsi_device(dev); struct scsi_device *sdev = to_scsi_device(dev);
......
drivers/message/fusion/mptscsih.h
View file @ e404e274
...@@ -103,5 +103,5 @@ extern int mptscsih_taskmgmt_complete(MPT_ADAPTER *ioc, MPT_FRAME_HDR *mf, MPT_F ...@@ -103,5 +103,5 @@ extern int mptscsih_taskmgmt_complete(MPT_ADAPTER *ioc, MPT_FRAME_HDR *mf, MPT_F
extern int mptscsih_scandv_complete(MPT_ADAPTER *ioc, MPT_FRAME_HDR *mf, MPT_FRAME_HDR *r); extern int mptscsih_scandv_complete(MPT_ADAPTER *ioc, MPT_FRAME_HDR *mf, MPT_FRAME_HDR *r);
extern int mptscsih_event_process(MPT_ADAPTER *ioc, EventNotificationReply_t *pEvReply); extern int mptscsih_event_process(MPT_ADAPTER *ioc, EventNotificationReply_t *pEvReply);
extern int mptscsih_ioc_reset(MPT_ADAPTER *ioc, int post_reset); extern int mptscsih_ioc_reset(MPT_ADAPTER *ioc, int post_reset);
extern ssize_t mptscsih_store_queue_depth(struct device *dev, const char *buf, size_t count); extern ssize_t mptscsih_store_queue_depth(struct device *dev, struct device_attribute *attr, const char *buf, size_t count);
extern void mptscsih_timer_expired(unsigned long data); extern void mptscsih_timer_expired(unsigned long data);
drivers/mmc/mmc_sysfs.c
View file @ e404e274
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
#define to_mmc_driver(d) container_of(d, struct mmc_driver, drv) #define to_mmc_driver(d) container_of(d, struct mmc_driver, drv)
#define MMC_ATTR(name, fmt, args...) \ #define MMC_ATTR(name, fmt, args...) \
static ssize_t mmc_##name##_show (struct device *dev, char *buf) \ static ssize_t mmc_##name##_show (struct device *dev, struct device_attribute *attr, char *buf) \
{ \ { \
struct mmc_card *card = dev_to_mmc_card(dev); \ struct mmc_card *card = dev_to_mmc_card(dev); \
return sprintf(buf, fmt, args); \ return sprintf(buf, fmt, args); \
......
drivers/pci/hotplug/cpqphp_sysfs.c
View file @ e404e274
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
/* A few routines that create sysfs entries for the hot plug controller */ /* A few routines that create sysfs entries for the hot plug controller */
static ssize_t show_ctrl (struct device *dev, char *buf) static ssize_t show_ctrl (struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct pci_dev *pci_dev; struct pci_dev *pci_dev;
struct controller *ctrl; struct controller *ctrl;
...@@ -82,7 +82,7 @@ static ssize_t show_ctrl (struct device *dev, char *buf) ...@@ -82,7 +82,7 @@ static ssize_t show_ctrl (struct device *dev, char *buf)
} }
static DEVICE_ATTR (ctrl, S_IRUGO, show_ctrl, NULL); static DEVICE_ATTR (ctrl, S_IRUGO, show_ctrl, NULL);
static ssize_t show_dev (struct device *dev, char *buf) static ssize_t show_dev (struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct pci_dev *pci_dev; struct pci_dev *pci_dev;
struct controller *ctrl; struct controller *ctrl;
......
drivers/pci/hotplug/shpchp_sysfs.c
View file @ e404e274
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
/* A few routines that create sysfs entries for the hot plug controller */ /* A few routines that create sysfs entries for the hot plug controller */
static ssize_t show_ctrl (struct device *dev, char *buf) static ssize_t show_ctrl (struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct pci_dev *pci_dev; struct pci_dev *pci_dev;
struct controller *ctrl; struct controller *ctrl;
...@@ -82,7 +82,7 @@ static ssize_t show_ctrl (struct device *dev, char *buf) ...@@ -82,7 +82,7 @@ static ssize_t show_ctrl (struct device *dev, char *buf)
} }
static DEVICE_ATTR (ctrl, S_IRUGO, show_ctrl, NULL); static DEVICE_ATTR (ctrl, S_IRUGO, show_ctrl, NULL);
static ssize_t show_dev (struct device *dev, char *buf) static ssize_t show_dev (struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct pci_dev *pci_dev; struct pci_dev *pci_dev;
struct controller *ctrl; struct controller *ctrl;
......
drivers/pci/pci-sysfs.c
View file @ e404e274
...@@ -29,7 +29,7 @@ static int sysfs_initialized; /* = 0 */ ...@@ -29,7 +29,7 @@ static int sysfs_initialized; /* = 0 */
/* show configuration fields */ /* show configuration fields */
#define pci_config_attr(field, format_string) \ #define pci_config_attr(field, format_string) \
static ssize_t \ static ssize_t \
field##_show(struct device *dev, char *buf) \ field##_show(struct device *dev, struct device_attribute *attr, char *buf) \
{ \ { \
struct pci_dev *pdev; \ struct pci_dev *pdev; \
\ \
...@@ -44,7 +44,7 @@ pci_config_attr(subsystem_device, "0x%04x\n"); ...@@ -44,7 +44,7 @@ pci_config_attr(subsystem_device, "0x%04x\n");
pci_config_attr(class, "0x%06x\n"); pci_config_attr(class, "0x%06x\n");
pci_config_attr(irq, "%u\n"); pci_config_attr(irq, "%u\n");
static ssize_t local_cpus_show(struct device *dev, char *buf) static ssize_t local_cpus_show(struct device *dev, struct device_attribute *attr, char *buf)
{ {
cpumask_t mask = pcibus_to_cpumask(to_pci_dev(dev)->bus); cpumask_t mask = pcibus_to_cpumask(to_pci_dev(dev)->bus);
int len = cpumask_scnprintf(buf, PAGE_SIZE-2, mask); int len = cpumask_scnprintf(buf, PAGE_SIZE-2, mask);
...@@ -54,7 +54,7 @@ static ssize_t local_cpus_show(struct device *dev, char *buf) ...@@ -54,7 +54,7 @@ static ssize_t local_cpus_show(struct device *dev, char *buf)
/* show resources */ /* show resources */
static ssize_t static ssize_t
resource_show(struct device * dev, char * buf) resource_show(struct device * dev, struct device_attribute *attr, char * buf)
{ {
struct pci_dev * pci_dev = to_pci_dev(dev); struct pci_dev * pci_dev = to_pci_dev(dev);
char * str = buf; char * str = buf;
......
drivers/pcmcia/ds.c
View file @ e404e274
...@@ -604,14 +604,14 @@ static int pcmcia_bus_match(struct device * dev, struct device_driver * drv) { ...@@ -604,14 +604,14 @@ static int pcmcia_bus_match(struct device * dev, struct device_driver * drv) {
/************************ per-device sysfs output ***************************/ /************************ per-device sysfs output ***************************/
#define pcmcia_device_attr(field, test, format) \ #define pcmcia_device_attr(field, test, format) \
static ssize_t field##_show (struct device *dev, char *buf) \ static ssize_t field##_show (struct device *dev, struct device_attribute *attr, char *buf) \
{ \ { \
struct pcmcia_device *p_dev = to_pcmcia_dev(dev); \ struct pcmcia_device *p_dev = to_pcmcia_dev(dev); \
return p_dev->test ? sprintf (buf, format, p_dev->field) : -ENODEV; \ return p_dev->test ? sprintf (buf, format, p_dev->field) : -ENODEV; \
} }
#define pcmcia_device_stringattr(name, field) \ #define pcmcia_device_stringattr(name, field) \
static ssize_t name##_show (struct device *dev, char *buf) \ static ssize_t name##_show (struct device *dev, struct device_attribute *attr, char *buf) \
{ \ { \
struct pcmcia_device *p_dev = to_pcmcia_dev(dev); \ struct pcmcia_device *p_dev = to_pcmcia_dev(dev); \
return p_dev->field ? sprintf (buf, "%s\n", p_dev->field) : -ENODEV; \ return p_dev->field ? sprintf (buf, "%s\n", p_dev->field) : -ENODEV; \
......
drivers/pnp/card.c
View file @ e404e274
...@@ -140,7 +140,7 @@ static void pnp_release_card(struct device *dmdev) ...@@ -140,7 +140,7 @@ static void pnp_release_card(struct device *dmdev)
} }
static ssize_t pnp_show_card_name(struct device *dmdev, char *buf) static ssize_t pnp_show_card_name(struct device *dmdev, struct device_attribute *attr, char *buf)
{ {
char *str = buf; char *str = buf;
struct pnp_card *card = to_pnp_card(dmdev); struct pnp_card *card = to_pnp_card(dmdev);
...@@ -150,7 +150,7 @@ static ssize_t pnp_show_card_name(struct device *dmdev, char *buf) ...@@ -150,7 +150,7 @@ static ssize_t pnp_show_card_name(struct device *dmdev, char *buf)
static DEVICE_ATTR(name,S_IRUGO,pnp_show_card_name,NULL); static DEVICE_ATTR(name,S_IRUGO,pnp_show_card_name,NULL);
static ssize_t pnp_show_card_ids(struct device *dmdev, char *buf) static ssize_t pnp_show_card_ids(struct device *dmdev, struct device_attribute *attr, char *buf)
{ {
char *str = buf; char *str = buf;
struct pnp_card *card = to_pnp_card(dmdev); struct pnp_card *card = to_pnp_card(dmdev);
......
drivers/pnp/interface.c
View file @ e404e274
...@@ -205,7 +205,7 @@ static void pnp_print_option(pnp_info_buffer_t *buffer, char *space, ...@@ -205,7 +205,7 @@ static void pnp_print_option(pnp_info_buffer_t *buffer, char *space,
} }
static ssize_t pnp_show_options(struct device *dmdev, char *buf) static ssize_t pnp_show_options(struct device *dmdev, struct device_attribute *attr, char *buf)
{ {
struct pnp_dev *dev = to_pnp_dev(dmdev); struct pnp_dev *dev = to_pnp_dev(dmdev);
struct pnp_option * independent = dev->independent; struct pnp_option * independent = dev->independent;
...@@ -236,7 +236,7 @@ static ssize_t pnp_show_options(struct device *dmdev, char *buf) ...@@ -236,7 +236,7 @@ static ssize_t pnp_show_options(struct device *dmdev, char *buf)
static DEVICE_ATTR(options,S_IRUGO,pnp_show_options,NULL); static DEVICE_ATTR(options,S_IRUGO,pnp_show_options,NULL);
static ssize_t pnp_show_current_resources(struct device *dmdev, char *buf) static ssize_t pnp_show_current_resources(struct device *dmdev, struct device_attribute *attr, char *buf)
{ {
struct pnp_dev *dev = to_pnp_dev(dmdev); struct pnp_dev *dev = to_pnp_dev(dmdev);
int i, ret; int i, ret;
...@@ -308,7 +308,7 @@ static ssize_t pnp_show_current_resources(struct device *dmdev, char *buf) ...@@ -308,7 +308,7 @@ static ssize_t pnp_show_current_resources(struct device *dmdev, char *buf)
extern struct semaphore pnp_res_mutex; extern struct semaphore pnp_res_mutex;
static ssize_t static ssize_t
pnp_set_current_resources(struct device * dmdev, const char * ubuf, size_t count) pnp_set_current_resources(struct device * dmdev, struct device_attribute *attr, const char * ubuf, size_t count)
{ {
struct pnp_dev *dev = to_pnp_dev(dmdev); struct pnp_dev *dev = to_pnp_dev(dmdev);
char *buf = (void *)ubuf; char *buf = (void *)ubuf;
...@@ -444,7 +444,7 @@ pnp_set_current_resources(struct device * dmdev, const char * ubuf, size_t count ...@@ -444,7 +444,7 @@ pnp_set_current_resources(struct device * dmdev, const char * ubuf, size_t count
static DEVICE_ATTR(resources,S_IRUGO | S_IWUSR, static DEVICE_ATTR(resources,S_IRUGO | S_IWUSR,
pnp_show_current_resources,pnp_set_current_resources); pnp_show_current_resources,pnp_set_current_resources);
static ssize_t pnp_show_current_ids(struct device *dmdev, char *buf) static ssize_t pnp_show_current_ids(struct device *dmdev, struct device_attribute *attr, char *buf)
{ {
char *str = buf; char *str = buf;
struct pnp_dev *dev = to_pnp_dev(dmdev); struct pnp_dev *dev = to_pnp_dev(dmdev);
......
drivers/s390/block/dasd_devmap.c
View file @ e404e274
...@@ -615,7 +615,7 @@ dasd_device_from_cdev(struct ccw_device *cdev) ...@@ -615,7 +615,7 @@ dasd_device_from_cdev(struct ccw_device *cdev)
* readonly controls the readonly status of a dasd * readonly controls the readonly status of a dasd
*/ */
static ssize_t static ssize_t
dasd_ro_show(struct device *dev, char *buf) dasd_ro_show(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct dasd_devmap *devmap; struct dasd_devmap *devmap;
int ro_flag; int ro_flag;
...@@ -629,7 +629,7 @@ dasd_ro_show(struct device *dev, char *buf) ...@@ -629,7 +629,7 @@ dasd_ro_show(struct device *dev, char *buf)
} }
static ssize_t static ssize_t
dasd_ro_store(struct device *dev, const char *buf, size_t count) dasd_ro_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
{ {
struct dasd_devmap *devmap; struct dasd_devmap *devmap;
int ro_flag; int ro_flag;
...@@ -656,7 +656,7 @@ static DEVICE_ATTR(readonly, 0644, dasd_ro_show, dasd_ro_store); ...@@ -656,7 +656,7 @@ static DEVICE_ATTR(readonly, 0644, dasd_ro_show, dasd_ro_store);
* to talk to the device * to talk to the device
*/ */
static ssize_t static ssize_t
dasd_use_diag_show(struct device *dev, char *buf) dasd_use_diag_show(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct dasd_devmap *devmap; struct dasd_devmap *devmap;
int use_diag; int use_diag;
...@@ -670,7 +670,7 @@ dasd_use_diag_show(struct device *dev, char *buf) ...@@ -670,7 +670,7 @@ dasd_use_diag_show(struct device *dev, char *buf)
} }
static ssize_t static ssize_t
dasd_use_diag_store(struct device *dev, const char *buf, size_t count) dasd_use_diag_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
{ {
struct dasd_devmap *devmap; struct dasd_devmap *devmap;
ssize_t rc; ssize_t rc;
...@@ -698,7 +698,7 @@ static ...@@ -698,7 +698,7 @@ static
DEVICE_ATTR(use_diag, 0644, dasd_use_diag_show, dasd_use_diag_store); DEVICE_ATTR(use_diag, 0644, dasd_use_diag_show, dasd_use_diag_store);
static ssize_t static ssize_t
dasd_discipline_show(struct device *dev, char *buf) dasd_discipline_show(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct dasd_devmap *devmap; struct dasd_devmap *devmap;
char *dname; char *dname;
......
drivers/s390/block/dcssblk.c
View file @ e404e274
...@@ -45,16 +45,16 @@ static struct block_device_operations dcssblk_devops = { ...@@ -45,16 +45,16 @@ static struct block_device_operations dcssblk_devops = {
.release = dcssblk_release, .release = dcssblk_release,
}; };
static ssize_t dcssblk_add_store(struct device * dev, const char * buf, static ssize_t dcssblk_add_store(struct device * dev, struct device_attribute *attr, const char * buf,
size_t count); size_t count);
static ssize_t dcssblk_remove_store(struct device * dev, const char * buf, static ssize_t dcssblk_remove_store(struct device * dev, struct device_attribute *attr, const char * buf,
size_t count); size_t count);
static ssize_t dcssblk_save_store(struct device * dev, const char * buf, static ssize_t dcssblk_save_store(struct device * dev, struct device_attribute *attr, const char * buf,
size_t count); size_t count);
static ssize_t dcssblk_save_show(struct device *dev, char *buf); static ssize_t dcssblk_save_show(struct device *dev, struct device_attribute *attr, char *buf);
static ssize_t dcssblk_shared_store(struct device * dev, const char * buf, static ssize_t dcssblk_shared_store(struct device * dev, struct device_attribute *attr, const char * buf,
size_t count); size_t count);
static ssize_t dcssblk_shared_show(struct device *dev, char *buf); static ssize_t dcssblk_shared_show(struct device *dev, struct device_attribute *attr, char *buf);
static DEVICE_ATTR(add, S_IWUSR, NULL, dcssblk_add_store); static DEVICE_ATTR(add, S_IWUSR, NULL, dcssblk_add_store);
static DEVICE_ATTR(remove, S_IWUSR, NULL, dcssblk_remove_store); static DEVICE_ATTR(remove, S_IWUSR, NULL, dcssblk_remove_store);
...@@ -195,7 +195,7 @@ dcssblk_segment_warn(int rc, char* seg_name) ...@@ -195,7 +195,7 @@ dcssblk_segment_warn(int rc, char* seg_name)
* operation (show + store) * operation (show + store)
*/ */
static ssize_t static ssize_t
dcssblk_shared_show(struct device *dev, char *buf) dcssblk_shared_show(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct dcssblk_dev_info *dev_info; struct dcssblk_dev_info *dev_info;
...@@ -204,7 +204,7 @@ dcssblk_shared_show(struct device *dev, char *buf) ...@@ -204,7 +204,7 @@ dcssblk_shared_show(struct device *dev, char *buf)
} }
static ssize_t static ssize_t
dcssblk_shared_store(struct device *dev, const char *inbuf, size_t count) dcssblk_shared_store(struct device *dev, struct device_attribute *attr, const char *inbuf, size_t count)
{ {
struct dcssblk_dev_info *dev_info; struct dcssblk_dev_info *dev_info;
int rc; int rc;
...@@ -288,7 +288,7 @@ dcssblk_shared_store(struct device *dev, const char *inbuf, size_t count) ...@@ -288,7 +288,7 @@ dcssblk_shared_store(struct device *dev, const char *inbuf, size_t count)
* (show + store) * (show + store)
*/ */
static ssize_t static ssize_t
dcssblk_save_show(struct device *dev, char *buf) dcssblk_save_show(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct dcssblk_dev_info *dev_info; struct dcssblk_dev_info *dev_info;
...@@ -297,7 +297,7 @@ dcssblk_save_show(struct device *dev, char *buf) ...@@ -297,7 +297,7 @@ dcssblk_save_show(struct device *dev, char *buf)
} }
static ssize_t static ssize_t
dcssblk_save_store(struct device *dev, const char *inbuf, size_t count) dcssblk_save_store(struct device *dev, struct device_attribute *attr, const char *inbuf, size_t count)
{ {
struct dcssblk_dev_info *dev_info; struct dcssblk_dev_info *dev_info;
...@@ -343,7 +343,7 @@ dcssblk_save_store(struct device *dev, const char *inbuf, size_t count) ...@@ -343,7 +343,7 @@ dcssblk_save_store(struct device *dev, const char *inbuf, size_t count)
* device attribute for adding devices * device attribute for adding devices
*/ */
static ssize_t static ssize_t
dcssblk_add_store(struct device *dev, const char *buf, size_t count) dcssblk_add_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
{ {
int rc, i; int rc, i;
struct dcssblk_dev_info *dev_info; struct dcssblk_dev_info *dev_info;
...@@ -517,7 +517,7 @@ dcssblk_add_store(struct device *dev, const char *buf, size_t count) ...@@ -517,7 +517,7 @@ dcssblk_add_store(struct device *dev, const char *buf, size_t count)
* device attribute for removing devices * device attribute for removing devices
*/ */
static ssize_t static ssize_t
dcssblk_remove_store(struct device *dev, const char *buf, size_t count) dcssblk_remove_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
{ {
struct dcssblk_dev_info *dev_info; struct dcssblk_dev_info *dev_info;
int rc, i; int rc, i;
......
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