diff options
Diffstat (limited to 'drivers/s390/block/dasd_devmap.c')
-rw-r--r-- | drivers/s390/block/dasd_devmap.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/s390/block/dasd_devmap.c b/drivers/s390/block/dasd_devmap.c index 1aedc48e5f85..d948566bb24a 100644 --- a/drivers/s390/block/dasd_devmap.c +++ b/drivers/s390/block/dasd_devmap.c | |||
@@ -615,7 +615,7 @@ dasd_device_from_cdev(struct ccw_device *cdev) | |||
615 | * readonly controls the readonly status of a dasd | 615 | * readonly controls the readonly status of a dasd |
616 | */ | 616 | */ |
617 | static ssize_t | 617 | static ssize_t |
618 | dasd_ro_show(struct device *dev, char *buf) | 618 | dasd_ro_show(struct device *dev, struct device_attribute *attr, char *buf) |
619 | { | 619 | { |
620 | struct dasd_devmap *devmap; | 620 | struct dasd_devmap *devmap; |
621 | int ro_flag; | 621 | int ro_flag; |
@@ -629,7 +629,7 @@ dasd_ro_show(struct device *dev, char *buf) | |||
629 | } | 629 | } |
630 | 630 | ||
631 | static ssize_t | 631 | static ssize_t |
632 | dasd_ro_store(struct device *dev, const char *buf, size_t count) | 632 | dasd_ro_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) |
633 | { | 633 | { |
634 | struct dasd_devmap *devmap; | 634 | struct dasd_devmap *devmap; |
635 | int ro_flag; | 635 | int ro_flag; |
@@ -656,7 +656,7 @@ static DEVICE_ATTR(readonly, 0644, dasd_ro_show, dasd_ro_store); | |||
656 | * to talk to the device | 656 | * to talk to the device |
657 | */ | 657 | */ |
658 | static ssize_t | 658 | static ssize_t |
659 | dasd_use_diag_show(struct device *dev, char *buf) | 659 | dasd_use_diag_show(struct device *dev, struct device_attribute *attr, char *buf) |
660 | { | 660 | { |
661 | struct dasd_devmap *devmap; | 661 | struct dasd_devmap *devmap; |
662 | int use_diag; | 662 | int use_diag; |
@@ -670,7 +670,7 @@ dasd_use_diag_show(struct device *dev, char *buf) | |||
670 | } | 670 | } |
671 | 671 | ||
672 | static ssize_t | 672 | static ssize_t |
673 | dasd_use_diag_store(struct device *dev, const char *buf, size_t count) | 673 | dasd_use_diag_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) |
674 | { | 674 | { |
675 | struct dasd_devmap *devmap; | 675 | struct dasd_devmap *devmap; |
676 | ssize_t rc; | 676 | ssize_t rc; |
@@ -698,7 +698,7 @@ static | |||
698 | DEVICE_ATTR(use_diag, 0644, dasd_use_diag_show, dasd_use_diag_store); | 698 | DEVICE_ATTR(use_diag, 0644, dasd_use_diag_show, dasd_use_diag_store); |
699 | 699 | ||
700 | static ssize_t | 700 | static ssize_t |
701 | dasd_discipline_show(struct device *dev, char *buf) | 701 | dasd_discipline_show(struct device *dev, struct device_attribute *attr, char *buf) |
702 | { | 702 | { |
703 | struct dasd_devmap *devmap; | 703 | struct dasd_devmap *devmap; |
704 | char *dname; | 704 | char *dname; |