2009-09-07 10:27:22

by Mikael Pettersson

Subject: [PATCH 2.6.31-rc9] i2c-mv64xxx.c: correct mv64xxx_i2c_intr() return type

The mv64xxx_i2c_intr() irq handler in drivers/i2c/busses/i2c-mv64xxx.c
is declared as returning 'int', resulting in this compile-time warning:

drivers/i2c/busses/i2c-mv64xxx.c: In function 'mv64xxx_i2c_probe':
drivers/i2c/busses/i2c-mv64xxx.c:540: warning: passing argument 2 of 'request_irq' from incompatible pointer type

Fix: correct the return type to 'irqreturn_t'.

Signed-off-by: Mikael Pettersson <[email protected]>
---
drivers/i2c/busses/i2c-mv64xxx.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

--- linux-2.6.31-rc9/drivers/i2c/busses/i2c-mv64xxx.c.~1~ 2009-09-06 12:20:56.000000000 +0200
+++ linux-2.6.31-rc9/drivers/i2c/busses/i2c-mv64xxx.c 2009-09-07 11:31:43.000000000 +0200
@@ -293,13 +293,13 @@ mv64xxx_i2c_do_action(struct mv64xxx_i2c
}
}

-static int
+static irqreturn_t
mv64xxx_i2c_intr(int irq, void *dev_id)
{
struct mv64xxx_i2c_data *drv_data = dev_id;
unsigned long flags;
u32 status;
- int rc = IRQ_NONE;
+ irqreturn_t rc = IRQ_NONE;

spin_lock_irqsave(&drv_data->lock, flags);
while (readl(drv_data->reg_base + MV64XXX_I2C_REG_CONTROL) &

2009-09-08 17:35:20

by Mark A. Greer

Subject: Re: [PATCH 2.6.31-rc9] i2c-mv64xxx.c: correct mv64xxx_i2c_intr() return type

On Mon, Sep 07, 2009 at 12:00:13PM +0200, Mikael Pettersson wrote:
> The mv64xxx_i2c_intr() irq handler in drivers/i2c/busses/i2c-mv64xxx.c
> is declared as returning 'int', resulting in this compile-time warning:
>
> drivers/i2c/busses/i2c-mv64xxx.c: In function 'mv64xxx_i2c_probe':
> drivers/i2c/busses/i2c-mv64xxx.c:540: warning: passing argument 2 of 'request_irq' from incompatible pointer type
>
> Fix: correct the return type to 'irqreturn_t'.
>
> Signed-off-by: Mikael Pettersson <[email protected]>

Signed-off-by: Mark A. Greer <[email protected]>