evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ACPI: add acpi_bus_removal_type in acpi_device

Browse source 
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>
This commit is contained in:
Li Shaohua 2006-12-07 20:56:46 +08:00 • committed by Len Brown
parent c4168bff32
commit 96333578b0
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/acpi/scan.c
View file

@ -229,9 +229,9 @@ static int acpi_device_remove(struct device * dev)
if (acpi_drv) { if (acpi_drv) {
if (acpi_drv->ops.stop) 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) 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_dev->driver = NULL;
acpi_driver_data(dev) = NULL; acpi_driver_data(dev) = NULL;
@ -294,6 +294,7 @@ static void acpi_device_register(struct acpi_device *device,
device_add(&device->dev); device_add(&device->dev);
acpi_device_setup_files(device); acpi_device_setup_files(device);
device->removal_type = ACPI_BUS_REMOVAL_NORMAL;
} }
static void acpi_device_unregister(struct acpi_device *device, int type) 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)
if (!dev) if (!dev)
return -EINVAL; return -EINVAL;
dev->removal_type = ACPI_BUS_REMOVAL_EJECT;
device_release_driver(&dev->dev); device_release_driver(&dev->dev);
if (!rmdevice) if (!rmdevice)

1
include/acpi/acpi_bus.h
View file

@ -301,6 +301,7 @@ struct acpi_device {
void *driver_data; void *driver_data;
struct device dev; struct device dev;
struct acpi_bus_ops bus_ops; /* workaround for different code path for hotplug */ 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) #define acpi_driver_data(d) ((d)->driver_data)