The patch titled Subject: drivers/rtc/rtc-imxdi.c: trivial clean up code has been added to the -mm tree. Its filename is rtc-imx-dryice-trivial-clean-up-code.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/rtc-imx-dryice-trivial-clean-up-code.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/rtc-imx-dryice-trivial-clean-up-code.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Juergen Borleis <jbe@xxxxxxxxxxxxxx> Subject: drivers/rtc/rtc-imxdi.c: trivial clean up code Signed-off-by: Juergen Borleis <jbe@xxxxxxxxxxxxxx> Cc: Alessandro Zummo <a.zummo@xxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/rtc/rtc-imxdi.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff -puN drivers/rtc/rtc-imxdi.c~rtc-imx-dryice-trivial-clean-up-code drivers/rtc/rtc-imxdi.c --- a/drivers/rtc/rtc-imxdi.c~rtc-imx-dryice-trivial-clean-up-code +++ a/drivers/rtc/rtc-imxdi.c @@ -313,7 +313,7 @@ static irqreturn_t dryice_norm_irq(int i dier = __raw_readl(imxdi->ioaddr + DIER); /* handle write complete and write error cases */ - if ((dier & DIER_WCIE)) { + if (dier & DIER_WCIE) { /*If the write wait queue is empty then there is no pending operations. It means the interrupt is for DryIce -Security. IRQ must be returned as none.*/ @@ -322,7 +322,7 @@ static irqreturn_t dryice_norm_irq(int i /* DSR_WCF clears itself on DSR read */ dsr = __raw_readl(imxdi->ioaddr + DSR); - if ((dsr & (DSR_WCF | DSR_WEF))) { + if (dsr & (DSR_WCF | DSR_WEF)) { /* mask the interrupt */ di_int_disable(imxdi, DIER_WCIE); @@ -335,7 +335,7 @@ static irqreturn_t dryice_norm_irq(int i } /* handle the alarm case */ - if ((dier & DIER_CAIE)) { + if (dier & DIER_CAIE) { /* DSR_WCF clears itself on DSR read */ dsr = __raw_readl(imxdi->ioaddr + DSR); if (dsr & DSR_CAF) { _ Patches currently in -mm which might be from jbe@xxxxxxxxxxxxxx are rtc-imx-dryice-trivial-clean-up-code.patch rtc-imx-dryice-add-more-known-register-bits.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html