diff options
Diffstat (limited to 'drivers/s390')
-rw-r--r-- | drivers/s390/cio/chp.c | 12 | ||||
-rw-r--r-- | drivers/s390/net/qeth_sys.c | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/drivers/s390/cio/chp.c b/drivers/s390/cio/chp.c index ac289e6eadfe..b57d93d986c0 100644 --- a/drivers/s390/cio/chp.c +++ b/drivers/s390/cio/chp.c | |||
@@ -141,8 +141,9 @@ static int s390_vary_chpid(struct chp_id chpid, int on) | |||
141 | /* | 141 | /* |
142 | * Channel measurement related functions | 142 | * Channel measurement related functions |
143 | */ | 143 | */ |
144 | static ssize_t chp_measurement_chars_read(struct kobject *kobj, char *buf, | 144 | static ssize_t chp_measurement_chars_read(struct kobject *kobj, |
145 | loff_t off, size_t count) | 145 | struct bin_attribute *bin_attr, |
146 | char *buf, loff_t off, size_t count) | ||
146 | { | 147 | { |
147 | struct channel_path *chp; | 148 | struct channel_path *chp; |
148 | unsigned int size; | 149 | unsigned int size; |
@@ -165,7 +166,6 @@ static struct bin_attribute chp_measurement_chars_attr = { | |||
165 | .attr = { | 166 | .attr = { |
166 | .name = "measurement_chars", | 167 | .name = "measurement_chars", |
167 | .mode = S_IRUSR, | 168 | .mode = S_IRUSR, |
168 | .owner = THIS_MODULE, | ||
169 | }, | 169 | }, |
170 | .size = sizeof(struct cmg_chars), | 170 | .size = sizeof(struct cmg_chars), |
171 | .read = chp_measurement_chars_read, | 171 | .read = chp_measurement_chars_read, |
@@ -193,8 +193,9 @@ static void chp_measurement_copy_block(struct cmg_entry *buf, | |||
193 | } while (reference_buf.values[0] != buf->values[0]); | 193 | } while (reference_buf.values[0] != buf->values[0]); |
194 | } | 194 | } |
195 | 195 | ||
196 | static ssize_t chp_measurement_read(struct kobject *kobj, char *buf, | 196 | static ssize_t chp_measurement_read(struct kobject *kobj, |
197 | loff_t off, size_t count) | 197 | struct bin_attribute *bin_attr, |
198 | char *buf, loff_t off, size_t count) | ||
198 | { | 199 | { |
199 | struct channel_path *chp; | 200 | struct channel_path *chp; |
200 | struct channel_subsystem *css; | 201 | struct channel_subsystem *css; |
@@ -217,7 +218,6 @@ static struct bin_attribute chp_measurement_attr = { | |||
217 | .attr = { | 218 | .attr = { |
218 | .name = "measurement", | 219 | .name = "measurement", |
219 | .mode = S_IRUSR, | 220 | .mode = S_IRUSR, |
220 | .owner = THIS_MODULE, | ||
221 | }, | 221 | }, |
222 | .size = sizeof(struct cmg_entry), | 222 | .size = sizeof(struct cmg_entry), |
223 | .read = chp_measurement_read, | 223 | .read = chp_measurement_read, |
diff --git a/drivers/s390/net/qeth_sys.c b/drivers/s390/net/qeth_sys.c index 65ffc21afc37..bb0287ad1aac 100644 --- a/drivers/s390/net/qeth_sys.c +++ b/drivers/s390/net/qeth_sys.c | |||
@@ -991,7 +991,7 @@ static struct attribute_group qeth_osn_device_attr_group = { | |||
991 | 991 | ||
992 | #define QETH_DEVICE_ATTR(_id,_name,_mode,_show,_store) \ | 992 | #define QETH_DEVICE_ATTR(_id,_name,_mode,_show,_store) \ |
993 | struct device_attribute dev_attr_##_id = { \ | 993 | struct device_attribute dev_attr_##_id = { \ |
994 | .attr = {.name=__stringify(_name), .mode=_mode, .owner=THIS_MODULE },\ | 994 | .attr = {.name=__stringify(_name), .mode=_mode, },\ |
995 | .show = _show, \ | 995 | .show = _show, \ |
996 | .store = _store, \ | 996 | .store = _store, \ |
997 | }; | 997 | }; |