From: Hauke Mehrtens Date: Thu, 3 Jan 2013 23:51:25 +0000 (+0100) Subject: bcma: mips: rename oldirqflag to irqinitmask X-Git-Tag: upstream/snapshot3+hdmi~5708^2~242^2^2~52 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6ba1eafed183c6e0886d3483c8acac4efe1e95db;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git bcma: mips: rename oldirqflag to irqinitmask The new name better matches the use of this variable. Signed-off-by: Hauke Mehrtens Signed-off-by: John W. Linville --- diff --git a/drivers/bcma/driver_mips.c b/drivers/bcma/driver_mips.c index c6d7be3..8a51c79 100644 --- a/drivers/bcma/driver_mips.c +++ b/drivers/bcma/driver_mips.c @@ -130,9 +130,9 @@ static void bcma_core_mips_set_irq(struct bcma_device *dev, unsigned int irq) bcma_read32(mdev, BCMA_MIPS_MIPS74K_INTMASK(0)) | (1 << irqflag)); } else { - u32 oldirqflag = bcma_read32(mdev, - BCMA_MIPS_MIPS74K_INTMASK(irq)); - if (oldirqflag) { + u32 irqinitmask = bcma_read32(mdev, + BCMA_MIPS_MIPS74K_INTMASK(irq)); + if (irqinitmask) { struct bcma_device *core; /* backplane irq line is in use, find out who uses @@ -140,7 +140,7 @@ static void bcma_core_mips_set_irq(struct bcma_device *dev, unsigned int irq) */ list_for_each_entry(core, &bus->cores, list) { if ((1 << bcma_core_mips_irqflag(core)) == - oldirqflag) { + irqinitmask) { bcma_core_mips_set_irq(core, 0); break; }