aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWolfram Sang <wsa+renesas@sang-engineering.com>2019-03-17 05:34:45 -0400
committerLorenzo Pieralisi <lorenzo.pieralisi@arm.com>2019-04-04 06:49:07 -0400
commita27beb5820d1a52b1e2863a4ae5545a1dd4ab35a (patch)
tree2b25f0825778baf3aea6ef9f85ae4124115ac5d4
parentf0d14edd2ba43b995bef4dd5da5ffe0ae19321a1 (diff)
PCI: rcar: Do not shadow the 'irq' variable
The sparse tool rightfully detects: drivers/pci/controller/pcie-rcar.c:741:30: warning: symbol 'irq' shadows an earlier one Fix it now to avoid future surprises and for good coding style. No functional change intended. Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> [lorenzo.pieralisi@arm.com: commit log refactoring] Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> Reviewed-by: Simon Horman <horms+renesas@verge.net.au>
-rw-r--r--drivers/pci/controller/pcie-rcar.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/pci/controller/pcie-rcar.c b/drivers/pci/controller/pcie-rcar.c
index 0004b6457124..e4cebeb18470 100644
--- a/drivers/pci/controller/pcie-rcar.c
+++ b/drivers/pci/controller/pcie-rcar.c
@@ -738,15 +738,15 @@ static irqreturn_t rcar_pcie_msi_irq(int irq, void *data)
738 738
739 while (reg) { 739 while (reg) {
740 unsigned int index = find_first_bit(&reg, 32); 740 unsigned int index = find_first_bit(&reg, 32);
741 unsigned int irq; 741 unsigned int msi_irq;
742 742
743 /* clear the interrupt */ 743 /* clear the interrupt */
744 rcar_pci_write_reg(pcie, 1 << index, PCIEMSIFR); 744 rcar_pci_write_reg(pcie, 1 << index, PCIEMSIFR);
745 745
746 irq = irq_find_mapping(msi->domain, index); 746 msi_irq = irq_find_mapping(msi->domain, index);
747 if (irq) { 747 if (msi_irq) {
748 if (test_bit(index, msi->used)) 748 if (test_bit(index, msi->used))
749 generic_handle_irq(irq); 749 generic_handle_irq(msi_irq);
750 else 750 else
751 dev_info(dev, "unhandled MSI\n"); 751 dev_info(dev, "unhandled MSI\n");
752 } else { 752 } else {