[PATCH v2 12/22] MIPS/Octeon/MSI: Use MSI chip framework to configure MSI/MSI-X irq
From: Thierry Reding <hidden>
Date: 2014-09-25 07:34:44
Also in:
linux-arch, linux-iommu, linux-mips, linux-pci, linux-s390, linuxppc-dev, lkml, sparclinux
On Thu, Sep 25, 2014 at 11:14:22AM +0800, Yijing Wang wrote: [...]
quoted hunk ↗ jump to hunk
diff --git a/arch/mips/pci/msi-octeon.c b/arch/mips/pci/msi-octeon.c
[...]
quoted hunk ↗ jump to hunk
@@ -132,12 +132,12 @@ msi_irq_allocated: /* Make sure the search for available interrupts didn't fail */ if (irq >= 64) { if (request_private_bits) { - pr_err("arch_setup_msi_irq: Unable to find %d free interrupts, trying just one", + pr_err("octeon_setup_msi_irq: Unable to find %d free interrupts, trying just one", 1 << request_private_bits);
Perhaps while@it make this (and other similar changes in this patch):
pr_err("%s(): Unable to ...", __func__, ...);
So that it becomes more resilient against this kind of rename?
request_private_bits = 0;
goto try_only_one;
} else
- panic("arch_setup_msi_irq: Unable to find a free MSI interrupt");
+ panic("octeon_setup_msi_irq: Unable to find a free MSI interrupt");quoted hunk ↗ jump to hunk
@@ -210,14 +210,13 @@ int arch_setup_msi_irqs(struct pci_dev *dev, int nvec, int type) return 0; } -
This...
quoted hunk ↗ jump to hunk
@@ -240,7 +239,7 @@ void arch_teardown_msi_irq(unsigned int irq) */ number_irqs = 0; while ((irq0 + number_irqs < 64) && - (msi_multiple_irq_bitmask[index] + (msi_multiple_irq_bitmask[index]
... and this seem like unrelated whitespace changes.
quoted hunk ↗ jump to hunk
& (1ull << (irq0 + number_irqs)))) number_irqs++; number_irqs++;@@ -249,8 +248,8 @@ void arch_teardown_msi_irq(unsigned int irq) /* Shift the mask to the correct bit location */ bitmask <<= irq0; if ((msi_free_irq_bitmask[index] & bitmask) != bitmask) - panic("arch_teardown_msi_irq: Attempted to teardown MSI " - "interrupt (%d) not in use", irq); + panic("octeon_teardown_msi_irq: Attempted to teardown MSI " + "interrupt (%d) not in use", irq);
And the second line here also needlessly changes the indentation. Thierry -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 819 bytes Desc: not available URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140925/6d7f0108/attachment.sig>