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

torvalds · torvalds · commit 996a798abb36 · 2009-09-20T15:55:56.000-07:00
* '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
diff --git a/drivers/i2c/busses/i2c-imx.c b/drivers/i2c/busses/i2c-imx.c
@@ -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");
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
`@@ -609,13 +609,12 @@ static int __init i2c_adap_imx_init(void)`
`609`	`609`	`{`
`610`	`610`	`return platform_driver_probe(&i2c_imx_driver, i2c_imx_probe);`
`611`	`611`	`}`
	`612`	`+subsys_initcall(i2c_adap_imx_init);`
`612`	`613`
`613`	`614`	`static void __exit i2c_adap_imx_exit(void)`
`614`	`615`	`{`
`615`	`616`	`platform_driver_unregister(&i2c_imx_driver);`
`616`	`617`	`}`
`617`		`-`
`618`		`-module_init(i2c_adap_imx_init);`
`619`	`618`	`module_exit(i2c_adap_imx_exit);`
`620`	`619`
`621`	`620`	`MODULE_LICENSE("GPL");`
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) &`