From mboxrd@z Thu Jan 1 00:00:00 1970 From: rmallon@gmail.com (Ryan Mallon) Date: Mon, 20 Feb 2012 12:52:45 +1100 Subject: [PATCH 04/18] ARM: at91: make ST (System Timer) soc independent In-Reply-To: <20120220013825.GD29599@game.jcrosoft.org> References: <1329501010-30468-1-git-send-email-nicolas.ferre@atmel.com> <957702b1ff83afcc0a8e842f53f05ff3f40b78b3.1329500622.git.nicolas.ferre@atmel.com> <4F419246.6080405@gmail.com> <20120220013825.GD29599@game.jcrosoft.org> Message-ID: <4F41A76D.1070409@gmail.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On 20/02/12 12:38, Jean-Christophe PLAGNIOL-VILLARD wrote: > On 11:22 Mon 20 Feb , Ryan Mallon wrote: >> On 18/02/12 04:49, Nicolas Ferre wrote: >> >>> From: Jean-Christophe PLAGNIOL-VILLARD >>> >>> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD >>> Acked-by: Nicolas Ferre >>> --- >>> arch/arm/mach-at91/at91rm9200.c | 4 +- >>> arch/arm/mach-at91/at91rm9200_time.c | 37 ++++++++++++++++---------- >>> arch/arm/mach-at91/generic.h | 1 + >>> arch/arm/mach-at91/include/mach/at91_st.h | 32 +++++++++++++++------- >>> arch/arm/mach-at91/include/mach/at91rm9200.h | 2 +- >>> drivers/watchdog/at91rm9200_wdt.c | 8 +++--- >>> 6 files changed, 53 insertions(+), 31 deletions(-) >>> >>> diff --git a/arch/arm/mach-at91/at91rm9200.c b/arch/arm/mach-at91/at91rm9200.c >> >> Hi Jean, Nicolas, >> >> Patch looks mostly good, couple of points below. >> >> ~Ryan >> >> >> >>> /* Cancel any pending alarm; flush any pending IRQ */ >>> - at91_sys_write(AT91_ST_RTAR, alm); >>> - (void) at91_sys_read(AT91_ST_SR); >>> + at91_st_write(AT91_ST_RTAR, alm); >>> + (void) at91_st_read(AT91_ST_SR); >> >> >> Can we please remove the (void) casting of the return value when making >> this change, especially since at91_st_read is now a macro which doesn't >> even have a return value. Same in a few other places. > modification done by script and it's no the scope of this patch That isn't an excuse to leave incorrect code there. It is a simple fix. ~Ryan