From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from aserp1040.oracle.com ([141.146.126.69]:28081 "EHLO aserp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752186AbaFXNcN (ORCPT ); Tue, 24 Jun 2014 09:32:13 -0400 Date: Tue, 24 Jun 2014 09:21:36 -0400 From: Konrad Rzeszutek Wilk To: Yijing Wang Cc: Bjorn Helgaas , linux-pci@vger.kernel.org, Thomas Gleixner , "H. Peter Anvin" , x86@kernel.org, Wuyun Subject: Re: [PATCH] x86/MSI: Clean up unnecessary override function Message-ID: <20140624132136.GA28885@laptop.dumpdata.com> References: <1403598645-11272-1-git-send-email-wangyijing@huawei.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii In-Reply-To: <1403598645-11272-1-git-send-email-wangyijing@huawei.com> Sender: linux-pci-owner@vger.kernel.org List-ID: On Tue, Jun 24, 2014 at 04:30:45PM +0800, Yijing Wang wrote: > MSI driver provides several weak functions allow > platform to override. These override functions > arch_msi/x_mask_irq(), arch_restore_msi_irqs(), > arch_teardown_msi_irqs() in x86 don't provide > platform specific function, still call the > default functions. So cleanup these override > functions. They do. Please in the future use 'git annotate' to figure out which commits added them in and see if those are still in use. P.S. Look in arch/x86/pci/xen.c > > Signed-off-by: Yijing Wang > --- > arch/x86/kernel/x86_init.c | 22 ---------------------- > 1 files changed, 0 insertions(+), 22 deletions(-) > > diff --git a/arch/x86/kernel/x86_init.c b/arch/x86/kernel/x86_init.c > index e48b674..00529fa 100644 > --- a/arch/x86/kernel/x86_init.c > +++ b/arch/x86/kernel/x86_init.c > @@ -113,11 +113,7 @@ struct x86_msi_ops x86_msi = { > .setup_msi_irqs = native_setup_msi_irqs, > .compose_msi_msg = native_compose_msi_msg, > .teardown_msi_irq = native_teardown_msi_irq, > - .teardown_msi_irqs = default_teardown_msi_irqs, > - .restore_msi_irqs = default_restore_msi_irqs, > .setup_hpet_msi = default_setup_hpet_msi, > - .msi_mask_irq = default_msi_mask_irq, > - .msix_mask_irq = default_msix_mask_irq, > }; > > /* MSI arch specific hooks */ > @@ -126,28 +122,10 @@ int arch_setup_msi_irqs(struct pci_dev *dev, int nvec, int type) > return x86_msi.setup_msi_irqs(dev, nvec, type); > } > > -void arch_teardown_msi_irqs(struct pci_dev *dev) > -{ > - x86_msi.teardown_msi_irqs(dev); > -} > - > void arch_teardown_msi_irq(unsigned int irq) > { > x86_msi.teardown_msi_irq(irq); > } > - > -void arch_restore_msi_irqs(struct pci_dev *dev) > -{ > - x86_msi.restore_msi_irqs(dev); > -} > -u32 arch_msi_mask_irq(struct msi_desc *desc, u32 mask, u32 flag) > -{ > - return x86_msi.msi_mask_irq(desc, mask, flag); > -} > -u32 arch_msix_mask_irq(struct msi_desc *desc, u32 flag) > -{ > - return x86_msi.msix_mask_irq(desc, flag); > -} > #endif > > struct x86_io_apic_ops x86_io_apic_ops = { > -- > 1.7.1 > >