lkml.org 
[lkml]   [2014]   [Aug]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[RFC PATCH 10/20] x86/MSI: Remove unused MSI weak arch functions
    Date
    Now we can clean up MSI weak arch functions in x86.

    Signed-off-by: Yijing Wang <wangyijing@huawei.com>
    ---
    arch/x86/include/asm/pci.h | 3 ---
    arch/x86/kernel/apic/io_apic.c | 2 +-
    arch/x86/kernel/x86_init.c | 24 ------------------------
    3 files changed, 1 insertions(+), 28 deletions(-)

    diff --git a/arch/x86/include/asm/pci.h b/arch/x86/include/asm/pci.h
    index 878a06d..34f9676 100644
    --- a/arch/x86/include/asm/pci.h
    +++ b/arch/x86/include/asm/pci.h
    @@ -96,14 +96,11 @@ extern void pci_iommu_alloc(void);
    #ifdef CONFIG_PCI_MSI
    /* implemented in arch/x86/kernel/apic/io_apic. */
    struct msi_desc;
    -int native_setup_msi_irqs(struct pci_dev *dev, int nvec, int type);
    void native_teardown_msi_irq(unsigned int irq);
    -void native_restore_msi_irqs(struct pci_dev *dev);
    int setup_msi_irq(struct pci_dev *dev, struct msi_desc *msidesc,
    unsigned int irq_base, unsigned int irq_offset);
    extern struct msi_chip *x86_msi_chip;
    #else
    -#define native_setup_msi_irqs NULL
    #define native_teardown_msi_irq NULL
    #endif

    diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
    index eb8ab7c..e3326d9 100644
    --- a/arch/x86/kernel/apic/io_apic.c
    +++ b/arch/x86/kernel/apic/io_apic.c
    @@ -3077,7 +3077,7 @@ int setup_msi_irq(struct pci_dev *dev, struct msi_desc *msidesc,
    return 0;
    }

    -int native_setup_msi_irqs(struct device *dev, int nvec, int type)
    +static int native_setup_msi_irqs(struct device *dev, int nvec, int type)
    {
    struct msi_desc *msidesc;
    unsigned int irq;
    diff --git a/arch/x86/kernel/x86_init.c b/arch/x86/kernel/x86_init.c
    index 234b072..cc32568 100644
    --- a/arch/x86/kernel/x86_init.c
    +++ b/arch/x86/kernel/x86_init.c
    @@ -110,34 +110,10 @@ EXPORT_SYMBOL_GPL(x86_platform);

    #if defined(CONFIG_PCI_MSI)
    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 arch specific hooks */
    -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);
    -}
    #endif

    struct x86_io_apic_ops x86_io_apic_ops = {
    --
    1.7.1


    \
     
     \ /
      Last update: 2014-08-12 09:21    [W:4.499 / U:0.060 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site