aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/acpi/scan.c5
-rw-r--r--include/acpi/acpi_bus.h2
2 files changed, 0 insertions, 7 deletions
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index 781435d7e369..4a89f081160f 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -426,9 +426,6 @@ static int acpi_device_probe(struct device * dev)
426 if (acpi_drv->ops.notify) { 426 if (acpi_drv->ops.notify) {
427 ret = acpi_device_install_notify_handler(acpi_dev); 427 ret = acpi_device_install_notify_handler(acpi_dev);
428 if (ret) { 428 if (ret) {
429 if (acpi_drv->ops.stop)
430 acpi_drv->ops.stop(acpi_dev,
431 acpi_dev->removal_type);
432 if (acpi_drv->ops.remove) 429 if (acpi_drv->ops.remove)
433 acpi_drv->ops.remove(acpi_dev, 430 acpi_drv->ops.remove(acpi_dev,
434 acpi_dev->removal_type); 431 acpi_dev->removal_type);
@@ -452,8 +449,6 @@ static int acpi_device_remove(struct device * dev)
452 if (acpi_drv) { 449 if (acpi_drv) {
453 if (acpi_drv->ops.notify) 450 if (acpi_drv->ops.notify)
454 acpi_device_remove_notify_handler(acpi_dev); 451 acpi_device_remove_notify_handler(acpi_dev);
455 if (acpi_drv->ops.stop)
456 acpi_drv->ops.stop(acpi_dev, acpi_dev->removal_type);
457 if (acpi_drv->ops.remove) 452 if (acpi_drv->ops.remove)
458 acpi_drv->ops.remove(acpi_dev, acpi_dev->removal_type); 453 acpi_drv->ops.remove(acpi_dev, acpi_dev->removal_type);
459 } 454 }
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
index c65e4ce6c3af..79a6c5ebe908 100644
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
@@ -89,7 +89,6 @@ struct acpi_device;
89typedef int (*acpi_op_add) (struct acpi_device * device); 89typedef int (*acpi_op_add) (struct acpi_device * device);
90typedef int (*acpi_op_remove) (struct acpi_device * device, int type); 90typedef int (*acpi_op_remove) (struct acpi_device * device, int type);
91typedef int (*acpi_op_start) (struct acpi_device * device); 91typedef int (*acpi_op_start) (struct acpi_device * device);
92typedef int (*acpi_op_stop) (struct acpi_device * device, int type);
93typedef int (*acpi_op_suspend) (struct acpi_device * device, 92typedef int (*acpi_op_suspend) (struct acpi_device * device,
94 pm_message_t state); 93 pm_message_t state);
95typedef int (*acpi_op_resume) (struct acpi_device * device); 94typedef int (*acpi_op_resume) (struct acpi_device * device);
@@ -106,7 +105,6 @@ struct acpi_device_ops {
106 acpi_op_add add; 105 acpi_op_add add;
107 acpi_op_remove remove; 106 acpi_op_remove remove;
108 acpi_op_start start; 107 acpi_op_start start;
109 acpi_op_stop stop;
110 acpi_op_suspend suspend; 108 acpi_op_suspend suspend;
111 acpi_op_resume resume; 109 acpi_op_resume resume;
112 acpi_op_bind bind; 110 acpi_op_bind bind;