lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'next-i2c' of git://aeryn.fluff.org.uk/bjdooks/linux

Browse Source 
* '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:
Linus Torvalds
2009-09-20 15:55:56 -07:00
parent a57c21c715 5d3f33318a
commit 996a798abb
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/i2c/busses/i2c-imx.c
View File

@@ -609,13 +609,12 @@ static int __init i2c_adap_imx_init(void)
{ {
return platform_driver_probe(&i2c_imx_driver, i2c_imx_probe); return platform_driver_probe(&i2c_imx_driver, i2c_imx_probe);
} }
subsys_initcall(i2c_adap_imx_init);
static void __exit i2c_adap_imx_exit(void) static void __exit i2c_adap_imx_exit(void)
{ {
platform_driver_unregister(&i2c_imx_driver); platform_driver_unregister(&i2c_imx_driver);
} }
module_init(i2c_adap_imx_init);
module_exit(i2c_adap_imx_exit); module_exit(i2c_adap_imx_exit);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");

4
drivers/i2c/busses/i2c-mv64xxx.c
View File

@@ -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) &