Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 96333578 authored by Li Shaohua's avatar Li Shaohua Committed by Len Brown
Browse files

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: default avatarZhang Rui <rui.zhang@intel.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent c4168bff

drivers/acpi/scan.c

+4 −2
Original line number Diff line number Diff line
@@ -229,9 +229,9 @@ static int acpi_device_remove(struct device * dev) 


	if (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(struct acpi_device *device, 
	device_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_device *dev, int rmdevice) 
	if (!dev)

		return -EINVAL;



	dev->removal_type = ACPI_BUS_REMOVAL_EJECT;

	device_release_driver(&dev->dev);



	if (!rmdevice)

include/acpi/acpi_bus.h

+1 −0
Original line number Diff line number Diff line
@@ -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)