Skip to content

Commit

Permalink
mips: Kill pointless destroy_irq()
Browse files Browse the repository at this point in the history
Copy and paste leftovers with no functionality at all.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Grant Likely <grant.likely@linaro.org>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Jayachandran C <jchandra@broadcom.com>
Cc: linux-mips@linux-mips.org
Link: http://lkml.kernel.org/r/20140507154334.008113902@linutronix.de
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
  • Loading branch information
Thomas Gleixner committed May 16, 2014
1 parent 37ebbcf commit 465665f
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 18 deletions.
10 changes: 1 addition & 9 deletions arch/mips/pci/msi-xlp.c
Original file line number Diff line number Diff line change
Expand Up @@ -206,14 +206,8 @@ static struct irq_chip xlp_msix_chip = {
.irq_unmask = unmask_msi_irq,
};

void destroy_irq(unsigned int irq)
{
/* nothing to do yet */
}

void arch_teardown_msi_irq(unsigned int irq)
{
destroy_irq(irq);
}

/*
Expand Down Expand Up @@ -298,10 +292,8 @@ static int xlp_setup_msi(uint64_t lnkbase, int node, int link,

xirq = xirq + msivec; /* msi mapped to global irq space */
ret = irq_set_msi_desc(xirq, desc);
if (ret < 0) {
destroy_irq(xirq);
if (ret < 0)
return ret;
}

write_msi_msg(xirq, &msg);
return 0;
Expand Down
10 changes: 1 addition & 9 deletions arch/mips/pci/pci-xlr.c
Original file line number Diff line number Diff line change
Expand Up @@ -214,14 +214,8 @@ static int get_irq_vector(const struct pci_dev *dev)
}

#ifdef CONFIG_PCI_MSI
void destroy_irq(unsigned int irq)
{
/* nothing to do yet */
}

void arch_teardown_msi_irq(unsigned int irq)
{
destroy_irq(irq);
}

int arch_setup_msi_irq(struct pci_dev *dev, struct msi_desc *desc)
Expand Down Expand Up @@ -263,10 +257,8 @@ int arch_setup_msi_irq(struct pci_dev *dev, struct msi_desc *desc)
MSI_DATA_DELIVERY_FIXED;

ret = irq_set_msi_desc(irq, desc);
if (ret < 0) {
destroy_irq(irq);
if (ret < 0)
return ret;
}

write_msi_msg(irq, &msg);
return 0;
Expand Down

0 comments on commit 465665f

Please sign in to comment.