Merge branch 'omap4_next' of git://dev.omapzoom.org/pub/scm/santosh/kernel-omap4-base into L24x9

6 files changed, 14 insertions, 14 deletions

diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
index 639716a69f0d..39c7d127c041 100644
--- a/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c
@@ -179,7 +179,7 @@ struct omap_i2c_dev {
 	struct completion	cmd_complete;
 	struct resource		*ioarea;
 	u32			latency;	/* maximum mpu wkup latency */
-	void			(*set_mpu_wkup_lat)(struct device *dev,
+	int			(*set_mpu_wkup_lat)(struct pm_qos_request_list **qos_request,
 						    long latency);
 	u32			speed;		/* Speed of bus in Khz */
 	u16			cmd_err;
diff --git a/drivers/mfd/twl-core.c b/drivers/mfd/twl-core.c
index 4cd08d5be833..78907f65223b 100644
--- a/drivers/mfd/twl-core.c
+++ b/drivers/mfd/twl-core.c
@@ -962,7 +962,7 @@ int twl4030_init_chip_irq(const char *chip);
 int twl6030_init_irq(int irq_num, unsigned irq_base, unsigned irq_end);
 int twl6030_exit_irq(void);
 
-static int twl_remove(struct i2c_client *client)
+static int __devexit twl_remove(struct i2c_client *client)
 {
 	unsigned i;
 	int status;
@@ -987,7 +987,7 @@ static int twl_remove(struct i2c_client *client)
 }
 
 /* NOTE:  this driver only handles a single twl4030/tps659x0 chip */
-static int __init
+static int __devinit
 twl_probe(struct i2c_client *client, const struct i2c_device_id *id)
 {
 	int				status;
@@ -1107,7 +1107,7 @@ static struct i2c_driver twl_driver = {
 	.driver.name	= DRIVER_NAME,
 	.id_table	= twl_ids,
 	.probe		= twl_probe,
-	.remove		= twl_remove,
+	.remove		= __devexit_p(twl_remove),
 };
 
 static int __init twl_init(void)
diff --git a/drivers/mfd/twl6030-gpadc.c b/drivers/mfd/twl6030-gpadc.c
index 3a0773134c9a..0c7dfb94b990 100644
--- a/drivers/mfd/twl6030-gpadc.c
+++ b/drivers/mfd/twl6030-gpadc.c
@@ -380,7 +380,7 @@ static struct miscdevice twl6030_gpadc_device = {
 	.fops = &twl6030_gpadc_fileops
 };
 
-static int __init twl6030_gpadc_probe(struct platform_device *pdev)
+static int __devinit twl6030_gpadc_probe(struct platform_device *pdev)
 {
 	struct twl6030_gpadc_data *gpadc;
 	struct twl6030_gpadc_platform_data *pdata = pdev->dev.platform_data;
@@ -431,7 +431,7 @@ err_pdata:
 	return ret;
 }
 
-static int __exit twl6030_gpadc_remove(struct platform_device *pdev)
+static int __devexit twl6030_gpadc_remove(struct platform_device *pdev)
 {
 	struct twl6030_gpadc_data *gpadc = platform_get_drvdata(pdev);
 
@@ -446,7 +446,7 @@ static int __exit twl6030_gpadc_remove(struct platform_device *pdev)
 
 static struct platform_driver twl6030_gpadc_driver = {
 	.probe		= twl6030_gpadc_probe,
-	.remove		= __exit_p(twl6030_gpadc_remove),
+	.remove		= __devexit_p(twl6030_gpadc_remove),
 	.driver		= {
 		.name	= "twl6030_gpadc",
 		.owner	= THIS_MODULE,
diff --git a/drivers/power/bq2415x_charger.c b/drivers/power/bq2415x_charger.c
index bd7f2df8c3a1..72e4d8da2c09 100644
--- a/drivers/power/bq2415x_charger.c
+++ b/drivers/power/bq2415x_charger.c
@@ -388,7 +388,7 @@ static const struct attribute_group bq2415x_attr_group = {
 	.attrs = bq2415x_attributes,
 };
 
-static int __init bq2415x_charger_probe(struct i2c_client *client,
+static int __devinit bq2415x_charger_probe(struct i2c_client *client,
 				 const struct i2c_device_id *id)
 {
 	struct bq2415x_device_info *di;
@@ -457,7 +457,7 @@ err_kfree:
 	return ret;
 }
 
-static int __exit bq2415x_charger_remove(struct i2c_client *client)
+static int __devexit bq2415x_charger_remove(struct i2c_client *client)
 {
 	struct bq2415x_device_info *di = i2c_get_clientdata(client);
 
@@ -477,7 +477,7 @@ static const struct i2c_device_id bq2415x_id[] = {
 
 static struct i2c_driver bq2415x_charger_driver = {
 	.probe		= bq2415x_charger_probe,
-	.remove		= __exit_p(bq2415x_charger_remove),
+	.remove		= __devexit_p(bq2415x_charger_remove),
 	.id_table	= bq2415x_id,
 	.driver		= {
 		.name	= "bq2415x_charger",
diff --git a/drivers/power/twl6030_bci_battery.c b/drivers/power/twl6030_bci_battery.c
index 606b3e247940..b83f3919b649 100644
--- a/drivers/power/twl6030_bci_battery.c
+++ b/drivers/power/twl6030_bci_battery.c
@@ -997,7 +997,7 @@ static char *twl6030_bci_supplied_to[] = {
 	"twl6030_bci_battery",
 };
 
-static int __init twl6030_bci_battery_probe(struct platform_device *pdev)
+static int __devinit twl6030_bci_battery_probe(struct platform_device *pdev)
 {
 	struct twl4030_bci_platform_data *pdata = pdev->dev.platform_data;
 	struct twl6030_bci_device_info *di;
@@ -1157,7 +1157,7 @@ temp_setup_fail:
 	return ret;
 }
 
-static int __exit twl6030_bci_battery_remove(struct platform_device *pdev)
+static int __devexit twl6030_bci_battery_remove(struct platform_device *pdev)
 {
 	struct twl6030_bci_device_info *di = platform_get_drvdata(pdev);
 	int irq;
@@ -1216,7 +1216,7 @@ static int twl6030_bci_battery_resume(struct platform_device *pdev)
 
 static struct platform_driver twl6030_bci_battery_driver = {
 	.probe		= twl6030_bci_battery_probe,
-	.remove		= __exit_p(twl6030_bci_battery_remove),
+	.remove		= __devexit_p(twl6030_bci_battery_remove),
 	.suspend	= twl6030_bci_battery_suspend,
 	.resume		= twl6030_bci_battery_resume,
 	.driver		= {
diff --git a/drivers/spi/omap2_mcspi.c b/drivers/spi/omap2_mcspi.c
index d8f8e49c11df..ce64e5fce096 100644
--- a/drivers/spi/omap2_mcspi.c
+++ b/drivers/spi/omap2_mcspi.c
@@ -462,7 +462,7 @@ omap2_mcspi_txrx_dma(struct spi_device *spi, struct spi_transfer *xfer)
 	unsigned int		count, c, bytes_per_transfer;
 	unsigned long		base, tx_reg, rx_reg;
 	int			word_len, data_type, element_count;
-	int			elements, frame_count, sync_type;
+	int			elements = 0, frame_count, sync_type;
 	u32			l;
 	u8			* rx;
 	const u8		* tx;