linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 1/2] ARM: ixp2000: fix type of ixp2000_timer_interrupt
@ 2010-01-23 21:01 Uwe Kleine-König
  2010-02-12 10:49 ` Uwe Kleine-König
  0 siblings, 1 reply; 2+ messages in thread
From: Uwe Kleine-König @ 2010-01-23 21:01 UTC (permalink / raw)
  To: linux-arm-kernel

This fixes a build warning for 2.6.33-rc5:

	arch/arm/mach-ixp2000/core.c:217: warning: initialization from incompatible pointer type

Signed-off-by: Uwe Kleine-K?nig <u.kleine-koenig@pengutronix.de>
---
 arch/arm/mach-ixp2000/core.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/arm/mach-ixp2000/core.c b/arch/arm/mach-ixp2000/core.c
index babb225..e24e3d0 100644
--- a/arch/arm/mach-ixp2000/core.c
+++ b/arch/arm/mach-ixp2000/core.c
@@ -197,7 +197,7 @@ unsigned long ixp2000_gettimeoffset (void)
 	return offset / ticks_per_usec;
 }
 
-static int ixp2000_timer_interrupt(int irq, void *dev_id)
+static irqreturn_t ixp2000_timer_interrupt(int irq, void *dev_id)
 {
 	/* clear timer 1 */
 	ixp2000_reg_wrb(IXP2000_T1_CLR, 1);
-- 
1.6.6

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [PATCH 1/2] ARM: ixp2000: fix type of ixp2000_timer_interrupt
  2010-01-23 21:01 [PATCH 1/2] ARM: ixp2000: fix type of ixp2000_timer_interrupt Uwe Kleine-König
@ 2010-02-12 10:49 ` Uwe Kleine-König
  0 siblings, 0 replies; 2+ messages in thread
From: Uwe Kleine-König @ 2010-02-12 10:49 UTC (permalink / raw)
  To: linux-arm-kernel

Hi Russell,

On Sat, Jan 23, 2010 at 10:01:39PM +0100, Uwe Kleine-K?nig wrote:
> This fixes a build warning for 2.6.33-rc5:
> 
> 	arch/arm/mach-ixp2000/core.c:217: warning: initialization from incompatible pointer type
> 
> Signed-off-by: Uwe Kleine-K?nig <u.kleine-koenig@pengutronix.de>
> ---
>  arch/arm/mach-ixp2000/core.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/arch/arm/mach-ixp2000/core.c b/arch/arm/mach-ixp2000/core.c
> index babb225..e24e3d0 100644
> --- a/arch/arm/mach-ixp2000/core.c
> +++ b/arch/arm/mach-ixp2000/core.c
> @@ -197,7 +197,7 @@ unsigned long ixp2000_gettimeoffset (void)
>  	return offset / ticks_per_usec;
>  }
>  
> -static int ixp2000_timer_interrupt(int irq, void *dev_id)
> +static irqreturn_t ixp2000_timer_interrupt(int irq, void *dev_id)
>  {
>  	/* clear timer 1 */
>  	ixp2000_reg_wrb(IXP2000_T1_CLR, 1);
what do you think about this patch?  It's (IMHO) trivial and fixes a
long standing build warning.

Best regards
Uwe

-- 
Pengutronix e.K.                           | Uwe Kleine-K?nig            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2010-02-12 10:49 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-01-23 21:01 [PATCH 1/2] ARM: ixp2000: fix type of ixp2000_timer_interrupt Uwe Kleine-König
2010-02-12 10:49 ` Uwe Kleine-König

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).