On Friday, January 11, 2013 02:40:41 PM Yinghai Lu wrote:
> Should use acpi_device pointer directly instead of use handle and
> get the device pointer again later.
Looks good.
I can take this one right now if you want.
Thanks,
Rafael
> Signed-off-by: Yinghai Lu <yinghai@xxxxxxxxxx>
> ---
> drivers/acpi/acpi_memhotplug.c | 2 +-
> drivers/acpi/processor_driver.c | 2 +-
> drivers/acpi/scan.c | 14 ++++----------
> include/acpi/acpi_bus.h | 2 +-
> 4 files changed, 7 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/acpi/acpi_memhotplug.c b/drivers/acpi/acpi_memhotplug.c
> index 327ab44..eaddb7a 100644
> --- a/drivers/acpi/acpi_memhotplug.c
> +++ b/drivers/acpi/acpi_memhotplug.c
> @@ -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);
> diff --git a/drivers/acpi/processor_driver.c b/drivers/acpi/processor_driver.c
> index 0777663..a24ee43 100644
> --- a/drivers/acpi/processor_driver.c
> +++ b/drivers/acpi/processor_driver.c
> @@ -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);
> diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
> index 8883539..f4c6305 100644
> --- a/drivers/acpi/scan.c
> +++ b/drivers/acpi/scan.c
> @@ -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);
> }
>
> diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
> index 2246ba9..181ff2d 100644
> --- a/include/acpi/acpi_bus.h
> +++ b/include/acpi/acpi_bus.h
> @@ -309,7 +309,7 @@ struct acpi_bus_event {
> };
>
> struct acpi_eject_event {
> - acpi_handle handle;
> + struct acpi_device *device;
> u32 event;
> };
>
>
--
I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.
--
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
