summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWolfram Sang <wsa+renesas@sang-engineering.com>2019-03-17 10:34:45 +0100
committerLorenzo Pieralisi <lorenzo.pieralisi@arm.com>2019-04-04 11:49:07 +0100
commita27beb5820d1a52b1e2863a4ae5545a1dd4ab35a (patch)
tree2b25f0825778baf3aea6ef9f85ae4124115ac5d4
parentf0d14edd2ba43b995bef4dd5da5ffe0ae19321a1 (diff)
downloadlinux-a27beb5820d1a52b1e2863a4ae5545a1dd4ab35a.tar.gz
linux-a27beb5820d1a52b1e2863a4ae5545a1dd4ab35a.tar.bz2
linux-a27beb5820d1a52b1e2863a4ae5545a1dd4ab35a.zip
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)
while (reg) {
unsigned int index = find_first_bit(&reg, 32);
- unsigned int irq;
+ unsigned int msi_irq;
/* clear the interrupt */
rcar_pci_write_reg(pcie, 1 << index, PCIEMSIFR);
- irq = irq_find_mapping(msi->domain, index);
- if (irq) {
+ msi_irq = irq_find_mapping(msi->domain, index);
+ if (msi_irq) {
if (test_bit(index, msi->used))
- generic_handle_irq(irq);
+ generic_handle_irq(msi_irq);
else
dev_info(dev, "unhandled MSI\n");
} else {