aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pci/hotplug/acpiphp_ibm.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/pci/hotplug/acpiphp_ibm.c')
-rw-r--r--drivers/pci/hotplug/acpiphp_ibm.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/pci/hotplug/acpiphp_ibm.c b/drivers/pci/hotplug/acpiphp_ibm.c
index 0d64c414bf78..ecfac7e72d91 100644
--- a/drivers/pci/hotplug/acpiphp_ibm.c
+++ b/drivers/pci/hotplug/acpiphp_ibm.c
@@ -116,7 +116,7 @@ static struct bin_attribute ibm_apci_table_attr = {
116 .read = ibm_read_apci_table, 116 .read = ibm_read_apci_table,
117 .write = NULL, 117 .write = NULL,
118}; 118};
119static struct acpiphp_attention_info ibm_attention_info = 119static struct acpiphp_attention_info ibm_attention_info =
120{ 120{
121 .set_attn = ibm_set_attention_status, 121 .set_attn = ibm_set_attention_status,
122 .get_attn = ibm_get_attention_status, 122 .get_attn = ibm_get_attention_status,
@@ -171,9 +171,9 @@ ibm_slot_done:
171 */ 171 */
172static int ibm_set_attention_status(struct hotplug_slot *slot, u8 status) 172static int ibm_set_attention_status(struct hotplug_slot *slot, u8 status)
173{ 173{
174 union acpi_object args[2]; 174 union acpi_object args[2];
175 struct acpi_object_list params = { .pointer = args, .count = 2 }; 175 struct acpi_object_list params = { .pointer = args, .count = 2 };
176 acpi_status stat; 176 acpi_status stat;
177 unsigned long long rc; 177 unsigned long long rc;
178 union apci_descriptor *ibm_slot; 178 union apci_descriptor *ibm_slot;
179 179
@@ -208,7 +208,7 @@ static int ibm_set_attention_status(struct hotplug_slot *slot, u8 status)
208 * 208 *
209 * Description: This method is registered with the acpiphp module as a 209 * Description: This method is registered with the acpiphp module as a
210 * callback to do the device specific task of getting the LED status. 210 * callback to do the device specific task of getting the LED status.
211 * 211 *
212 * Because there is no direct method of getting the LED status directly 212 * Because there is no direct method of getting the LED status directly
213 * from an ACPI call, we read the aPCI table and parse out our 213 * from an ACPI call, we read the aPCI table and parse out our
214 * slot descriptor to read the status from that. 214 * slot descriptor to read the status from that.
@@ -259,7 +259,7 @@ static void ibm_handle_events(acpi_handle handle, u32 event, void *context)
259 pr_debug("%s: Received notification %02x\n", __func__, event); 259 pr_debug("%s: Received notification %02x\n", __func__, event);
260 260
261 if (subevent == 0x80) { 261 if (subevent == 0x80) {
262 pr_debug("%s: generationg bus event\n", __func__); 262 pr_debug("%s: generating bus event\n", __func__);
263 acpi_bus_generate_netlink_event(note->device->pnp.device_class, 263 acpi_bus_generate_netlink_event(note->device->pnp.device_class,
264 dev_name(&note->device->dev), 264 dev_name(&note->device->dev),
265 note->event, detail); 265 note->event, detail);
@@ -387,7 +387,7 @@ static acpi_status __init ibm_find_acpi_device(acpi_handle handle,
387 u32 lvl, void *context, void **rv) 387 u32 lvl, void *context, void **rv)
388{ 388{
389 acpi_handle *phandle = (acpi_handle *)context; 389 acpi_handle *phandle = (acpi_handle *)context;
390 acpi_status status; 390 acpi_status status;
391 struct acpi_device_info *info; 391 struct acpi_device_info *info;
392 int retval = 0; 392 int retval = 0;
393 393
@@ -405,7 +405,7 @@ static acpi_status __init ibm_find_acpi_device(acpi_handle handle,
405 info->hardware_id.string, handle); 405 info->hardware_id.string, handle);
406 *phandle = handle; 406 *phandle = handle;
407 /* returning non-zero causes the search to stop 407 /* returning non-zero causes the search to stop
408 * and returns this value to the caller of 408 * and returns this value to the caller of
409 * acpi_walk_namespace, but it also causes some warnings 409 * acpi_walk_namespace, but it also causes some warnings
410 * in the acpi debug code to print... 410 * in the acpi debug code to print...
411 */ 411 */