| Message ID | 1529360102-8206-1-git-send-email-leitao@debian.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 3bfb450ee7b52d41ce2117738ee9c155f3c75237 |
| Headers | show |
| Series | powerpc/pci: Remove legacy debug code | expand |
On Mon, 2018-06-18 at 22:15:02 UTC, Breno Leitao wrote: > Commit 59f47eff03a0 ("powerpc/pci: Use of_irq_parse_and_map_pci() helper") > removed the 'oirq' variable, but kept memsetting it when the DEBUG macro is > defined. > > When setting DEBUG macro for debugging purpose, the kernel fails to build since > 'oirq' is not defined anymore. > > This patch simply remove the debug block, since it does not seem to sense > now. > > Fixes: 59f47eff03a08c ("powerpc/pci: Use of_irq_parse_and_map_pci() helper") > > Signed-off-by: Breno Leitao <leitao@debian.org> Applied to powerpc next, thanks. https://git.kernel.org/powerpc/c/3bfb450ee7b52d41ce2117738ee9c1 cheers
diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c index fe9733ffffaa..f9352167e619 100644 --- a/arch/powerpc/kernel/pci-common.c +++ b/arch/powerpc/kernel/pci-common.c @@ -366,9 +366,6 @@ static int pci_read_irq_line(struct pci_dev *pci_dev) pr_debug("PCI: Try to map irq for %s...\n", pci_name(pci_dev)); -#ifdef DEBUG - memset(&oirq, 0xff, sizeof(oirq)); -#endif /* Try to get a mapping from the device-tree */ virq = of_irq_parse_and_map_pci(pci_dev, 0, 0); if (virq <= 0) {
Commit 59f47eff03a0 ("powerpc/pci: Use of_irq_parse_and_map_pci() helper") removed the 'oirq' variable, but kept memsetting it when the DEBUG macro is defined. When setting DEBUG macro for debugging purpose, the kernel fails to build since 'oirq' is not defined anymore. This patch simply remove the debug block, since it does not seem to sense now. Fixes: 59f47eff03a08c ("powerpc/pci: Use of_irq_parse_and_map_pci() helper") Signed-off-by: Breno Leitao <leitao@debian.org> --- arch/powerpc/kernel/pci-common.c | 3 --- 1 file changed, 3 deletions(-)