From patchwork Fri Jun 28 13:46:20 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Guthro X-Patchwork-Id: 2799341 Return-Path: X-Original-To: patchwork-linux-acpi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id D93B29F245 for ; Fri, 28 Jun 2013 13:46:57 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A95332018C for ; Fri, 28 Jun 2013 13:46:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8724620177 for ; Fri, 28 Jun 2013 13:46:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754738Ab3F1Nql (ORCPT ); Fri, 28 Jun 2013 09:46:41 -0400 Received: from smtp02.citrix.com ([66.165.176.63]:14174 "EHLO SMTP02.CITRIX.COM" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754733Ab3F1Nqj (ORCPT ); Fri, 28 Jun 2013 09:46:39 -0400 X-IronPort-AV: E=Sophos;i="4.87,958,1363132800"; d="scan'208";a="32455835" Received: from accessns.citrite.net (HELO FTLPEX01CL01.citrite.net) ([10.9.154.239]) by FTLPIPO02.CITRIX.COM with ESMTP/TLS/AES128-SHA; 28 Jun 2013 13:46:39 +0000 Received: from citrite.net (10.204.241.11) by FTLPEX01CL01.citrite.net (10.13.107.78) with Microsoft SMTP Server id 14.2.342.4; Fri, 28 Jun 2013 09:46:38 -0400 From: Ben Guthro To: Konrad Rzeszutek Wilk , Jan Beulich , "Rafael J . Wysocki" , , , CC: Ben Guthro , Bob Moore 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 Message-ID: <1372427184-6197-2-git-send-email-benjamin.guthro@citrix.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1372427184-6197-1-git-send-email-benjamin.guthro@citrix.com> References: <1372427184-6197-1-git-send-email-benjamin.guthro@citrix.com> MIME-Version: 1.0 X-Originating-IP: [10.204.241.11] Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Spam-Status: No, score=-8.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 Cc: Rafael J. Wysocki Cc: Bob Moore Reviewed-by: Konrad Rzeszutek Wilk --- 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 -#include #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