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

Commit 2e199192 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

ACPI: Drop removal_type field from struct acpi_device 



The ACPI processor driver was the only user of the removal_type
field in struct acpi_device, but it doesn't use that field any more
after recent changes.  Thus, removal_type has no more users, so drop
it along with the associated data type.

Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: default avatarToshi Kani <toshi.kani@hp.com>
parent b2c064b2

drivers/acpi/scan.c

+0 −2
Original line number Diff line number Diff line
@@ -1036,7 +1036,6 @@ int acpi_device_add(struct acpi_device *device, 
		printk(KERN_ERR PREFIX "Error creating sysfs interface for device %s\n",

		       dev_name(&device->dev));



	device->removal_type = ACPI_BUS_REMOVAL_NORMAL;

	return 0;



 err:
@@ -2025,7 +2024,6 @@ static acpi_status acpi_bus_device_detach(acpi_handle handle, u32 lvl_not_used, 
	if (!acpi_bus_get_device(handle, &device)) {

		struct acpi_scan_handler *dev_handler = device->handler;



		device->removal_type = ACPI_BUS_REMOVAL_EJECT;

		if (dev_handler) {

			if (dev_handler->detach)

				dev_handler->detach(device);

include/acpi/acpi_bus.h

+0 −8
Original line number Diff line number Diff line
@@ -63,13 +63,6 @@ acpi_get_physical_device_location(acpi_handle handle, struct acpi_pld_info **pld 
#define ACPI_BUS_FILE_ROOT	"acpi"

extern struct proc_dir_entry *acpi_root_dir;



enum acpi_bus_removal_type {

	ACPI_BUS_REMOVAL_NORMAL = 0,

	ACPI_BUS_REMOVAL_EJECT,

	ACPI_BUS_REMOVAL_SUPRISE,

	ACPI_BUS_REMOVAL_TYPE_COUNT

};



enum acpi_bus_device_type {

	ACPI_BUS_TYPE_DEVICE = 0,

	ACPI_BUS_TYPE_POWER,
@@ -311,7 +304,6 @@ struct acpi_device { 
	struct acpi_driver *driver;

	void *driver_data;

	struct device dev;

	enum acpi_bus_removal_type removal_type;	/* indicate for different removal type */

	u8 physical_node_count;

	struct list_head physical_node_list;

	struct mutex physical_node_lock;