diff options
Diffstat (limited to 'drivers/firmware/dell_rbu.c')
-rw-r--r-- | drivers/firmware/dell_rbu.c | 31 |
1 files changed, 18 insertions, 13 deletions
diff --git a/drivers/firmware/dell_rbu.c b/drivers/firmware/dell_rbu.c index fc702e40bd43..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); |
@@ -687,18 +692,18 @@ static ssize_t write_rbu_packet_size(struct kobject *kobj, char *buffer, | |||
687 | } | 692 | } |
688 | 693 | ||
689 | static struct bin_attribute rbu_data_attr = { | 694 | static struct bin_attribute rbu_data_attr = { |
690 | .attr = {.name = "data",.owner = THIS_MODULE,.mode = 0444}, | 695 | .attr = {.name = "data", .mode = 0444}, |
691 | .read = read_rbu_data, | 696 | .read = read_rbu_data, |
692 | }; | 697 | }; |
693 | 698 | ||
694 | static struct bin_attribute rbu_image_type_attr = { | 699 | static struct bin_attribute rbu_image_type_attr = { |
695 | .attr = {.name = "image_type",.owner = THIS_MODULE,.mode = 0644}, | 700 | .attr = {.name = "image_type", .mode = 0644}, |
696 | .read = read_rbu_image_type, | 701 | .read = read_rbu_image_type, |
697 | .write = write_rbu_image_type, | 702 | .write = write_rbu_image_type, |
698 | }; | 703 | }; |
699 | 704 | ||
700 | static struct bin_attribute rbu_packet_size_attr = { | 705 | static struct bin_attribute rbu_packet_size_attr = { |
701 | .attr = {.name = "packet_size",.owner = THIS_MODULE,.mode = 0644}, | 706 | .attr = {.name = "packet_size", .mode = 0644}, |
702 | .read = read_rbu_packet_size, | 707 | .read = read_rbu_packet_size, |
703 | .write = write_rbu_packet_size, | 708 | .write = write_rbu_packet_size, |
704 | }; | 709 | }; |