ACPI: remove unused driver ops and flags
Subsystems (2)
cover ACPI: remove unused driver ops and flags
These patches remove a few unused driver ops and flags.
Comments welcome.
Bjorn Helgaas (3):
ACPI: remove unused acpi_bus_ops flags
ACPI: remove unused acpi_device_ops .shutdown method
ACPI: remove unused acpi_device_ops .lock and .scan methods
drivers/acpi/scan.c | 12 ------------ include/acpi/acpi_bus.h | 16 ---------------- 2 files changed, 0 insertions(+), 28 deletions(-)
PATCH 1/3 ACPI: remove unused acpi_device_ops .lock and .scan methods
No drivers use the .lock and .scan methods, and the Linux/ACPI code doesn't even provide a way to invoke them, so remove them.
--- include/acpi/acpi_bus.h | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-)
include/acpi/acpi_bus.h +0 -4
@@ -88,13 +88,11 @@ struct acpi_device;typedef int (*acpi_op_add ) (struct acpi_device * device);typedef int (*acpi_op_remove ) (struct acpi_device * device,int type); -typedef int (*acpi_op_lock ) (struct acpi_device * device,int type);typedef int (*acpi_op_start ) (struct acpi_device * device);typedef int (*acpi_op_stop ) (struct acpi_device * device,int type);typedef int (*acpi_op_suspend ) (struct acpi_device * device,pm_message_t state);typedef int (*acpi_op_resume ) (struct acpi_device * device); -typedef int (*acpi_op_scan ) (struct acpi_device * device);typedef int (*acpi_op_bind ) (struct acpi_device * device);typedef int (*acpi_op_unbind ) (struct acpi_device * device);typedef int (*acpi_op_shutdown ) (struct acpi_device * device);
@@ -117,12 +115,10 @@ struct acpi_bus_ops {struct acpi_device_ops {acpi_op_add add;acpi_op_remove remove; -acpi_op_lock lock;acpi_op_start start;acpi_op_stop stop;acpi_op_suspend suspend;acpi_op_resume resume; -acpi_op_scan scan;acpi_op_bind bind;acpi_op_unbind unbind;acpi_op_shutdown shutdown;
PATCH 2/3 ACPI: remove unused acpi_device_ops .shutdown method
In reply to Bjorn HelgaasNo drivers use the .shutdown method, so remove it.
--- drivers/acpi/scan.c | 12 ------------ include/acpi/acpi_bus.h | 2 -- 2 files changed, 0 insertions(+), 14 deletions(-)
drivers/acpi/scan.c +0 -12
@@ -397,22 +397,10 @@ static int acpi_device_remove(struct device * dev)return 0 ; } -static void acpi_device_shutdown (struct device *dev) -{ -struct acpi_device *acpi_dev =to_acpi_device (dev); -struct acpi_driver *acpi_drv = acpi_dev->driver; - -if (acpi_drv && acpi_drv->ops.shutdown) - acpi_drv->ops.shutdown (acpi_dev); - -return ; -} -struct bus_type acpi_bus_type = { .name ="acpi" , .suspend = acpi_device_suspend, .resume = acpi_device_resume, - .shutdown = acpi_device_shutdown, .match = acpi_bus_match, .probe = acpi_device_probe, .remove = acpi_device_remove,
include/acpi/acpi_bus.h +0 -2
@@ -95,7 +95,6 @@ typedef int (*acpi_op_suspend) (struct acpi_device * device,typedef int (*acpi_op_resume ) (struct acpi_device * device);typedef int (*acpi_op_bind ) (struct acpi_device * device);typedef int (*acpi_op_unbind ) (struct acpi_device * device); -typedef int (*acpi_op_shutdown ) (struct acpi_device * device);struct acpi_bus_ops {u32 acpi_op_add:1 ;
@@ -121,7 +120,6 @@ struct acpi_device_ops {acpi_op_resume resume;acpi_op_bind bind;acpi_op_unbind unbind; -acpi_op_shutdown shutdown; };struct acpi_driver {
PATCH 3/3 ACPI: remove unused acpi_bus_ops flags
In reply to Bjorn HelgaasIn acpi_bus_ops, only the acpi_op_add and acpi_op_start flags are used, so remove all the rest.
--- include/acpi/acpi_bus.h | 10 ---------- 1 files changed, 0 insertions(+), 10 deletions(-)
include/acpi/acpi_bus.h +0 -10
@@ -98,17 +98,7 @@ typedef int (*acpi_op_unbind) (struct acpi_device * device);struct acpi_bus_ops {u32 acpi_op_add:1 ; -u32 acpi_op_remove:1 ; -u32 acpi_op_lock:1 ;u32 acpi_op_start:1 ; -u32 acpi_op_stop:1 ; -u32 acpi_op_suspend:1 ; -u32 acpi_op_resume:1 ; -u32 acpi_op_scan:1 ; -u32 acpi_op_bind:1 ; -u32 acpi_op_unbind:1 ; -u32 acpi_op_shutdown:1 ; -u32 reserved:21 ; };struct acpi_device_ops {
Quoted 3 lines
These patches remove a few unused driver ops and flags.
Comments welcome.
applied,
thanks,
Len Brown, Intel Open Source Technology Center