diff options
Diffstat (limited to 'drivers/pcmcia')
-rw-r--r-- | drivers/pcmcia/socket_sysfs.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/drivers/pcmcia/socket_sysfs.c b/drivers/pcmcia/socket_sysfs.c index a2bb46526b56..b4409002b7f8 100644 --- a/drivers/pcmcia/socket_sysfs.c +++ b/drivers/pcmcia/socket_sysfs.c | |||
@@ -283,7 +283,9 @@ static ssize_t pccard_extract_cis(struct pcmcia_socket *s, char *buf, loff_t off | |||
283 | return (ret); | 283 | return (ret); |
284 | } | 284 | } |
285 | 285 | ||
286 | static ssize_t pccard_show_cis(struct kobject *kobj, char *buf, loff_t off, size_t count) | 286 | static ssize_t pccard_show_cis(struct kobject *kobj, |
287 | struct bin_attribute *bin_attr, | ||
288 | char *buf, loff_t off, size_t count) | ||
287 | { | 289 | { |
288 | unsigned int size = 0x200; | 290 | unsigned int size = 0x200; |
289 | 291 | ||
@@ -311,7 +313,9 @@ static ssize_t pccard_show_cis(struct kobject *kobj, char *buf, loff_t off, size | |||
311 | return (count); | 313 | return (count); |
312 | } | 314 | } |
313 | 315 | ||
314 | static ssize_t pccard_store_cis(struct kobject *kobj, char *buf, loff_t off, size_t count) | 316 | static ssize_t pccard_store_cis(struct kobject *kobj, |
317 | struct bin_attribute *bin_attr, | ||
318 | char *buf, loff_t off, size_t count) | ||
315 | { | 319 | { |
316 | struct pcmcia_socket *s = to_socket(container_of(kobj, struct device, kobj)); | 320 | struct pcmcia_socket *s = to_socket(container_of(kobj, struct device, kobj)); |
317 | cisdump_t *cis; | 321 | cisdump_t *cis; |
@@ -366,7 +370,7 @@ static struct device_attribute *pccard_socket_attributes[] = { | |||
366 | }; | 370 | }; |
367 | 371 | ||
368 | static struct bin_attribute pccard_cis_attr = { | 372 | static struct bin_attribute pccard_cis_attr = { |
369 | .attr = { .name = "cis", .mode = S_IRUGO | S_IWUSR, .owner = THIS_MODULE}, | 373 | .attr = { .name = "cis", .mode = S_IRUGO | S_IWUSR }, |
370 | .size = 0x200, | 374 | .size = 0x200, |
371 | .read = pccard_show_cis, | 375 | .read = pccard_show_cis, |
372 | .write = pccard_store_cis, | 376 | .write = pccard_store_cis, |