diff options
author | Juergen Borleis <jbe@pengutronix.de> | 2015-02-13 17:40:42 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-14 00:21:43 -0500 |
commit | 6df17a6577ee1f4dc5d36a1520f8f3bfb38852c8 (patch) | |
tree | d498900143d45cf5a55fd1ce2f32cf850ba45d0f /drivers/rtc | |
parent | 1a67e256dbd80f47f339c4a88c34deee12489aa0 (diff) |
drivers/rtc/rtc-imxdi.c: trivial clean up code
Signed-off-by: Juergen Borleis <jbe@pengutronix.de>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/rtc')
-rw-r--r-- | drivers/rtc/rtc-imxdi.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/rtc/rtc-imxdi.c b/drivers/rtc/rtc-imxdi.c index 42f5570f42f8..2b475a2c44ce 100644 --- a/drivers/rtc/rtc-imxdi.c +++ b/drivers/rtc/rtc-imxdi.c | |||
@@ -313,7 +313,7 @@ static irqreturn_t dryice_norm_irq(int irq, void *dev_id) | |||
313 | dier = __raw_readl(imxdi->ioaddr + DIER); | 313 | dier = __raw_readl(imxdi->ioaddr + DIER); |
314 | 314 | ||
315 | /* handle write complete and write error cases */ | 315 | /* handle write complete and write error cases */ |
316 | if ((dier & DIER_WCIE)) { | 316 | if (dier & DIER_WCIE) { |
317 | /*If the write wait queue is empty then there is no pending | 317 | /*If the write wait queue is empty then there is no pending |
318 | operations. It means the interrupt is for DryIce -Security. | 318 | operations. It means the interrupt is for DryIce -Security. |
319 | IRQ must be returned as none.*/ | 319 | IRQ must be returned as none.*/ |
@@ -322,7 +322,7 @@ static irqreturn_t dryice_norm_irq(int irq, void *dev_id) | |||
322 | 322 | ||
323 | /* DSR_WCF clears itself on DSR read */ | 323 | /* DSR_WCF clears itself on DSR read */ |
324 | dsr = __raw_readl(imxdi->ioaddr + DSR); | 324 | dsr = __raw_readl(imxdi->ioaddr + DSR); |
325 | if ((dsr & (DSR_WCF | DSR_WEF))) { | 325 | if (dsr & (DSR_WCF | DSR_WEF)) { |
326 | /* mask the interrupt */ | 326 | /* mask the interrupt */ |
327 | di_int_disable(imxdi, DIER_WCIE); | 327 | di_int_disable(imxdi, DIER_WCIE); |
328 | 328 | ||
@@ -335,7 +335,7 @@ static irqreturn_t dryice_norm_irq(int irq, void *dev_id) | |||
335 | } | 335 | } |
336 | 336 | ||
337 | /* handle the alarm case */ | 337 | /* handle the alarm case */ |
338 | if ((dier & DIER_CAIE)) { | 338 | if (dier & DIER_CAIE) { |
339 | /* DSR_WCF clears itself on DSR read */ | 339 | /* DSR_WCF clears itself on DSR read */ |
340 | dsr = __raw_readl(imxdi->ioaddr + DSR); | 340 | dsr = __raw_readl(imxdi->ioaddr + DSR); |
341 | if (dsr & DSR_CAF) { | 341 | if (dsr & DSR_CAF) { |