aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-05-23 04:40:35 -0400
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-06-01 15:37:09 -0400
commit2e199192df85eb936a7829dc28b57b85c59c86fc (patch)
treebf93999126c4b8471cd337f8970cc9a013ac34a4
parentb2c064b25ad07169b2892a733918e6b941bf3366 (diff)
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: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Acked-by: Toshi Kani <toshi.kani@hp.com>
-rw-r--r--drivers/acpi/scan.c2
-rw-r--r--include/acpi/acpi_bus.h8
2 files changed, 0 insertions, 10 deletions
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index ad82bb2a37e0..ba8ee6cbf0f1 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -1036,7 +1036,6 @@ int acpi_device_add(struct acpi_device *device,
1036 printk(KERN_ERR PREFIX "Error creating sysfs interface for device %s\n", 1036 printk(KERN_ERR PREFIX "Error creating sysfs interface for device %s\n",
1037 dev_name(&device->dev)); 1037 dev_name(&device->dev));
1038 1038
1039 device->removal_type = ACPI_BUS_REMOVAL_NORMAL;
1040 return 0; 1039 return 0;
1041 1040
1042 err: 1041 err:
@@ -2025,7 +2024,6 @@ static acpi_status acpi_bus_device_detach(acpi_handle handle, u32 lvl_not_used,
2025 if (!acpi_bus_get_device(handle, &device)) { 2024 if (!acpi_bus_get_device(handle, &device)) {
2026 struct acpi_scan_handler *dev_handler = device->handler; 2025 struct acpi_scan_handler *dev_handler = device->handler;
2027 2026
2028 device->removal_type = ACPI_BUS_REMOVAL_EJECT;
2029 if (dev_handler) { 2027 if (dev_handler) {
2030 if (dev_handler->detach) 2028 if (dev_handler->detach)
2031 dev_handler->detach(device); 2029 dev_handler->detach(device);
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
index 4d5d3e7ba33d..1a681ee2aa08 100644
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
@@ -63,13 +63,6 @@ acpi_get_physical_device_location(acpi_handle handle, struct acpi_pld_info **pld
63#define ACPI_BUS_FILE_ROOT "acpi" 63#define ACPI_BUS_FILE_ROOT "acpi"
64extern struct proc_dir_entry *acpi_root_dir; 64extern struct proc_dir_entry *acpi_root_dir;
65 65
66enum acpi_bus_removal_type {
67 ACPI_BUS_REMOVAL_NORMAL = 0,
68 ACPI_BUS_REMOVAL_EJECT,
69 ACPI_BUS_REMOVAL_SUPRISE,
70 ACPI_BUS_REMOVAL_TYPE_COUNT
71};
72
73enum acpi_bus_device_type { 66enum acpi_bus_device_type {
74 ACPI_BUS_TYPE_DEVICE = 0, 67 ACPI_BUS_TYPE_DEVICE = 0,
75 ACPI_BUS_TYPE_POWER, 68 ACPI_BUS_TYPE_POWER,
@@ -311,7 +304,6 @@ struct acpi_device {
311 struct acpi_driver *driver; 304 struct acpi_driver *driver;
312 void *driver_data; 305 void *driver_data;
313 struct device dev; 306 struct device dev;
314 enum acpi_bus_removal_type removal_type; /* indicate for different removal type */
315 u8 physical_node_count; 307 u8 physical_node_count;
316 struct list_head physical_node_list; 308 struct list_head physical_node_list;
317 struct mutex physical_node_lock; 309 struct mutex physical_node_lock;