i2c-mv64xxx: correct mv64xxx_i2c_intr() return type

Mikael Pettersson · Ben Dooks · commit b0999cc55bd4 · 2009-09-19T23:02:03.000+01:00
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 &lt;mikpe@it.uu.se&gt;
Signed-off-by: Ben Dooks &lt;ben-linux@fluff.org&gt;
diff --git a/drivers/i2c/busses/i2c-mv64xxx.c b/drivers/i2c/busses/i2c-mv64xxx.c
@@ -293,13 +293,13 @@ mv64xxx_i2c_do_action(struct mv64xxx_i2c_data *drv_data)
 	}
 }
 
-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) &

Original file line number	Diff line number	Diff line change
`@@ -293,13 +293,13 @@ mv64xxx_i2c_do_action(struct mv64xxx_i2c_data *drv_data)`
`293`	`293`	`}`
`294`	`294`	`}`
`295`	`295`
`296`		`-static int`
	`296`	`+static irqreturn_t`
`297`	`297`	`mv64xxx_i2c_intr(int irq, void *dev_id)`
`298`	`298`	`{`
`299`	`299`	`struct mv64xxx_i2c_data *drv_data = dev_id;`
`300`	`300`	`unsigned long flags;`
`301`	`301`	`u32 status;`
`302`		`- int rc = IRQ_NONE;`
	`302`	`+ irqreturn_t rc = IRQ_NONE;`
`303`	`303`
`304`	`304`	`spin_lock_irqsave(&drv_data->lock, flags);`
`305`	`305`	`while (readl(drv_data->reg_base + MV64XXX_I2C_REG_CONTROL) &`