diff options
Diffstat (limited to 'drivers/pci/hotplug/acpiphp_ibm.c')
-rw-r--r-- | drivers/pci/hotplug/acpiphp_ibm.c | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/drivers/pci/hotplug/acpiphp_ibm.c b/drivers/pci/hotplug/acpiphp_ibm.c index 7e7f913ba7b9..317457dd4014 100644 --- a/drivers/pci/hotplug/acpiphp_ibm.c +++ b/drivers/pci/hotplug/acpiphp_ibm.c | |||
@@ -302,7 +302,7 @@ static int ibm_get_table_from_acpi(char **bufp) | |||
302 | } | 302 | } |
303 | 303 | ||
304 | package = (union acpi_object *) buffer.pointer; | 304 | package = (union acpi_object *) buffer.pointer; |
305 | if(!(package) || | 305 | if (!(package) || |
306 | (package->type != ACPI_TYPE_PACKAGE) || | 306 | (package->type != ACPI_TYPE_PACKAGE) || |
307 | !(package->package.elements)) { | 307 | !(package->package.elements)) { |
308 | err("%s: Invalid APCI object\n", __FUNCTION__); | 308 | err("%s: Invalid APCI object\n", __FUNCTION__); |
@@ -405,7 +405,7 @@ static acpi_status __init ibm_find_acpi_device(acpi_handle handle, | |||
405 | } | 405 | } |
406 | info.hardware_id.value[sizeof(info.hardware_id.value) - 1] = '\0'; | 406 | info.hardware_id.value[sizeof(info.hardware_id.value) - 1] = '\0'; |
407 | 407 | ||
408 | if(info.current_status && (info.valid & ACPI_VALID_HID) && | 408 | if (info.current_status && (info.valid & ACPI_VALID_HID) && |
409 | (!strcmp(info.hardware_id.value, IBM_HARDWARE_ID1) || | 409 | (!strcmp(info.hardware_id.value, IBM_HARDWARE_ID1) || |
410 | !strcmp(info.hardware_id.value, IBM_HARDWARE_ID2))) { | 410 | !strcmp(info.hardware_id.value, IBM_HARDWARE_ID2))) { |
411 | dbg("found hardware: %s, handle: %p\n", info.hardware_id.value, | 411 | dbg("found hardware: %s, handle: %p\n", info.hardware_id.value, |
@@ -449,13 +449,11 @@ static int __init ibm_acpiphp_init(void) | |||
449 | } | 449 | } |
450 | 450 | ||
451 | ibm_note.device = device; | 451 | ibm_note.device = device; |
452 | status = acpi_install_notify_handler( | 452 | status = acpi_install_notify_handler(ibm_acpi_handle, |
453 | ibm_acpi_handle, | 453 | ACPI_DEVICE_NOTIFY, ibm_handle_events, |
454 | ACPI_DEVICE_NOTIFY, | ||
455 | ibm_handle_events, | ||
456 | &ibm_note); | 454 | &ibm_note); |
457 | if (ACPI_FAILURE(status)) { | 455 | if (ACPI_FAILURE(status)) { |
458 | err("%s: Failed to register notification handler\n", | 456 | err("%s: Failed to register notification handler\n", |
459 | __FUNCTION__); | 457 | __FUNCTION__); |
460 | retval = -EBUSY; | 458 | retval = -EBUSY; |
461 | goto init_cleanup; | 459 | goto init_cleanup; |
@@ -482,14 +480,13 @@ static void __exit ibm_acpiphp_exit(void) | |||
482 | if (acpiphp_unregister_attention(&ibm_attention_info)) | 480 | if (acpiphp_unregister_attention(&ibm_attention_info)) |
483 | err("%s: attention info deregistration failed", __FUNCTION__); | 481 | err("%s: attention info deregistration failed", __FUNCTION__); |
484 | 482 | ||
485 | status = acpi_remove_notify_handler( | 483 | status = acpi_remove_notify_handler( |
486 | ibm_acpi_handle, | 484 | ibm_acpi_handle, |
487 | ACPI_DEVICE_NOTIFY, | 485 | ACPI_DEVICE_NOTIFY, |
488 | ibm_handle_events); | 486 | ibm_handle_events); |
489 | if (ACPI_FAILURE(status)) | 487 | if (ACPI_FAILURE(status)) |
490 | err("%s: Notification handler removal failed\n", | 488 | err("%s: Notification handler removal failed\n", __FUNCTION__); |
491 | __FUNCTION__); | 489 | /* remove the /sys entries */ |
492 | // remove the /sys entries | ||
493 | if (sysfs_remove_bin_file(sysdir, &ibm_apci_table_attr)) | 490 | if (sysfs_remove_bin_file(sysdir, &ibm_apci_table_attr)) |
494 | err("%s: removal of sysfs file apci_table failed\n", | 491 | err("%s: removal of sysfs file apci_table failed\n", |
495 | __FUNCTION__); | 492 | __FUNCTION__); |