ACPI: add acpi_bus_removal_type in acpi_device
Subsystems (2)
PATCH 9/14 ACPI: add acpi_bus_removal_type in acpi_device
From: Li Shaohua <[email protected]>
Add removal_type in structure acpi_device for hot removal.
ACPI_BUS_REMOVAL_EJECT is used for ACPI device hot removal. Only one parameter is allowed in .remove method due to driver model. So removal_type is added to indicate different removal type.
Signed-off-by Zhang Rui <[email protected]>
Signed-off-by Len Brown <[email protected]>
--- drivers/acpi/scan.c | 6 ++++-- include/acpi/acpi_bus.h | 1 + 2 files changed, 5 insertions(+), 2 deletions(-)
drivers/acpi/scan.c +4 -2
@@ -229,9 +229,9 @@ static int acpi_device_remove(struct devif (acpi_drv) {if (acpi_drv->ops.stop) - acpi_drv->ops.stop (acpi_dev,ACPI_BUS_REMOVAL_NORMAL ); + acpi_drv->ops.stop (acpi_dev, acpi_dev->removal_type);if (acpi_drv->ops.remove) - acpi_drv->ops.remove (acpi_dev,ACPI_BUS_REMOVAL_NORMAL ); + acpi_drv->ops.remove (acpi_dev, acpi_dev->removal_type); } acpi_dev->driver =NULL ;acpi_driver_data (dev) =NULL ;
@@ -294,6 +294,7 @@ static void acpi_device_register(structdevice_add (&device->dev);acpi_device_setup_files (device); + device->removal_type =ACPI_BUS_REMOVAL_NORMAL ; }static void acpi_device_unregister (struct acpi_device *device,int type)
@@ -859,6 +860,7 @@ static int acpi_bus_remove(struct acpi_dif (!dev)return -EINVAL ; + dev->removal_type =ACPI_BUS_REMOVAL_EJECT ;device_release_driver (&dev->dev);if (!rmdevice)
include/acpi/acpi_bus.h +1 -0
@@ -301,6 +301,7 @@ struct acpi_device {void *driver_data;struct device dev;struct acpi_bus_ops bus_ops;/* workaround for different code path for hotplug */ +enum acpi_bus_removal_type removal_type;/* indicate for different removal type */ };#define acpi_driver_data (d) ((d)->driver_data)
Signature · 1 line
1.4.4.g59427