Commit b0999cc5 authored by Mikael Pettersson's avatar Mikael Pettersson Committed by Ben Dooks

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: default avatarMikael Pettersson <mikpe@it.uu.se>
Signed-off-by: default avatarBen Dooks <ben-linux@fluff.org>
parent 78f28b7c
...@@ -293,13 +293,13 @@ mv64xxx_i2c_do_action(struct mv64xxx_i2c_data *drv_data) ...@@ -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) mv64xxx_i2c_intr(int irq, void *dev_id)
{ {
struct mv64xxx_i2c_data *drv_data = dev_id; struct mv64xxx_i2c_data *drv_data = dev_id;
unsigned long flags; unsigned long flags;
u32 status; u32 status;
int rc = IRQ_NONE; irqreturn_t rc = IRQ_NONE;
spin_lock_irqsave(&drv_data->lock, flags); spin_lock_irqsave(&drv_data->lock, flags);
while (readl(drv_data->reg_base + MV64XXX_I2C_REG_CONTROL) & while (readl(drv_data->reg_base + MV64XXX_I2C_REG_CONTROL) &
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment