From: Ben Guthro <benjamin.guthro@citrix.com> To: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>, Jan Beulich <jbeulich@suse.com>, "Rafael J . Wysocki" <rjw@sisk.pl>, linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org, xen-devel@lists.xen.org Cc: Ben Guthro <benjamin.guthro@citrix.com>, Bob Moore <robert.moore@intel.com> Subject: [PATCH v5 1/5] acpi: Remove need to include linux/acpi.h in common acpica code Date: Fri, 28 Jun 2013 09:46:20 -0400 [thread overview] Message-ID: <1372427184-6197-2-git-send-email-benjamin.guthro@citrix.com> (raw) In-Reply-To: <1372427184-6197-1-git-send-email-benjamin.guthro@citrix.com> Move the definition of acpi_os_prepare_sleep into the OS services layer header, and remove the include of linux/acpi.h from common acpica code. Signed-off-by: Ben Guthro <benjamin.guthro@citrix.com> Cc: Rafael J. Wysocki <rjw@sisk.pl> Cc: Bob Moore <robert.moore@intel.com> --- drivers/acpi/acpica/hwsleep.c | 1 - include/acpi/acpiosxf.h | 6 ++++++ include/linux/acpi.h | 3 --- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/acpi/acpica/hwsleep.c b/drivers/acpi/acpica/hwsleep.c index e3828cc..867b947 100644 --- a/drivers/acpi/acpica/hwsleep.c +++ b/drivers/acpi/acpica/hwsleep.c @@ -43,7 +43,6 @@ */ #include <acpi/acpi.h> -#include <linux/acpi.h> #include "accommon.h" #define _COMPONENT ACPI_HARDWARE diff --git a/include/acpi/acpiosxf.h b/include/acpi/acpiosxf.h index 5b3d2bd..c68b779 100644 --- a/include/acpi/acpiosxf.h +++ b/include/acpi/acpiosxf.h @@ -276,4 +276,10 @@ char *acpi_os_get_next_filename(void *dir_handle); void acpi_os_close_directory(void *dir_handle); +/* + * ACPI sleep preparation + */ +acpi_status acpi_os_prepare_sleep(u8 sleep_state, + u32 pm1a_control, u32 pm1b_control); + #endif /* __ACPIOSXF_H__ */ diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 17b5b59..709a2f2 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -479,9 +479,6 @@ static inline bool acpi_driver_match_device(struct device *dev, #ifdef CONFIG_ACPI void acpi_os_set_prepare_sleep(int (*func)(u8 sleep_state, u32 pm1a_ctrl, u32 pm1b_ctrl)); - -acpi_status acpi_os_prepare_sleep(u8 sleep_state, - u32 pm1a_control, u32 pm1b_control); #ifdef CONFIG_X86 void arch_reserve_mem_area(acpi_physical_address addr, size_t size); #else -- 1.7.9.5
WARNING: multiple messages have this Message-ID (diff)
From: Ben Guthro <benjamin.guthro@citrix.com> To: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>, Jan Beulich <jbeulich@suse.com>, "Rafael J . Wysocki" <rjw@sisk.pl>, <linux-kernel@vger.kernel.org>, <linux-acpi@vger.kernel.org>, <xen-devel@lists.xen.org> Cc: Ben Guthro <benjamin.guthro@citrix.com>, Bob Moore <robert.moore@intel.com> Subject: [PATCH v5 1/5] acpi: Remove need to include linux/acpi.h in common acpica code Date: Fri, 28 Jun 2013 09:46:20 -0400 [thread overview] Message-ID: <1372427184-6197-2-git-send-email-benjamin.guthro@citrix.com> (raw) In-Reply-To: <1372427184-6197-1-git-send-email-benjamin.guthro@citrix.com> Move the definition of acpi_os_prepare_sleep into the OS services layer header, and remove the include of linux/acpi.h from common acpica code. Signed-off-by: Ben Guthro <benjamin.guthro@citrix.com> Cc: Rafael J. Wysocki <rjw@sisk.pl> Cc: Bob Moore <robert.moore@intel.com> --- drivers/acpi/acpica/hwsleep.c | 1 - include/acpi/acpiosxf.h | 6 ++++++ include/linux/acpi.h | 3 --- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/acpi/acpica/hwsleep.c b/drivers/acpi/acpica/hwsleep.c index e3828cc..867b947 100644 --- a/drivers/acpi/acpica/hwsleep.c +++ b/drivers/acpi/acpica/hwsleep.c @@ -43,7 +43,6 @@ */ #include <acpi/acpi.h> -#include <linux/acpi.h> #include "accommon.h" #define _COMPONENT ACPI_HARDWARE diff --git a/include/acpi/acpiosxf.h b/include/acpi/acpiosxf.h index 5b3d2bd..c68b779 100644 --- a/include/acpi/acpiosxf.h +++ b/include/acpi/acpiosxf.h @@ -276,4 +276,10 @@ char *acpi_os_get_next_filename(void *dir_handle); void acpi_os_close_directory(void *dir_handle); +/* + * ACPI sleep preparation + */ +acpi_status acpi_os_prepare_sleep(u8 sleep_state, + u32 pm1a_control, u32 pm1b_control); + #endif /* __ACPIOSXF_H__ */ diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 17b5b59..709a2f2 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -479,9 +479,6 @@ static inline bool acpi_driver_match_device(struct device *dev, #ifdef CONFIG_ACPI void acpi_os_set_prepare_sleep(int (*func)(u8 sleep_state, u32 pm1a_ctrl, u32 pm1b_ctrl)); - -acpi_status acpi_os_prepare_sleep(u8 sleep_state, - u32 pm1a_control, u32 pm1b_control); #ifdef CONFIG_X86 void arch_reserve_mem_area(acpi_physical_address addr, size_t size); #else -- 1.7.9.5
next prev parent reply other threads:[~2013-06-28 13:46 UTC|newest] Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top 2013-06-28 13:46 [PATCH v5 0/5] Xen/ACPI: support sleep state entering on hardware reduced systems Ben Guthro 2013-06-28 13:46 ` Ben Guthro 2013-06-28 13:46 ` Ben Guthro [this message] 2013-06-28 13:46 ` [PATCH v5 1/5] acpi: Remove need to include linux/acpi.h in common acpica code Ben Guthro 2013-06-28 16:07 ` Konrad Rzeszutek Wilk 2013-06-28 16:07 ` Konrad Rzeszutek Wilk 2013-06-28 13:46 ` Ben Guthro 2013-06-28 13:46 ` [PATCH v5 2/5] acpi: Call acpi_os_prepare_sleep hook in reduced hardware sleep path Ben Guthro 2013-06-28 13:46 ` Ben Guthro 2013-06-28 16:06 ` Konrad Rzeszutek Wilk 2013-06-28 16:06 ` Konrad Rzeszutek Wilk 2013-06-28 13:46 ` [PATCH v5 3/5] acpi: Adjust linux acpi OS functions to new extended parameter Ben Guthro 2013-06-28 13:46 ` Ben Guthro 2013-06-28 16:03 ` Konrad Rzeszutek Wilk 2013-06-28 16:03 ` Konrad Rzeszutek Wilk 2013-06-28 16:15 ` Ben Guthro 2013-06-28 16:15 ` Ben Guthro 2013-06-28 16:15 ` Ben Guthro 2013-06-28 13:46 ` [PATCH v5 4/5] x86/tboot: Fail extended mode reduced hardware sleep Ben Guthro 2013-06-28 13:46 ` Ben Guthro 2013-06-28 16:05 ` Konrad Rzeszutek Wilk 2013-06-28 16:05 ` Konrad Rzeszutek Wilk 2013-06-28 16:05 ` Konrad Rzeszutek Wilk 2013-06-28 13:46 ` Ben Guthro 2013-06-28 13:46 ` [PATCH v5 5/5] xen/acpi: notify xen when reduced hardware sleep is available Ben Guthro 2013-06-28 13:46 ` Ben Guthro 2013-06-28 16:05 ` Konrad Rzeszutek Wilk 2013-06-28 16:05 ` Konrad Rzeszutek Wilk 2013-06-28 13:46 ` Ben Guthro 2013-07-27 14:05 ` [PATCH v5 0/5] Xen/ACPI: support sleep state entering on hardware reduced systems Rafael J. Wysocki 2013-07-27 14:05 ` 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=1372427184-6197-2-git-send-email-benjamin.guthro@citrix.com \ --to=benjamin.guthro@citrix.com \ --cc=jbeulich@suse.com \ --cc=konrad.wilk@oracle.com \ --cc=linux-acpi@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=rjw@sisk.pl \ --cc=robert.moore@intel.com \ --cc=xen-devel@lists.xen.org \ /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: linkBe 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.