diff options
Diffstat (limited to 'drivers/s390/cio/cmf.c')
| -rw-r--r-- | drivers/s390/cio/cmf.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/s390/cio/cmf.c b/drivers/s390/cio/cmf.c index 49def26ba383..8cc4f1a940dc 100644 --- a/drivers/s390/cio/cmf.c +++ b/drivers/s390/cio/cmf.c | |||
| @@ -796,7 +796,7 @@ cmb_show_attr(struct device *dev, char *buf, enum cmb_index idx) | |||
| 796 | } | 796 | } |
| 797 | 797 | ||
| 798 | static ssize_t | 798 | static ssize_t |
| 799 | cmb_show_avg_sample_interval(struct device *dev, char *buf) | 799 | cmb_show_avg_sample_interval(struct device *dev, struct device_attribute *attr, char *buf) |
| 800 | { | 800 | { |
| 801 | struct ccw_device *cdev; | 801 | struct ccw_device *cdev; |
| 802 | long interval; | 802 | long interval; |
| @@ -813,7 +813,7 @@ cmb_show_avg_sample_interval(struct device *dev, char *buf) | |||
| 813 | } | 813 | } |
| 814 | 814 | ||
| 815 | static ssize_t | 815 | static ssize_t |
| 816 | cmb_show_avg_utilization(struct device *dev, char *buf) | 816 | cmb_show_avg_utilization(struct device *dev, struct device_attribute *attr, char *buf) |
| 817 | { | 817 | { |
| 818 | struct cmbdata data; | 818 | struct cmbdata data; |
| 819 | u64 utilization; | 819 | u64 utilization; |
| @@ -842,12 +842,12 @@ cmb_show_avg_utilization(struct device *dev, char *buf) | |||
| 842 | } | 842 | } |
| 843 | 843 | ||
| 844 | #define cmf_attr(name) \ | 844 | #define cmf_attr(name) \ |
| 845 | static ssize_t show_ ## name (struct device * dev, char * buf) \ | 845 | static ssize_t show_ ## name (struct device * dev, struct device_attribute *attr, char * buf) \ |
| 846 | { return cmb_show_attr((dev), buf, cmb_ ## name); } \ | 846 | { return cmb_show_attr((dev), buf, cmb_ ## name); } \ |
| 847 | static DEVICE_ATTR(name, 0444, show_ ## name, NULL); | 847 | static DEVICE_ATTR(name, 0444, show_ ## name, NULL); |
| 848 | 848 | ||
| 849 | #define cmf_attr_avg(name) \ | 849 | #define cmf_attr_avg(name) \ |
| 850 | static ssize_t show_avg_ ## name (struct device * dev, char * buf) \ | 850 | static ssize_t show_avg_ ## name (struct device * dev, struct device_attribute *attr, char * buf) \ |
| 851 | { return cmb_show_attr((dev), buf, cmb_ ## name); } \ | 851 | { return cmb_show_attr((dev), buf, cmb_ ## name); } \ |
| 852 | static DEVICE_ATTR(avg_ ## name, 0444, show_avg_ ## name, NULL); | 852 | static DEVICE_ATTR(avg_ ## name, 0444, show_avg_ ## name, NULL); |
| 853 | 853 | ||
| @@ -902,12 +902,12 @@ static struct attribute_group cmf_attr_group_ext = { | |||
| 902 | .attrs = cmf_attributes_ext, | 902 | .attrs = cmf_attributes_ext, |
| 903 | }; | 903 | }; |
| 904 | 904 | ||
| 905 | static ssize_t cmb_enable_show(struct device *dev, char *buf) | 905 | static ssize_t cmb_enable_show(struct device *dev, struct device_attribute *attr, char *buf) |
| 906 | { | 906 | { |
| 907 | return sprintf(buf, "%d\n", to_ccwdev(dev)->private->cmb ? 1 : 0); | 907 | return sprintf(buf, "%d\n", to_ccwdev(dev)->private->cmb ? 1 : 0); |
| 908 | } | 908 | } |
| 909 | 909 | ||
| 910 | static ssize_t cmb_enable_store(struct device *dev, const char *buf, size_t c) | 910 | static ssize_t cmb_enable_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t c) |
| 911 | { | 911 | { |
| 912 | struct ccw_device *cdev; | 912 | struct ccw_device *cdev; |
| 913 | int ret; | 913 | int ret; |
