diff options
Diffstat (limited to 'drivers/firmware')
-rw-r--r-- | drivers/firmware/dcdbas.c | 10 | ||||
-rw-r--r-- | drivers/firmware/dell_rbu.c | 25 |
2 files changed, 21 insertions, 14 deletions
diff --git a/drivers/firmware/dcdbas.c b/drivers/firmware/dcdbas.c index 1865b56fb141..18cdcb3ae1ca 100644 --- a/drivers/firmware/dcdbas.c +++ b/drivers/firmware/dcdbas.c | |||
@@ -149,8 +149,9 @@ static ssize_t smi_data_buf_size_store(struct device *dev, | |||
149 | return count; | 149 | return count; |
150 | } | 150 | } |
151 | 151 | ||
152 | static ssize_t smi_data_read(struct kobject *kobj, char *buf, loff_t pos, | 152 | static ssize_t smi_data_read(struct kobject *kobj, |
153 | size_t count) | 153 | struct bin_attribute *bin_attr, |
154 | char *buf, loff_t pos, size_t count) | ||
154 | { | 155 | { |
155 | size_t max_read; | 156 | size_t max_read; |
156 | ssize_t ret; | 157 | ssize_t ret; |
@@ -170,8 +171,9 @@ out: | |||
170 | return ret; | 171 | return ret; |
171 | } | 172 | } |
172 | 173 | ||
173 | static ssize_t smi_data_write(struct kobject *kobj, char *buf, loff_t pos, | 174 | static ssize_t smi_data_write(struct kobject *kobj, |
174 | size_t count) | 175 | struct bin_attribute *bin_attr, |
176 | char *buf, loff_t pos, size_t count) | ||
175 | { | 177 | { |
176 | ssize_t ret; | 178 | ssize_t ret; |
177 | 179 | ||
diff --git a/drivers/firmware/dell_rbu.c b/drivers/firmware/dell_rbu.c index f8afecb7d0cf..477a3d0e3caf 100644 --- a/drivers/firmware/dell_rbu.c +++ b/drivers/firmware/dell_rbu.c | |||
@@ -543,8 +543,9 @@ static ssize_t read_rbu_mono_data(char *buffer, loff_t pos, size_t count) | |||
543 | return ret_count; | 543 | return ret_count; |
544 | } | 544 | } |
545 | 545 | ||
546 | static ssize_t read_rbu_data(struct kobject *kobj, char *buffer, | 546 | static ssize_t read_rbu_data(struct kobject *kobj, |
547 | loff_t pos, size_t count) | 547 | struct bin_attribute *bin_attr, |
548 | char *buffer, loff_t pos, size_t count) | ||
548 | { | 549 | { |
549 | ssize_t ret_count = 0; | 550 | ssize_t ret_count = 0; |
550 | 551 | ||
@@ -591,8 +592,9 @@ static void callbackfn_rbu(const struct firmware *fw, void *context) | |||
591 | spin_unlock(&rbu_data.lock); | 592 | spin_unlock(&rbu_data.lock); |
592 | } | 593 | } |
593 | 594 | ||
594 | static ssize_t read_rbu_image_type(struct kobject *kobj, char *buffer, | 595 | static ssize_t read_rbu_image_type(struct kobject *kobj, |
595 | loff_t pos, size_t count) | 596 | struct bin_attribute *bin_attr, |
597 | char *buffer, loff_t pos, size_t count) | ||
596 | { | 598 | { |
597 | int size = 0; | 599 | int size = 0; |
598 | if (!pos) | 600 | if (!pos) |
@@ -600,8 +602,9 @@ static ssize_t read_rbu_image_type(struct kobject *kobj, char *buffer, | |||
600 | return size; | 602 | return size; |
601 | } | 603 | } |
602 | 604 | ||
603 | static ssize_t write_rbu_image_type(struct kobject *kobj, char *buffer, | 605 | static ssize_t write_rbu_image_type(struct kobject *kobj, |
604 | loff_t pos, size_t count) | 606 | struct bin_attribute *bin_attr, |
607 | char *buffer, loff_t pos, size_t count) | ||
605 | { | 608 | { |
606 | int rc = count; | 609 | int rc = count; |
607 | int req_firm_rc = 0; | 610 | int req_firm_rc = 0; |
@@ -660,8 +663,9 @@ static ssize_t write_rbu_image_type(struct kobject *kobj, char *buffer, | |||
660 | return rc; | 663 | return rc; |
661 | } | 664 | } |
662 | 665 | ||
663 | static ssize_t read_rbu_packet_size(struct kobject *kobj, char *buffer, | 666 | static ssize_t read_rbu_packet_size(struct kobject *kobj, |
664 | loff_t pos, size_t count) | 667 | struct bin_attribute *bin_attr, |
668 | char *buffer, loff_t pos, size_t count) | ||
665 | { | 669 | { |
666 | int size = 0; | 670 | int size = 0; |
667 | if (!pos) { | 671 | if (!pos) { |
@@ -672,8 +676,9 @@ static ssize_t read_rbu_packet_size(struct kobject *kobj, char *buffer, | |||
672 | return size; | 676 | return size; |
673 | } | 677 | } |
674 | 678 | ||
675 | static ssize_t write_rbu_packet_size(struct kobject *kobj, char *buffer, | 679 | static ssize_t write_rbu_packet_size(struct kobject *kobj, |
676 | loff_t pos, size_t count) | 680 | struct bin_attribute *bin_attr, |
681 | char *buffer, loff_t pos, size_t count) | ||
677 | { | 682 | { |
678 | unsigned long temp; | 683 | unsigned long temp; |
679 | spin_lock(&rbu_data.lock); | 684 | spin_lock(&rbu_data.lock); |