diff options
Diffstat (limited to 'drivers/s390/block/dcssblk.c')
-rw-r--r-- | drivers/s390/block/dcssblk.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/drivers/s390/block/dcssblk.c b/drivers/s390/block/dcssblk.c index a66b17b65296..16ab8d363ac6 100644 --- a/drivers/s390/block/dcssblk.c +++ b/drivers/s390/block/dcssblk.c | |||
@@ -45,16 +45,16 @@ static struct block_device_operations dcssblk_devops = { | |||
45 | .release = dcssblk_release, | 45 | .release = dcssblk_release, |
46 | }; | 46 | }; |
47 | 47 | ||
48 | static ssize_t dcssblk_add_store(struct device * dev, const char * buf, | 48 | static ssize_t dcssblk_add_store(struct device * dev, struct device_attribute *attr, const char * buf, |
49 | size_t count); | 49 | size_t count); |
50 | static ssize_t dcssblk_remove_store(struct device * dev, const char * buf, | 50 | static ssize_t dcssblk_remove_store(struct device * dev, struct device_attribute *attr, const char * buf, |
51 | size_t count); | 51 | size_t count); |
52 | static ssize_t dcssblk_save_store(struct device * dev, const char * buf, | 52 | static ssize_t dcssblk_save_store(struct device * dev, struct device_attribute *attr, const char * buf, |
53 | size_t count); | 53 | size_t count); |
54 | static ssize_t dcssblk_save_show(struct device *dev, char *buf); | 54 | static ssize_t dcssblk_save_show(struct device *dev, struct device_attribute *attr, char *buf); |
55 | static ssize_t dcssblk_shared_store(struct device * dev, const char * buf, | 55 | static ssize_t dcssblk_shared_store(struct device * dev, struct device_attribute *attr, const char * buf, |
56 | size_t count); | 56 | size_t count); |
57 | static ssize_t dcssblk_shared_show(struct device *dev, char *buf); | 57 | static ssize_t dcssblk_shared_show(struct device *dev, struct device_attribute *attr, char *buf); |
58 | 58 | ||
59 | static DEVICE_ATTR(add, S_IWUSR, NULL, dcssblk_add_store); | 59 | static DEVICE_ATTR(add, S_IWUSR, NULL, dcssblk_add_store); |
60 | static DEVICE_ATTR(remove, S_IWUSR, NULL, dcssblk_remove_store); | 60 | static DEVICE_ATTR(remove, S_IWUSR, NULL, dcssblk_remove_store); |
@@ -195,7 +195,7 @@ dcssblk_segment_warn(int rc, char* seg_name) | |||
195 | * operation (show + store) | 195 | * operation (show + store) |
196 | */ | 196 | */ |
197 | static ssize_t | 197 | static ssize_t |
198 | dcssblk_shared_show(struct device *dev, char *buf) | 198 | dcssblk_shared_show(struct device *dev, struct device_attribute *attr, char *buf) |
199 | { | 199 | { |
200 | struct dcssblk_dev_info *dev_info; | 200 | struct dcssblk_dev_info *dev_info; |
201 | 201 | ||
@@ -204,7 +204,7 @@ dcssblk_shared_show(struct device *dev, char *buf) | |||
204 | } | 204 | } |
205 | 205 | ||
206 | static ssize_t | 206 | static ssize_t |
207 | dcssblk_shared_store(struct device *dev, const char *inbuf, size_t count) | 207 | dcssblk_shared_store(struct device *dev, struct device_attribute *attr, const char *inbuf, size_t count) |
208 | { | 208 | { |
209 | struct dcssblk_dev_info *dev_info; | 209 | struct dcssblk_dev_info *dev_info; |
210 | int rc; | 210 | int rc; |
@@ -288,7 +288,7 @@ out: | |||
288 | * (show + store) | 288 | * (show + store) |
289 | */ | 289 | */ |
290 | static ssize_t | 290 | static ssize_t |
291 | dcssblk_save_show(struct device *dev, char *buf) | 291 | dcssblk_save_show(struct device *dev, struct device_attribute *attr, char *buf) |
292 | { | 292 | { |
293 | struct dcssblk_dev_info *dev_info; | 293 | struct dcssblk_dev_info *dev_info; |
294 | 294 | ||
@@ -297,7 +297,7 @@ dcssblk_save_show(struct device *dev, char *buf) | |||
297 | } | 297 | } |
298 | 298 | ||
299 | static ssize_t | 299 | static ssize_t |
300 | dcssblk_save_store(struct device *dev, const char *inbuf, size_t count) | 300 | dcssblk_save_store(struct device *dev, struct device_attribute *attr, const char *inbuf, size_t count) |
301 | { | 301 | { |
302 | struct dcssblk_dev_info *dev_info; | 302 | struct dcssblk_dev_info *dev_info; |
303 | 303 | ||
@@ -343,7 +343,7 @@ dcssblk_save_store(struct device *dev, const char *inbuf, size_t count) | |||
343 | * device attribute for adding devices | 343 | * device attribute for adding devices |
344 | */ | 344 | */ |
345 | static ssize_t | 345 | static ssize_t |
346 | dcssblk_add_store(struct device *dev, const char *buf, size_t count) | 346 | dcssblk_add_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) |
347 | { | 347 | { |
348 | int rc, i; | 348 | int rc, i; |
349 | struct dcssblk_dev_info *dev_info; | 349 | struct dcssblk_dev_info *dev_info; |
@@ -517,7 +517,7 @@ out_nobuf: | |||
517 | * device attribute for removing devices | 517 | * device attribute for removing devices |
518 | */ | 518 | */ |
519 | static ssize_t | 519 | static ssize_t |
520 | dcssblk_remove_store(struct device *dev, const char *buf, size_t count) | 520 | dcssblk_remove_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) |
521 | { | 521 | { |
522 | struct dcssblk_dev_info *dev_info; | 522 | struct dcssblk_dev_info *dev_info; |
523 | int rc, i; | 523 | int rc, i; |