Commit 49383700 authored by Len Brown's avatar Len Brown
Browse files

Merge branch 'driver-ops-cleanup' into release

parents e857b33d 8308e8ab
...@@ -397,22 +397,10 @@ static int acpi_device_remove(struct device * dev) ...@@ -397,22 +397,10 @@ static int acpi_device_remove(struct device * dev)
return 0; 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 = { struct bus_type acpi_bus_type = {
.name = "acpi", .name = "acpi",
.suspend = acpi_device_suspend, .suspend = acpi_device_suspend,
.resume = acpi_device_resume, .resume = acpi_device_resume,
.shutdown = acpi_device_shutdown,
.match = acpi_bus_match, .match = acpi_bus_match,
.probe = acpi_device_probe, .probe = acpi_device_probe,
.remove = acpi_device_remove, .remove = acpi_device_remove,
......
...@@ -88,44 +88,28 @@ struct acpi_device; ...@@ -88,44 +88,28 @@ struct acpi_device;
typedef int (*acpi_op_add) (struct acpi_device * 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_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_start) (struct acpi_device * device);
typedef int (*acpi_op_stop) (struct acpi_device * device, int type); typedef int (*acpi_op_stop) (struct acpi_device * device, int type);
typedef int (*acpi_op_suspend) (struct acpi_device * device, typedef int (*acpi_op_suspend) (struct acpi_device * device,
pm_message_t state); pm_message_t state);
typedef int (*acpi_op_resume) (struct acpi_device * device); 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_bind) (struct acpi_device * device);
typedef int (*acpi_op_unbind) (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 { struct acpi_bus_ops {
u32 acpi_op_add:1; u32 acpi_op_add:1;
u32 acpi_op_remove:1;
u32 acpi_op_lock:1;
u32 acpi_op_start: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 { struct acpi_device_ops {
acpi_op_add add; acpi_op_add add;
acpi_op_remove remove; acpi_op_remove remove;
acpi_op_lock lock;
acpi_op_start start; acpi_op_start start;
acpi_op_stop stop; acpi_op_stop stop;
acpi_op_suspend suspend; acpi_op_suspend suspend;
acpi_op_resume resume; acpi_op_resume resume;
acpi_op_scan scan;
acpi_op_bind bind; acpi_op_bind bind;
acpi_op_unbind unbind; acpi_op_unbind unbind;
acpi_op_shutdown shutdown;
}; };
struct acpi_driver { struct acpi_driver {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment