Commit 33987fd1 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/msi' 

  - Remove unused mask_msi_irq(), unmask_msi_irq(), write_msi_msg(),
    __write_msi_msg() (Bjorn Helgaas)

* pci/msi:
  PCI/MSI: Remove unused mask_msi_irq() and unmask_msi_irq()
  PCI/MSI: Remove unused __write_msi_msg() and write_msi_msg()
parents 3ea6f739 fc278654

drivers/pci/controller/pcie-xilinx-nwl.c

+4 −5
Original line number Diff line number Diff line
@@ -438,11 +438,10 @@ static const struct irq_domain_ops legacy_domain_ops = { 
#ifdef CONFIG_PCI_MSI

static struct irq_chip nwl_msi_irq_chip = {

	.name = "nwl_pcie:msi",

	.irq_enable = unmask_msi_irq,

	.irq_disable = mask_msi_irq,

	.irq_mask = mask_msi_irq,

	.irq_unmask = unmask_msi_irq,



	.irq_enable = pci_msi_unmask_irq,

	.irq_disable = pci_msi_mask_irq,

	.irq_mask = pci_msi_mask_irq,

	.irq_unmask = pci_msi_unmask_irq,

};



static struct msi_domain_info nwl_msi_domain_info = {

include/linux/msi.h

+0 −18
Original line number Diff line number Diff line
@@ -148,24 +148,6 @@ u32 __pci_msi_desc_mask_irq(struct msi_desc *desc, u32 mask, u32 flag); 
void pci_msi_mask_irq(struct irq_data *data);

void pci_msi_unmask_irq(struct irq_data *data);



/* Conversion helpers. Should be removed after merging */

static inline void __write_msi_msg(struct msi_desc *entry, struct msi_msg *msg)

{

	__pci_write_msi_msg(entry, msg);

}

static inline void write_msi_msg(int irq, struct msi_msg *msg)

{

	pci_write_msi_msg(irq, msg);

}

static inline void mask_msi_irq(struct irq_data *data)

{

	pci_msi_mask_irq(data);

}

static inline void unmask_msi_irq(struct irq_data *data)

{

	pci_msi_unmask_irq(data);

}



/*

 * The arch hooks to setup up msi irqs. Those functions are

 * implemented as weak symbols so that they /can/ be overriden by