Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

i2c-mv64xxx: 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 <mikpe@it.uu.se>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>

authored by

Mikael Pettersson and committed by
Ben Dooks
b0999cc5 78f28b7c

+2 -2
+2 -2
drivers/i2c/busses/i2c-mv64xxx.c
··· 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) &