Merge branch 'next-i2c' of git://aeryn.fluff.org.uk/bjdooks/linux
* 'next-i2c' of git://aeryn.fluff.org.uk/bjdooks/linux: [PATCH] i2c-imx: make bus available early i2c-mv64xxx: correct mv64xxx_i2c_intr() return type
This commit is contained in:
commit
996a798abb
|
@ -609,13 +609,12 @@ static int __init i2c_adap_imx_init(void)
|
|||
{
|
||||
return platform_driver_probe(&i2c_imx_driver, i2c_imx_probe);
|
||||
}
|
||||
subsys_initcall(i2c_adap_imx_init);
|
||||
|
||||
static void __exit i2c_adap_imx_exit(void)
|
||||
{
|
||||
platform_driver_unregister(&i2c_imx_driver);
|
||||
}
|
||||
|
||||
module_init(i2c_adap_imx_init);
|
||||
module_exit(i2c_adap_imx_exit);
|
||||
|
||||
MODULE_LICENSE("GPL");
|
||||
|
|
|
@ -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) &
|
||||
|
|
Loading…
Reference in a new issue