Commit 58cdfe6f authored by Tom Rix's avatar Tom Rix Committed by Mika Westerberg
Browse files

thunderbolt: Rename shadowed variables bit to interrupt_bit and auto_clear_bit 



cppcheck reports
drivers/thunderbolt/nhi.c:74:7: style: Local variable 'bit' shadows outer variable [shadowVariable]
  int bit;
      ^
drivers/thunderbolt/nhi.c:66:6: note: Shadowed declaration
 int bit = ring_interrupt_index(ring) & 31;
     ^
drivers/thunderbolt/nhi.c:74:7: note: Shadow variable
  int bit;
      ^
For readablity rename the outer to interrupt_bit and the innner
to auto_clear_bit.

Fixes: 468c49f4 ("thunderbolt: Disable interrupt auto clear for ring")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarTom Rix <trix@redhat.com>
Signed-off-by: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
parent 468c49f4

drivers/thunderbolt/nhi.c

+9 −8
Original line number Diff line number Diff line
@@ -63,15 +63,15 @@ static void ring_interrupt_active(struct tb_ring *ring, bool active) 
{

	int reg = REG_RING_INTERRUPT_BASE +

		  ring_interrupt_index(ring) / 32 * 4;

	int bit = ring_interrupt_index(ring) & 31;

	int mask = 1 << bit;

	int interrupt_bit = ring_interrupt_index(ring) & 31;

	int mask = 1 << interrupt_bit;

	u32 old, new;



	if (ring->irq > 0) {

		u32 step, shift, ivr, misc;

		void __iomem *ivr_base;

		int auto_clear_bit;

		int index;

		int bit;



		if (ring->is_tx)

			index = ring->hop;
@@ -91,11 +91,12 @@ static void ring_interrupt_active(struct tb_ring *ring, bool active) 
		 */

		misc = ioread32(ring->nhi->iobase + REG_DMA_MISC);

		if (ring->nhi->quirks & QUIRK_AUTO_CLEAR_INT)

			bit = REG_DMA_MISC_INT_AUTO_CLEAR;

			auto_clear_bit = REG_DMA_MISC_INT_AUTO_CLEAR;

		else

			bit = REG_DMA_MISC_DISABLE_AUTO_CLEAR;

		if (!(misc & bit))

			iowrite32(misc | bit, ring->nhi->iobase + REG_DMA_MISC);

			auto_clear_bit = REG_DMA_MISC_DISABLE_AUTO_CLEAR;

		if (!(misc & auto_clear_bit))

			iowrite32(misc | auto_clear_bit,

				  ring->nhi->iobase + REG_DMA_MISC);



		ivr_base = ring->nhi->iobase + REG_INT_VEC_ALLOC_BASE;

		step = index / REG_INT_VEC_ALLOC_REGS * REG_INT_VEC_ALLOC_BITS;
@@ -115,7 +116,7 @@ static void ring_interrupt_active(struct tb_ring *ring, bool active) 


	dev_dbg(&ring->nhi->pdev->dev,

		"%s interrupt at register %#x bit %d (%#x -> %#x)\n",

		active ? "enabling" : "disabling", reg, bit, old, new);

		active ? "enabling" : "disabling", reg, interrupt_bit, old, new);



	if (new == old)

		dev_WARN(&ring->nhi->pdev->dev,