From patchwork Fri Nov 22 23:32:01 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lv Zheng X-Patchwork-Id: 3224521 Return-Path: X-Original-To: patchwork-linux-acpi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id D55F7C045B for ; Fri, 22 Nov 2013 23:33:00 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 627A8207A9 for ; Fri, 22 Nov 2013 23:32:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 27F9C207A1 for ; Fri, 22 Nov 2013 23:32:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755761Ab3KVXc4 (ORCPT ); Fri, 22 Nov 2013 18:32:56 -0500 Received: from mail-pb0-f46.google.com ([209.85.160.46]:63454 "EHLO mail-pb0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755588Ab3KVXcz (ORCPT ); Fri, 22 Nov 2013 18:32:55 -0500 Received: by mail-pb0-f46.google.com with SMTP id md12so1949159pbc.5 for ; Fri, 22 Nov 2013 15:32:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ljCc4SwRgE3JXH7rqDUeroXQ8D9TQt8vCrsiQEKiaJg=; b=h0RsfTFxw3mjQ02LnrTws63xpRdw05P8uCkkRDEQShgqkQnHTz+cqUGEzukmBEmQt5 nB2TSjGdpY4nugKAiG+cksSXCLm4A8dta7dl044rBPiUU8XC64tYE/adr9/nEClEQWnT 12S8vbWodPwl7l1+rT7k7MQHpaGliDraSHkmwCPUYpdwQkEyvGBwW285fXmifQCUNWZM B3OYdgwwuTkBcyQw4BSRk5RpsKnm1q0/G/ItoVDduxJ5qQDBQHTTcFVVjWdovF7n7lvc tDxi/bd5HmlWJP042XBKiVSaiIXREyS2tdkSqn+BK8KjAf1ng/QMjL1Wfn0DI1awlSWo mdeQ== X-Received: by 10.67.14.67 with SMTP id fe3mr14763016pad.134.1385163174402; Fri, 22 Nov 2013 15:32:54 -0800 (PST) Received: from localhost.localdomain ([121.76.27.197]) by mx.google.com with ESMTPSA id xs1sm63131871pac.7.2013.11.22.15.32.41 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 22 Nov 2013 15:32:53 -0800 (PST) From: Lv Zheng To: "Rafael J. Wysocki" , Len Brown Cc: Lv Zheng , Lv Zheng , , linux-acpi@vger.kernel.org Subject: [PATCH 3/4] ACPICA: Cleanup inclusions. Date: Sat, 23 Nov 2013 07:32:01 +0800 Message-Id: <32e38589d3ca7b01c13f2390bf49210a02f3ed97.1385094641.git.lv.zheng@intel.com> X-Mailer: git-send-email 1.7.10 In-Reply-To: References: Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Spam-Status: No, score=-7.3 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, 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 From: Lv Zheng This patch cleans up inclusions. 1. For files where is already included, this patch cleans up them by deleting inclusions. Note that if is included before including in the original file, the inclusion of is moved up to avoid issues from happening. 2. The sfi_acpi files have invoked acpi_table_parse(), so this patch converts inclusions into inclusions so that they can find the acpi_parse_table() prototypes. 3. For files where only included, this patch cleans up them by replacing inclusions with . Such files are those include ACPICA headers to find table definitions or ACPICA basic types. 4. For files where no actual ACPICA references, this patch cleans up them by deleting inclusions. Signed-off-by: Lv Zheng --- arch/x86/pci/mmconfig_32.c | 1 - drivers/acpi/apei/einj.c | 1 - drivers/acpi/osl.c | 1 - drivers/char/tpm/tpm_acpi.c | 2 +- drivers/gpu/drm/nouveau/nouveau_acpi.c | 1 - drivers/hwmon/asus_atk0110.c | 1 - drivers/ide/ide-acpi.c | 1 - drivers/iommu/amd_iommu_init.c | 1 - drivers/iommu/intel_irq_remapping.c | 2 +- drivers/pci/hotplug/pciehp.h | 1 - drivers/pci/pci-acpi.c | 1 - drivers/platform/x86/tc1100-wmi.c | 1 - drivers/sfi/sfi_acpi.c | 2 +- include/linux/acpi_io.h | 2 +- include/linux/ide.h | 3 --- include/linux/iscsi_ibft.h | 2 +- include/linux/pci_hotplug.h | 1 - include/linux/sfi_acpi.h | 2 +- include/linux/tboot.h | 2 +- 19 files changed, 7 insertions(+), 21 deletions(-) diff --git a/arch/x86/pci/mmconfig_32.c b/arch/x86/pci/mmconfig_32.c index 5c90975..43984bc 100644 --- a/arch/x86/pci/mmconfig_32.c +++ b/arch/x86/pci/mmconfig_32.c @@ -14,7 +14,6 @@ #include #include #include -#include /* Assume systems with more busses have correct MCFG */ #define mmcfg_virt_addr ((void __iomem *) fix_to_virt(FIX_PCIE_MCFG)) diff --git a/drivers/acpi/apei/einj.c b/drivers/acpi/apei/einj.c index fb57d03..ca0c6d7 100644 --- a/drivers/acpi/apei/einj.c +++ b/drivers/acpi/apei/einj.c @@ -33,7 +33,6 @@ #include #include #include -#include #include "apei-internal.h" diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c index 8507034..c4a0e45 100644 --- a/drivers/acpi/osl.c +++ b/drivers/acpi/osl.c @@ -49,7 +49,6 @@ #include #include -#include #include #include "internal.h" diff --git a/drivers/char/tpm/tpm_acpi.c b/drivers/char/tpm/tpm_acpi.c index 64420b3..b9a57fa 100644 --- a/drivers/char/tpm/tpm_acpi.c +++ b/drivers/char/tpm/tpm_acpi.c @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include "tpm.h" #include "tpm_eventlog.h" diff --git a/drivers/gpu/drm/nouveau/nouveau_acpi.c b/drivers/gpu/drm/nouveau/nouveau_acpi.c index 6763865..5910ef5 100644 --- a/drivers/gpu/drm/nouveau/nouveau_acpi.c +++ b/drivers/gpu/drm/nouveau/nouveau_acpi.c @@ -2,7 +2,6 @@ #include #include #include -#include #include #include diff --git a/drivers/hwmon/asus_atk0110.c b/drivers/hwmon/asus_atk0110.c index 9b64d26..eea1f60 100644 --- a/drivers/hwmon/asus_atk0110.c +++ b/drivers/hwmon/asus_atk0110.c @@ -17,7 +17,6 @@ #include #include -#include #include diff --git a/drivers/ide/ide-acpi.c b/drivers/ide/ide-acpi.c index d9e1f7c..333d405 100644 --- a/drivers/ide/ide-acpi.c +++ b/drivers/ide/ide-acpi.c @@ -14,7 +14,6 @@ #include #include #include -#include #include #include #include diff --git a/drivers/iommu/amd_iommu_init.c b/drivers/iommu/amd_iommu_init.c index 8f798be..28b4bea 100644 --- a/drivers/iommu/amd_iommu_init.c +++ b/drivers/iommu/amd_iommu_init.c @@ -26,7 +26,6 @@ #include #include #include -#include #include #include #include diff --git a/drivers/iommu/intel_irq_remapping.c b/drivers/iommu/intel_irq_remapping.c index bab10b1..01c1dd9 100644 --- a/drivers/iommu/intel_irq_remapping.c +++ b/drivers/iommu/intel_irq_remapping.c @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/drivers/pci/hotplug/pciehp.h b/drivers/pci/hotplug/pciehp.h index f773254..fc51cab 100644 --- a/drivers/pci/hotplug/pciehp.h +++ b/drivers/pci/hotplug/pciehp.h @@ -163,7 +163,6 @@ static inline const char *slot_name(struct slot *slot) } #ifdef CONFIG_ACPI -#include #include void __init pciehp_acpi_slot_detection_init(void); diff --git a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c index d0e4999..4c77380 100644 --- a/drivers/pci/pci-acpi.c +++ b/drivers/pci/pci-acpi.c @@ -12,7 +12,6 @@ #include #include #include -#include #include #include diff --git a/drivers/platform/x86/tc1100-wmi.c b/drivers/platform/x86/tc1100-wmi.c index d16193e..6a6ea28 100644 --- a/drivers/platform/x86/tc1100-wmi.c +++ b/drivers/platform/x86/tc1100-wmi.c @@ -32,7 +32,6 @@ #include #include #include -#include #include #include diff --git a/drivers/sfi/sfi_acpi.c b/drivers/sfi/sfi_acpi.c index f5b4ca5..5589ec5 100644 --- a/drivers/sfi/sfi_acpi.c +++ b/drivers/sfi/sfi_acpi.c @@ -60,7 +60,7 @@ #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt #include -#include +#include #include #include "sfi_core.h" diff --git a/include/linux/acpi_io.h b/include/linux/acpi_io.h index b0ffa21..ded96fe 100644 --- a/include/linux/acpi_io.h +++ b/include/linux/acpi_io.h @@ -2,7 +2,7 @@ #define _ACPI_IO_H_ #include -#include +#include static inline void __iomem *acpi_os_ioremap(acpi_physical_address phys, acpi_size size) diff --git a/include/linux/ide.h b/include/linux/ide.h index 46a1422..f29a6de 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h @@ -18,9 +18,6 @@ #include #include #include -#ifdef CONFIG_BLK_DEV_IDEACPI -#include -#endif #include #include diff --git a/include/linux/iscsi_ibft.h b/include/linux/iscsi_ibft.h index 8ba7e5b..605cc5c 100644 --- a/include/linux/iscsi_ibft.h +++ b/include/linux/iscsi_ibft.h @@ -21,7 +21,7 @@ #ifndef ISCSI_IBFT_H #define ISCSI_IBFT_H -#include +#include /* * Logical location of iSCSI Boot Format Table. diff --git a/include/linux/pci_hotplug.h b/include/linux/pci_hotplug.h index 71294ab..e6a5e99 100644 --- a/include/linux/pci_hotplug.h +++ b/include/linux/pci_hotplug.h @@ -175,7 +175,6 @@ struct hotplug_params { }; #ifdef CONFIG_ACPI -#include #include int pci_get_hp_params(struct pci_dev *dev, struct hotplug_params *hpp); int acpi_get_hp_hw_control_from_firmware(struct pci_dev *dev, u32 flags); diff --git a/include/linux/sfi_acpi.h b/include/linux/sfi_acpi.h index 631af63..c9cab82 100644 --- a/include/linux/sfi_acpi.h +++ b/include/linux/sfi_acpi.h @@ -60,7 +60,7 @@ #define _LINUX_SFI_ACPI_H #ifdef CONFIG_SFI -#include /* struct acpi_table_header */ +#include extern int sfi_acpi_table_parse(char *signature, char *oem_id, char *oem_table_id, diff --git a/include/linux/tboot.h b/include/linux/tboot.h index c75128b..9a54b33 100644 --- a/include/linux/tboot.h +++ b/include/linux/tboot.h @@ -34,7 +34,7 @@ enum { }; #ifdef CONFIG_INTEL_TXT -#include +#include /* used to communicate between tboot and the launched kernel */ #define TB_KEY_SIZE 64 /* 512 bits */