diff options
| author | Wolfram Sang <[email protected]> | 2019-03-17 09:34:45 +0000 |
|---|---|---|
| committer | Lorenzo Pieralisi <[email protected]> | 2019-04-04 10:49:07 +0000 |
| commit | a27beb5820d1a52b1e2863a4ae5545a1dd4ab35a (patch) | |
| tree | 2b25f0825778baf3aea6ef9f85ae4124115ac5d4 /drivers/pci/controller/pcie-rcar.c | |
| parent | PCI: rcar: Fix a potential NULL pointer dereference (diff) | |
| download | kernel-a27beb5820d1a52b1e2863a4ae5545a1dd4ab35a.tar.gz kernel-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 <[email protected]>
[[email protected]: commit log refactoring]
Signed-off-by: Lorenzo Pieralisi <[email protected]>
Reviewed-by: Geert Uytterhoeven <[email protected]>
Reviewed-by: Simon Horman <[email protected]>
Diffstat (limited to 'drivers/pci/controller/pcie-rcar.c')
| -rw-r--r-- | drivers/pci/controller/pcie-rcar.c | 8 |
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(®, 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 { |