From patchwork Thu Oct 1 15:11:52 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sudeep Holla X-Patchwork-Id: 54373 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f198.google.com (mail-lb0-f198.google.com [209.85.217.198]) by patches.linaro.org (Postfix) with ESMTPS id 0D28923009 for ; Thu, 1 Oct 2015 15:12:25 +0000 (UTC) Received: by lbbti1 with SMTP id ti1sf7415591lbb.3 for ; Thu, 01 Oct 2015 08:12:23 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=YO/+a4Wm7LoisKepkShz1kTOVqPFY8UjCQ4TTjzfGh0=; b=B8d1oVrvryhQaKhV5TCdxgaK4MOa3MnpIVHGbpmabfhvJqSuKsRLBcu54T+J6kkARE l/Hmd0VmRpsfnPx24LW5DkfHMaVdran4IJYbwAG524hNFxtHLnKCAz9pdIHvXWQ5CyFf LDrObiTjuf9hA8rAoL9l1R9kvohHDpcD1f0wVF8ay78aK3zUThoWG0/Ty/KYkILxr1AZ ywWIFwJsjBSGbv01tURYWk+iqXfnWlFC1WTmIZYlEE34rC/3+wZynOrrovjchoooUTXC BQahpXU6qlH3477u5YTKAlbkTBCapa4h+curbGqPFkFbHmK5swUQOhZs8dBW7Wnq3ExU Y9sA== X-Gm-Message-State: ALoCoQnjltH50mZ+N6u2GdaNHyv1wA9p6eFg1oEs1FW6Nx/w/Zcz+2aBGbOPAoqF9oD6b1/5bXNR X-Received: by 10.112.145.3 with SMTP id sq3mr818455lbb.7.1443712343010; Thu, 01 Oct 2015 08:12:23 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.25.18.226 with SMTP id 95ls117427lfs.1.gmail; Thu, 01 Oct 2015 08:12:22 -0700 (PDT) X-Received: by 10.25.32.131 with SMTP id g125mr2015511lfg.26.1443712342848; Thu, 01 Oct 2015 08:12:22 -0700 (PDT) Received: from mail-lb0-f177.google.com (mail-lb0-f177.google.com. [209.85.217.177]) by mx.google.com with ESMTPS id x5si3066065lal.52.2015.10.01.08.12.22 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 01 Oct 2015 08:12:22 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.177 as permitted sender) client-ip=209.85.217.177; Received: by lbbmp1 with SMTP id mp1so11200973lbb.1 for ; Thu, 01 Oct 2015 08:12:22 -0700 (PDT) X-Received: by 10.112.202.35 with SMTP id kf3mr3152568lbc.19.1443712342118; Thu, 01 Oct 2015 08:12:22 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.59.35 with SMTP id w3csp671681lbq; Thu, 1 Oct 2015 08:12:20 -0700 (PDT) X-Received: by 10.50.28.72 with SMTP id z8mr3805174igg.36.1443712340675; Thu, 01 Oct 2015 08:12:20 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id c16si2705623igo.8.2015.10.01.08.12.19; Thu, 01 Oct 2015 08:12:20 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754918AbbJAPML (ORCPT + 30 others); Thu, 1 Oct 2015 11:12:11 -0400 Received: from foss.arm.com ([217.140.101.70]:36598 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752131AbbJAPMG (ORCPT ); Thu, 1 Oct 2015 11:12:06 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id D0651F1; Thu, 1 Oct 2015 08:12:07 -0700 (PDT) Received: from e103737-lin.cambridge.arm.com (e103737-lin.cambridge.arm.com [10.1.207.150]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id E41E73F50D; Thu, 1 Oct 2015 08:12:04 -0700 (PDT) From: Sudeep Holla To: linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, "Rafael J. Wysocki" Cc: Sudeep Holla , Al Stone , Lorenzo Pieralisi Subject: [PATCH v3 2/2] ACPI / tables : remove unused table_end parameter to acpi_tbl_entry_handler Date: Thu, 1 Oct 2015 16:11:52 +0100 Message-Id: <1443712312-9176-2-git-send-email-sudeep.holla@arm.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1443712312-9176-1-git-send-email-sudeep.holla@arm.com> References: <1442408287-10410-1-git-send-email-sudeep.holla@arm.com> <1443712312-9176-1-git-send-email-sudeep.holla@arm.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: sudeep.holla@arm.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.177 as permitted sender) smtp.mailfrom=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , acpi_tbl_entiry_handler expects `table_end` pointer to be passed so that the individual subtable entry handler can use it to validate the entries. However, acpi_parse_entries now validates the end of an entry against the table end using the length in the sub-table entry. The only user of that argument namely MADT is also removed. So we can now eliminate the need to pass the table end to the handlers. This patch removes the unused second parameter in acpi_tbl_entry_handler and updates all the handlers accordingly. Cc: "Rafael J. Wysocki" Signed-off-by: Sudeep Holla --- arch/arm64/kernel/smp.c | 3 +-- arch/ia64/kernel/acpi.c | 22 +++++++--------------- arch/x86/kernel/acpi/boot.c | 29 +++++++++-------------------- drivers/acpi/numa.c | 9 +++------ drivers/acpi/scan.c | 5 ++--- drivers/acpi/tables.c | 3 +-- drivers/irqchip/irq-gic.c | 10 +++------- drivers/mailbox/pcc.c | 3 +-- include/linux/acpi.h | 3 +-- 9 files changed, 28 insertions(+), 59 deletions(-) diff --git a/arch/arm64/kernel/smp.c b/arch/arm64/kernel/smp.c index 66cc8c4d170c..885299b1a24b 100644 --- a/arch/arm64/kernel/smp.c +++ b/arch/arm64/kernel/smp.c @@ -445,8 +445,7 @@ acpi_map_gic_cpu_interface(struct acpi_madt_generic_interrupt *processor) } static int __init -acpi_parse_gic_cpu_interface(struct acpi_subtable_header *header, - const unsigned long end) +acpi_parse_gic_cpu_interface(struct acpi_subtable_header *header) { struct acpi_madt_generic_interrupt *processor; diff --git a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c index efa3f0a299e2..0549504a8f6c 100644 --- a/arch/ia64/kernel/acpi.c +++ b/arch/ia64/kernel/acpi.c @@ -177,8 +177,7 @@ struct acpi_table_madt *acpi_madt __initdata; static u8 has_8259; static int __init -acpi_parse_lapic_addr_ovr(struct acpi_subtable_header * header, - const unsigned long end) +acpi_parse_lapic_addr_ovr(struct acpi_subtable_header * header) { struct acpi_madt_local_apic_override *lapic; @@ -191,8 +190,7 @@ acpi_parse_lapic_addr_ovr(struct acpi_subtable_header * header, return 0; } -static int __init -acpi_parse_lsapic(struct acpi_subtable_header * header, const unsigned long end) +static int __init acpi_parse_lsapic(struct acpi_subtable_header * header) { struct acpi_madt_local_sapic *lsapic; @@ -210,8 +208,7 @@ acpi_parse_lsapic(struct acpi_subtable_header * header, const unsigned long end) return 0; } -static int __init -acpi_parse_lapic_nmi(struct acpi_subtable_header * header, const unsigned long end) +static int __init acpi_parse_lapic_nmi(struct acpi_subtable_header * header) { struct acpi_madt_local_apic_nmi *lacpi_nmi; @@ -221,8 +218,7 @@ acpi_parse_lapic_nmi(struct acpi_subtable_header * header, const unsigned long e return 0; } -static int __init -acpi_parse_iosapic(struct acpi_subtable_header * header, const unsigned long end) +static int __init acpi_parse_iosapic(struct acpi_subtable_header * header) { struct acpi_madt_io_sapic *iosapic; @@ -234,8 +230,7 @@ acpi_parse_iosapic(struct acpi_subtable_header * header, const unsigned long end static unsigned int __initdata acpi_madt_rev; static int __init -acpi_parse_plat_int_src(struct acpi_subtable_header * header, - const unsigned long end) +acpi_parse_plat_int_src(struct acpi_subtable_header * header) { struct acpi_madt_interrupt_source *plintsrc; int vector; @@ -314,9 +309,7 @@ unsigned int get_cpei_target_cpu(void) return acpi_cpei_phys_cpuid; } -static int __init -acpi_parse_int_src_ovr(struct acpi_subtable_header * header, - const unsigned long end) +static int __init acpi_parse_int_src_ovr(struct acpi_subtable_header * header) { struct acpi_madt_interrupt_override *p; @@ -332,8 +325,7 @@ acpi_parse_int_src_ovr(struct acpi_subtable_header * header, return 0; } -static int __init -acpi_parse_nmi_src(struct acpi_subtable_header * header, const unsigned long end) +static int __init acpi_parse_nmi_src(struct acpi_subtable_header * header) { struct acpi_madt_nmi_source *nmi_src; diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c index e65bcea63c35..08e0da4838cd 100644 --- a/arch/x86/kernel/acpi/boot.c +++ b/arch/x86/kernel/acpi/boot.c @@ -185,8 +185,7 @@ static int acpi_register_lapic(int id, u8 enabled) return generic_processor_info(id, ver); } -static int __init -acpi_parse_x2apic(struct acpi_subtable_header *header, const unsigned long end) +static int __init acpi_parse_x2apic(struct acpi_subtable_header *header) { struct acpi_madt_local_x2apic *processor = NULL; int apic_id; @@ -217,8 +216,7 @@ acpi_parse_x2apic(struct acpi_subtable_header *header, const unsigned long end) return 0; } -static int __init -acpi_parse_lapic(struct acpi_subtable_header * header, const unsigned long end) +static int __init acpi_parse_lapic(struct acpi_subtable_header *header) { struct acpi_madt_local_apic *processor = NULL; @@ -239,8 +237,7 @@ acpi_parse_lapic(struct acpi_subtable_header * header, const unsigned long end) return 0; } -static int __init -acpi_parse_sapic(struct acpi_subtable_header *header, const unsigned long end) +static int __init acpi_parse_sapic(struct acpi_subtable_header *header) { struct acpi_madt_local_sapic *processor = NULL; @@ -255,8 +252,7 @@ acpi_parse_sapic(struct acpi_subtable_header *header, const unsigned long end) } static int __init -acpi_parse_lapic_addr_ovr(struct acpi_subtable_header * header, - const unsigned long end) +acpi_parse_lapic_addr_ovr(struct acpi_subtable_header * header) { struct acpi_madt_local_apic_override *lapic_addr_ovr = NULL; @@ -267,9 +263,7 @@ acpi_parse_lapic_addr_ovr(struct acpi_subtable_header * header, return 0; } -static int __init -acpi_parse_x2apic_nmi(struct acpi_subtable_header *header, - const unsigned long end) +static int __init acpi_parse_x2apic_nmi(struct acpi_subtable_header *header) { struct acpi_madt_local_x2apic_nmi *x2apic_nmi = NULL; @@ -283,8 +277,7 @@ acpi_parse_x2apic_nmi(struct acpi_subtable_header *header, return 0; } -static int __init -acpi_parse_lapic_nmi(struct acpi_subtable_header * header, const unsigned long end) +static int __init acpi_parse_lapic_nmi(struct acpi_subtable_header *header) { struct acpi_madt_local_apic_nmi *lapic_nmi = NULL; @@ -382,8 +375,7 @@ static int mp_config_acpi_gsi(struct device *dev, u32 gsi, int trigger, return 0; } -static int __init -acpi_parse_ioapic(struct acpi_subtable_header * header, const unsigned long end) +static int __init acpi_parse_ioapic(struct acpi_subtable_header *header) { struct acpi_madt_io_apic *ioapic = NULL; struct ioapic_domain_cfg cfg = { @@ -434,9 +426,7 @@ static void __init acpi_sci_ioapic_setup(u8 bus_irq, u16 polarity, u16 trigger, return; } -static int __init -acpi_parse_int_src_ovr(struct acpi_subtable_header * header, - const unsigned long end) +static int __init acpi_parse_int_src_ovr(struct acpi_subtable_header *header) { struct acpi_madt_interrupt_override *intsrc = NULL; @@ -473,8 +463,7 @@ acpi_parse_int_src_ovr(struct acpi_subtable_header * header, return 0; } -static int __init -acpi_parse_nmi_src(struct acpi_subtable_header * header, const unsigned long end) +static int __init acpi_parse_nmi_src(struct acpi_subtable_header *header) { struct acpi_madt_nmi_source *nmi_src = NULL; diff --git a/drivers/acpi/numa.c b/drivers/acpi/numa.c index 72b6e9ef0ae9..ecaaa3087c86 100644 --- a/drivers/acpi/numa.c +++ b/drivers/acpi/numa.c @@ -240,8 +240,7 @@ acpi_numa_x2apic_affinity_init(struct acpi_srat_x2apic_cpu_affinity *pa) static int __init -acpi_parse_x2apic_affinity(struct acpi_subtable_header *header, - const unsigned long end) +acpi_parse_x2apic_affinity(struct acpi_subtable_header *header) { struct acpi_srat_x2apic_cpu_affinity *processor_affinity; @@ -258,8 +257,7 @@ acpi_parse_x2apic_affinity(struct acpi_subtable_header *header, } static int __init -acpi_parse_processor_affinity(struct acpi_subtable_header *header, - const unsigned long end) +acpi_parse_processor_affinity(struct acpi_subtable_header *header) { struct acpi_srat_cpu_affinity *processor_affinity; @@ -278,8 +276,7 @@ acpi_parse_processor_affinity(struct acpi_subtable_header *header, static int __initdata parsed_numa_memblks; static int __init -acpi_parse_memory_affinity(struct acpi_subtable_header * header, - const unsigned long end) +acpi_parse_memory_affinity(struct acpi_subtable_header * header) { struct acpi_srat_mem_affinity *memory_affinity; diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index daf9fc8329e6..0054450dfbf7 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -1918,11 +1918,10 @@ static struct acpi_probe_entry *ape; static int acpi_probe_count; static DEFINE_SPINLOCK(acpi_probe_lock); -static int __init acpi_match_madt(struct acpi_subtable_header *header, - const unsigned long end) +static int __init acpi_match_madt(struct acpi_subtable_header *header) { if (!ape->subtable_valid || ape->subtable_valid(header, ape)) - if (!ape->probe_subtbl(header, end)) + if (!ape->probe_subtbl(header)) acpi_probe_count++; return 0; diff --git a/drivers/acpi/tables.c b/drivers/acpi/tables.c index 24b867e26191..088b90707080 100644 --- a/drivers/acpi/tables.c +++ b/drivers/acpi/tables.c @@ -521,8 +521,7 @@ acpi_parse_entries_array(char *id, unsigned long table_size, for (i = 0; i < proc_num; i++) { if (entry->type != proc[i].id) continue; - if (!proc[i].handler || - proc[i].handler(entry, table_end)) + if (!proc[i].handler || proc[i].handler(entry)) return -EINVAL; proc->count++; diff --git a/drivers/irqchip/irq-gic.c b/drivers/irqchip/irq-gic.c index 67b7b48d9715..1fe267b0f7c1 100644 --- a/drivers/irqchip/irq-gic.c +++ b/drivers/irqchip/irq-gic.c @@ -1196,9 +1196,7 @@ IRQCHIP_DECLARE(msm_qgic2, "qcom,msm-qgic2", gic_of_init); #ifdef CONFIG_ACPI static phys_addr_t cpu_phy_base __initdata; -static int __init -gic_acpi_parse_madt_cpu(struct acpi_subtable_header *header, - const unsigned long end) +static int __init gic_acpi_parse_madt_cpu(struct acpi_subtable_header *header) { struct acpi_madt_generic_interrupt *processor; phys_addr_t gic_cpu_base; @@ -1220,8 +1218,7 @@ gic_acpi_parse_madt_cpu(struct acpi_subtable_header *header, } /* The things you have to do to just *count* something... */ -static int __init acpi_dummy_func(struct acpi_subtable_header *header, - const unsigned long end) +static int __init acpi_dummy_func(struct acpi_subtable_header *header) { return 0; } @@ -1246,8 +1243,7 @@ static bool __init gic_validate_dist(struct acpi_subtable_header *header, #define ACPI_GICV2_DIST_MEM_SIZE (SZ_4K) #define ACPI_GIC_CPU_IF_MEM_SIZE (SZ_8K) -static int __init gic_v2_acpi_init(struct acpi_subtable_header *header, - const unsigned long end) +static int __init gic_v2_acpi_init(struct acpi_subtable_header *header) { struct acpi_madt_generic_distributor *dist; void __iomem *cpu_base, *dist_base; diff --git a/drivers/mailbox/pcc.c b/drivers/mailbox/pcc.c index 68885a82e704..3df1f792728b 100644 --- a/drivers/mailbox/pcc.c +++ b/drivers/mailbox/pcc.c @@ -212,8 +212,7 @@ static const struct mbox_chan_ops pcc_chan_ops = { * * This gets called for each entry in the PCC table. */ -static int parse_pcc_subspace(struct acpi_subtable_header *header, - const unsigned long end) +static int parse_pcc_subspace(struct acpi_subtable_header *header) { struct acpi_pcct_hw_reduced *pcct_ss; diff --git a/include/linux/acpi.h b/include/linux/acpi.h index dd5bd228e523..360c09b72314 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -116,8 +116,7 @@ enum acpi_address_range_id { typedef int (*acpi_tbl_table_handler)(struct acpi_table_header *table); -typedef int (*acpi_tbl_entry_handler)(struct acpi_subtable_header *header, - const unsigned long end); +typedef int (*acpi_tbl_entry_handler)(struct acpi_subtable_header *header); #ifdef CONFIG_ACPI_INITRD_TABLE_OVERRIDE void acpi_initrd_override(void *data, size_t size);