Commit 5993c467 authored by Yinghai Lu's avatar Yinghai Lu Committed by Rafael J. Wysocki
Browse files

ACPI: update ej_event interface to take acpi_device 



Should use acpi_device pointer directly instead of use handle and
get the device pointer again later.

Signed-off-by: default avatarYinghai Lu <yinghai@kernel.org>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 05404d8f

drivers/acpi/acpi_memhotplug.c

+1 −1
Original line number Diff line number Diff line
@@ -361,7 +361,7 @@ static void acpi_memory_device_notify(acpi_handle handle, u32 event, void *data) 
			break;

		}



		ej_event->handle = handle;

		ej_event->device = device;

		ej_event->event = ACPI_NOTIFY_EJECT_REQUEST;

		acpi_os_hotplug_execute(acpi_bus_hot_remove_device,

					(void *)ej_event);

drivers/acpi/processor_driver.c

+1 −1
Original line number Diff line number Diff line
@@ -733,7 +733,7 @@ static void acpi_processor_hotplug_notify(acpi_handle handle, 
			break;

		}



		ej_event->handle = handle;

		ej_event->device = device;

		ej_event->event = ACPI_NOTIFY_EJECT_REQUEST;

		acpi_os_hotplug_execute(acpi_bus_hot_remove_device,

					(void *)ej_event);

drivers/acpi/scan.c

+4 −10
Original line number Diff line number Diff line
@@ -116,20 +116,14 @@ static DEVICE_ATTR(modalias, 0444, acpi_device_modalias_show, NULL); 
void acpi_bus_hot_remove_device(void *context)

{

	struct acpi_eject_event *ej_event = (struct acpi_eject_event *) context;

	struct acpi_device *device;

	acpi_handle handle = ej_event->handle;

	struct acpi_device *device = ej_event->device;

	acpi_handle handle = device->handle;

	acpi_handle temp;

	struct acpi_object_list arg_list;

	union acpi_object arg;

	acpi_status status = AE_OK;

	u32 ost_code = ACPI_OST_SC_NON_SPECIFIC_FAILURE; /* default */



	if (acpi_bus_get_device(handle, &device))

		goto err_out;



	if (!device)

		goto err_out;



	ACPI_DEBUG_PRINT((ACPI_DB_INFO,

		"Hot-removing device %s...\n", dev_name(&device->dev)));
@@ -215,7 +209,7 @@ acpi_eject_store(struct device *d, struct device_attribute *attr, 
		goto err;

	}



	ej_event->handle = acpi_device->handle;

	ej_event->device = acpi_device;

	if (acpi_device->flags.eject_pending) {

		/* event originated from ACPI eject notification */

		ej_event->event = ACPI_NOTIFY_EJECT_REQUEST;
@@ -223,7 +217,7 @@ acpi_eject_store(struct device *d, struct device_attribute *attr, 
	} else {

		/* event originated from user */

		ej_event->event = ACPI_OST_EC_OSPM_EJECT;

		(void) acpi_evaluate_hotplug_ost(ej_event->handle,

		(void) acpi_evaluate_hotplug_ost(acpi_device->handle,

			ej_event->event, ACPI_OST_SC_EJECT_IN_PROGRESS, NULL);

	}

include/acpi/acpi_bus.h

+1 −1
Original line number Diff line number Diff line
@@ -306,7 +306,7 @@ struct acpi_bus_event { 
};



struct acpi_eject_event {

	acpi_handle	handle;

	struct acpi_device	*device;

	u32		event;

};