From: Jiang Liu <jiang.liu@linux.intel.com>
To: "Rafael J. Wysocki" <rjw@rjwysocki.net>, Toshi Kani <toshi.kani@hp.com>
Cc: "Rafael J . Wysocki" <rafael.j.wysocki@intel.com>,
Lv Zheng <lv.zheng@intel.com>, Len Brown <lenb@kernel.org>,
Robert Moore <robert.moore@intel.com>,
Tony Luck <tony.luck@intel.com>,
linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org,
devel@acpica.org
Subject: Re: [PATCH] ACPI: Drop acpi_evaluate_hotplug_ost() and ACPI_HOTPLUG_OST
Date: Fri, 21 Feb 2014 13:58:24 +0800 [thread overview]
Message-ID: <5306EB00.1090108@linux.intel.com> (raw)
In-Reply-To: <60567343.brKB2SuRkR@vostro.rjw.lan>
Hi Rafael,
I failed to get the point to kill ACPI_HOTPLUG_OST altogether:(
Should I merge it into my series and resend?
Hi Toshi,
Any comments here?
On 2014/2/21 8:19, Rafael J. Wysocki wrote:
> On Wednesday, February 19, 2014 02:02:15 PM Jiang Liu wrote:
>> Rename acpi_evaluate_hotplug_ost() to acpi_evaluate_ost() for later resue.
>>
>> Signed-off-by: Jiang Liu <jiang.liu@linux.intel.com>
>
> Below is a patch replacing acpi_evaluate_hotplug_ost() with acpi_evaluate_ost()
> and dropping the ACPI_HOTPLUG_OST which I don't believe is necessary at all.
>
> On top of the current linux-next and your series.
>
> Thanks,
> Rafael
>
> ---
> From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
> Subject: ACPI: Drop acpi_evaluate_hotplug_ost() and ACPI_HOTPLUG_OST
>
> Replace acpi_evaluate_hotplug_ost() with acpi_evaluate_ost()
> everywhere and drop the ACPI_HOTPLUG_OST symbol so that hotplug
> _OST is supported unconditionally.
>
> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
> ---
> drivers/acpi/bus.c | 4 +---
> drivers/acpi/scan.c | 10 +++++-----
> drivers/acpi/utils.c | 2 +-
> drivers/xen/xen-acpi-cpuhotplug.c | 2 +-
> drivers/xen/xen-acpi-memhotplug.c | 2 +-
> include/acpi/acpi_bus.h | 8 --------
> 6 files changed, 9 insertions(+), 19 deletions(-)
>
> Index: linux-pm/drivers/acpi/bus.c
> ===================================================================
> --- linux-pm.orig/drivers/acpi/bus.c
> +++ linux-pm/drivers/acpi/bus.c
> @@ -311,9 +311,7 @@ static void acpi_bus_osc_support(void)
> capbuf[OSC_SUPPORT_DWORD] |= OSC_SB_PPC_OST_SUPPORT;
> #endif
>
> -#ifdef ACPI_HOTPLUG_OST
> capbuf[OSC_SUPPORT_DWORD] |= OSC_SB_HOTPLUG_OST_SUPPORT;
> -#endif
>
> if (!ghes_disable)
> capbuf[OSC_SUPPORT_DWORD] |= OSC_SB_APEI_SUPPORT;
> @@ -410,7 +408,7 @@ static void acpi_bus_notify(acpi_handle
> return;
>
> err:
> - acpi_evaluate_hotplug_ost(handle, type, ost_code, NULL);
> + acpi_evaluate_ost(handle, type, ost_code, NULL);
> }
>
> /* --------------------------------------------------------------------------
> Index: linux-pm/include/acpi/acpi_bus.h
> ===================================================================
> --- linux-pm.orig/include/acpi/acpi_bus.h
> +++ linux-pm/include/acpi/acpi_bus.h
> @@ -51,14 +51,6 @@ acpi_evaluate_reference(acpi_handle hand
> acpi_status
> acpi_evaluate_ost(acpi_handle handle, u32 source_event, u32 status_code,
> struct acpi_buffer *status_buf);
> -#ifdef ACPI_HOTPLUG_OST
> -#define acpi_evaluate_hotplug_ost acpi_evaluate_ost
> -#else
> -static inline acpi_status
> -acpi_evaluate_hotplug_ost(acpi_handle handle, u32 source_event,
> - u32 status_code, struct acpi_buffer *status_buf)
> -{ return AE_OK; }
> -#endif
>
> acpi_status
> acpi_get_physical_device_location(acpi_handle handle, struct acpi_pld_info **pld);
> Index: linux-pm/drivers/acpi/scan.c
> ===================================================================
> --- linux-pm.orig/drivers/acpi/scan.c
> +++ linux-pm/drivers/acpi/scan.c
> @@ -463,8 +463,8 @@ static int acpi_generic_hotplug_event(st
> dev_info(&adev->dev, "Eject disabled\n");
> return -EPERM;
> }
> - acpi_evaluate_hotplug_ost(adev->handle, ACPI_NOTIFY_EJECT_REQUEST,
> - ACPI_OST_SC_EJECT_IN_PROGRESS, NULL);
> + acpi_evaluate_ost(adev->handle, ACPI_NOTIFY_EJECT_REQUEST,
> + ACPI_OST_SC_EJECT_IN_PROGRESS, NULL);
> return acpi_scan_hot_remove(adev);
> }
> return -EINVAL;
> @@ -514,7 +514,7 @@ void acpi_device_hotplug(void *data, u32
> ost_code = ACPI_OST_SC_SUCCESS;
>
> err_out:
> - acpi_evaluate_hotplug_ost(adev->handle, src, ost_code, NULL);
> + acpi_evaluate_ost(adev->handle, src, ost_code, NULL);
>
> out:
> acpi_bus_put_acpi_device(adev);
> @@ -574,8 +574,8 @@ acpi_eject_store(struct device *d, struc
> return count;
>
> put_device(&acpi_device->dev);
> - acpi_evaluate_hotplug_ost(acpi_device->handle, ACPI_OST_EC_OSPM_EJECT,
> - ACPI_OST_SC_NON_SPECIFIC_FAILURE, NULL);
> + acpi_evaluate_ost(acpi_device->handle, ACPI_OST_EC_OSPM_EJECT,
> + ACPI_OST_SC_NON_SPECIFIC_FAILURE, NULL);
> return status == AE_NO_MEMORY ? -ENOMEM : -EAGAIN;
> }
>
> Index: linux-pm/drivers/acpi/utils.c
> ===================================================================
> --- linux-pm.orig/drivers/acpi/utils.c
> +++ linux-pm/drivers/acpi/utils.c
> @@ -422,7 +422,7 @@ out:
> EXPORT_SYMBOL(acpi_get_physical_device_location);
>
> /**
> - * acpi_evaluate_hotplug_ost: Evaluate _OST for hotplug operations
> + * acpi_evaluate_ost: Evaluate _OST for hotplug operations
> * @handle: ACPI device handle
> * @source_event: source event code
> * @status_code: status code
> Index: linux-pm/drivers/xen/xen-acpi-cpuhotplug.c
> ===================================================================
> --- linux-pm.orig/drivers/xen/xen-acpi-cpuhotplug.c
> +++ linux-pm/drivers/xen/xen-acpi-cpuhotplug.c
> @@ -313,7 +313,7 @@ static void acpi_processor_hotplug_notif
> goto out;
> }
>
> - (void) acpi_evaluate_hotplug_ost(handle, event, ost_code, NULL);
> + (void) acpi_evaluate_ost(handle, event, ost_code, NULL);
>
> out:
> acpi_scan_lock_release();
> Index: linux-pm/drivers/xen/xen-acpi-memhotplug.c
> ===================================================================
> --- linux-pm.orig/drivers/xen/xen-acpi-memhotplug.c
> +++ linux-pm/drivers/xen/xen-acpi-memhotplug.c
> @@ -285,7 +285,7 @@ static void acpi_memory_device_notify(ac
> return;
> }
>
> - (void) acpi_evaluate_hotplug_ost(handle, event, ost_code, NULL);
> + (void) acpi_evaluate_ost(handle, event, ost_code, NULL);
> return;
> }
>
>
next prev parent reply other threads:[~2014-02-21 5:58 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-19 6:02 [Patch v2 1/5] ACPI: rename acpi_evaluate_hotplug_ost to acpi_evaluate_ost for reuse Jiang Liu
2014-02-19 6:02 ` [Patch v2 2/5] acpi_pad: use acpi_evaluate_ost() to replace open-coded version Jiang Liu
2014-02-19 6:02 ` [Patch v2 3/5] xen, " Jiang Liu
2014-02-19 17:38 ` Konrad Rzeszutek Wilk
2014-02-19 17:38 ` Konrad Rzeszutek Wilk
2014-02-19 6:02 ` Jiang Liu
2014-02-19 6:02 ` [Patch v2 4/5] acpi_processor: " Jiang Liu
2014-02-19 6:02 ` [Patch v2 5/5] ACPI: use device name LNXSYBUS.xx for ACPI \_SB and \_TZ objects Jiang Liu
2014-02-21 0:19 ` [PATCH] ACPI: Drop acpi_evaluate_hotplug_ost() and ACPI_HOTPLUG_OST Rafael J. Wysocki
2014-02-21 5:58 ` Jiang Liu [this message]
2014-02-21 16:31 ` Toshi Kani
2014-02-21 17:03 ` Rafael J. Wysocki
2014-02-21 16:44 ` Rafael J. Wysocki
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5306EB00.1090108@linux.intel.com \
--to=jiang.liu@linux.intel.com \
--cc=devel@acpica.org \
--cc=lenb@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lv.zheng@intel.com \
--cc=rafael.j.wysocki@intel.com \
--cc=rjw@rjwysocki.net \
--cc=robert.moore@intel.com \
--cc=tony.luck@intel.com \
--cc=toshi.kani@hp.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.