From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1031531AbbDXPz5 (ORCPT ); Fri, 24 Apr 2015 11:55:57 -0400 Received: from terminus.zytor.com ([198.137.202.10]:44514 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1031492AbbDXPzy (ORCPT ); Fri, 24 Apr 2015 11:55:54 -0400 Date: Fri, 24 Apr 2015 08:54:50 -0700 From: tip-bot for Jiang Liu Message-ID: Cc: david.vrabel@citrix.com, benh@kernel.crashing.org, jiang.liu@linux.intel.com, konrad.wilk@oracle.com, hpa@zytor.com, mingo@kernel.org, sivanich@sgi.com, gregkh@linuxfoundation.org, tglx@linutronix.de, jroedel@suse.de, linux-kernel@vger.kernel.org, yinghai@kernel.org, joro@8bytes.org, bp@alien8.de, tony.luck@intel.com, grant.likely@linaro.org, david.a.cohen@linux.intel.com, rjw@rjwysocki.net, bhelgaas@google.com, rdunlap@infradead.org, linux@eikelenboom.it Reply-To: jroedel@suse.de, mingo@kernel.org, tglx@linutronix.de, sivanich@sgi.com, gregkh@linuxfoundation.org, linux-kernel@vger.kernel.org, jiang.liu@linux.intel.com, hpa@zytor.com, konrad.wilk@oracle.com, david.vrabel@citrix.com, benh@kernel.crashing.org, rjw@rjwysocki.net, linux@eikelenboom.it, rdunlap@infradead.org, bhelgaas@google.com, tony.luck@intel.com, grant.likely@linaro.org, david.a.cohen@linux.intel.com, bp@alien8.de, yinghai@kernel.org, joro@8bytes.org In-Reply-To: <1428978610-28986-3-git-send-email-jiang.liu@linux.intel.com> References: <1428978610-28986-3-git-send-email-jiang.liu@linux.intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/apic] x86/irq: Remove unused struct mp_pin_info Git-Commit-ID: b75e818f7fc6db153a4ebfba1d31366c1cc531aa X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: b75e818f7fc6db153a4ebfba1d31366c1cc531aa Gitweb: http://git.kernel.org/tip/b75e818f7fc6db153a4ebfba1d31366c1cc531aa Author: Jiang Liu AuthorDate: Tue, 14 Apr 2015 10:29:39 +0800 Committer: Thomas Gleixner CommitDate: Fri, 24 Apr 2015 15:36:52 +0200 x86/irq: Remove unused struct mp_pin_info Now nobody makes use of struct mp_pin_info, so remove it. Signed-off-by: Jiang Liu Tested-by: Joerg Roedel Cc: Konrad Rzeszutek Wilk Cc: David Cohen Cc: Sander Eikelenboom Cc: David Vrabel Cc: Tony Luck Cc: Joerg Roedel Cc: Greg Kroah-Hartman Cc: Bjorn Helgaas Cc: Benjamin Herrenschmidt Cc: Rafael J. Wysocki Cc: Randy Dunlap Cc: Yinghai Lu Cc: Borislav Petkov Cc: Dimitri Sivanich Cc: Grant Likely Link: http://lkml.kernel.org/r/1428978610-28986-3-git-send-email-jiang.liu@linux.intel.com Signed-off-by: Thomas Gleixner --- arch/x86/kernel/apic/io_apic.c | 30 +++--------------------------- 1 file changed, 3 insertions(+), 27 deletions(-) diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c index 523b326..3506e8a 100644 --- a/arch/x86/kernel/apic/io_apic.c +++ b/arch/x86/kernel/apic/io_apic.c @@ -86,13 +86,6 @@ struct mp_chip_data { bool isa_irq; }; -struct mp_pin_info { - int trigger; - int polarity; - int set; - u32 count; -}; - static struct ioapic { /* * # of IRQ routing registers @@ -108,7 +101,6 @@ static struct ioapic { struct mp_ioapic_gsi gsi_config; struct ioapic_domain_cfg irqdomain_cfg; struct irq_domain *irqdomain; - struct mp_pin_info *pin_info; struct resource *iomem_res; } ioapics[MAX_IO_APICS]; @@ -159,11 +151,6 @@ static inline int mp_init_irq_at_boot(int ioapic, int irq) return ioapic == 0 || mp_is_legacy_irq(irq); } -static inline struct mp_pin_info *mp_pin_info(int ioapic_idx, int pin) -{ - return ioapics[ioapic_idx].pin_info + pin; -} - static inline struct irq_domain *mp_ioapic_irqdomain(int ioapic) { return ioapics[ioapic].irqdomain; @@ -2432,7 +2419,6 @@ out: static int mp_irqdomain_create(int ioapic) { - size_t size; struct irq_alloc_info info; struct irq_domain *parent; int hwirqs = mp_ioapic_pin_count(ioapic); @@ -2440,11 +2426,6 @@ static int mp_irqdomain_create(int ioapic) struct ioapic_domain_cfg *cfg = &ip->irqdomain_cfg; struct mp_ioapic_gsi *gsi_cfg = mp_ioapic_gsi_routing(ioapic); - size = sizeof(struct mp_pin_info) * mp_ioapic_pin_count(ioapic); - ip->pin_info = kzalloc(size, GFP_KERNEL); - if (!ip->pin_info) - return -ENOMEM; - if (cfg->type == IOAPIC_DOMAIN_INVALID) return 0; @@ -2457,13 +2438,10 @@ static int mp_irqdomain_create(int ioapic) ip->irqdomain = irq_domain_add_linear(cfg->dev, hwirqs, cfg->ops, (void *)(long)ioapic); - if (ip->irqdomain) { - ip->irqdomain->parent = parent; - } else { - kfree(ip->pin_info); - ip->pin_info = NULL; + if (!ip->irqdomain) return -ENOMEM; - } + + ip->irqdomain->parent = parent; if (cfg->type == IOAPIC_DOMAIN_LEGACY || cfg->type == IOAPIC_DOMAIN_STRICT) @@ -2479,8 +2457,6 @@ static void ioapic_destroy_irqdomain(int idx) irq_domain_remove(ioapics[idx].irqdomain); ioapics[idx].irqdomain = NULL; } - kfree(ioapics[idx].pin_info); - ioapics[idx].pin_info = NULL; } void __init setup_IO_APIC(void)