diff options
Diffstat (limited to 'drivers/pci/hotplug/acpiphp_ibm.c')
-rw-r--r-- | drivers/pci/hotplug/acpiphp_ibm.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/pci/hotplug/acpiphp_ibm.c b/drivers/pci/hotplug/acpiphp_ibm.c index e7322c25d377..70db38c0ced9 100644 --- a/drivers/pci/hotplug/acpiphp_ibm.c +++ b/drivers/pci/hotplug/acpiphp_ibm.c | |||
@@ -106,7 +106,8 @@ static int ibm_get_attention_status(struct hotplug_slot *slot, u8 *status); | |||
106 | static void ibm_handle_events(acpi_handle handle, u32 event, void *context); | 106 | static void ibm_handle_events(acpi_handle handle, u32 event, void *context); |
107 | static int ibm_get_table_from_acpi(char **bufp); | 107 | static int ibm_get_table_from_acpi(char **bufp); |
108 | static ssize_t ibm_read_apci_table(struct kobject *kobj, | 108 | static ssize_t ibm_read_apci_table(struct kobject *kobj, |
109 | char *buffer, loff_t pos, size_t size); | 109 | struct bin_attribute *bin_attr, |
110 | char *buffer, loff_t pos, size_t size); | ||
110 | static acpi_status __init ibm_find_acpi_device(acpi_handle handle, | 111 | static acpi_status __init ibm_find_acpi_device(acpi_handle handle, |
111 | u32 lvl, void *context, void **rv); | 112 | u32 lvl, void *context, void **rv); |
112 | static int __init ibm_acpiphp_init(void); | 113 | static int __init ibm_acpiphp_init(void); |
@@ -117,7 +118,6 @@ static struct notification ibm_note; | |||
117 | static struct bin_attribute ibm_apci_table_attr = { | 118 | static struct bin_attribute ibm_apci_table_attr = { |
118 | .attr = { | 119 | .attr = { |
119 | .name = "apci_table", | 120 | .name = "apci_table", |
120 | .owner = THIS_MODULE, | ||
121 | .mode = S_IRUGO, | 121 | .mode = S_IRUGO, |
122 | }, | 122 | }, |
123 | .read = ibm_read_apci_table, | 123 | .read = ibm_read_apci_table, |
@@ -358,7 +358,8 @@ read_table_done: | |||
358 | * our solution is to only allow reading the table in all at once | 358 | * our solution is to only allow reading the table in all at once |
359 | **/ | 359 | **/ |
360 | static ssize_t ibm_read_apci_table(struct kobject *kobj, | 360 | static ssize_t ibm_read_apci_table(struct kobject *kobj, |
361 | char *buffer, loff_t pos, size_t size) | 361 | struct bin_attribute *bin_attr, |
362 | char *buffer, loff_t pos, size_t size) | ||
362 | { | 363 | { |
363 | int bytes_read = -EINVAL; | 364 | int bytes_read = -EINVAL; |
364 | char *table = NULL; | 365 | char *table = NULL; |