diff options
author | Li Shaohua <shaohua.li@intel.com> | 2006-12-07 07:56:46 -0500 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2006-12-15 23:38:35 -0500 |
commit | 96333578b023957537c3e98b50af7f3b7e08e411 (patch) | |
tree | 005686677555152dfe51c0edd5273a665c9d5aca /drivers/acpi/scan.c | |
parent | c4168bff32e218b8400cb48b48adb9b7f7bb31b8 (diff) |
ACPI: add acpi_bus_removal_type in acpi_device
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 <rui.zhang@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/scan.c')
-rw-r--r-- | drivers/acpi/scan.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index 2a82645c9dfe..06b86faf037f 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c | |||
@@ -229,9 +229,9 @@ static int acpi_device_remove(struct device * dev) | |||
229 | 229 | ||
230 | if (acpi_drv) { | 230 | if (acpi_drv) { |
231 | if (acpi_drv->ops.stop) | 231 | if (acpi_drv->ops.stop) |
232 | acpi_drv->ops.stop(acpi_dev, ACPI_BUS_REMOVAL_NORMAL); | 232 | acpi_drv->ops.stop(acpi_dev, acpi_dev->removal_type); |
233 | if (acpi_drv->ops.remove) | 233 | if (acpi_drv->ops.remove) |
234 | acpi_drv->ops.remove(acpi_dev, ACPI_BUS_REMOVAL_NORMAL); | 234 | acpi_drv->ops.remove(acpi_dev, acpi_dev->removal_type); |
235 | } | 235 | } |
236 | acpi_dev->driver = NULL; | 236 | acpi_dev->driver = NULL; |
237 | acpi_driver_data(dev) = NULL; | 237 | acpi_driver_data(dev) = NULL; |
@@ -294,6 +294,7 @@ static void acpi_device_register(struct acpi_device *device, | |||
294 | device_add(&device->dev); | 294 | device_add(&device->dev); |
295 | 295 | ||
296 | acpi_device_setup_files(device); | 296 | acpi_device_setup_files(device); |
297 | device->removal_type = ACPI_BUS_REMOVAL_NORMAL; | ||
297 | } | 298 | } |
298 | 299 | ||
299 | static void acpi_device_unregister(struct acpi_device *device, int type) | 300 | static void acpi_device_unregister(struct acpi_device *device, int type) |
@@ -859,6 +860,7 @@ static int acpi_bus_remove(struct acpi_device *dev, int rmdevice) | |||
859 | if (!dev) | 860 | if (!dev) |
860 | return -EINVAL; | 861 | return -EINVAL; |
861 | 862 | ||
863 | dev->removal_type = ACPI_BUS_REMOVAL_EJECT; | ||
862 | device_release_driver(&dev->dev); | 864 | device_release_driver(&dev->dev); |
863 | 865 | ||
864 | if (!rmdevice) | 866 | if (!rmdevice) |