aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Pemberton <wfp5p@virginia.edu>2012-11-19 13:23:04 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-11-28 15:20:19 -0500
commitf791be492f76dea7b0641ed227a60eeb2fa7e255 (patch)
tree1b5348c9b5b47e0927d66cba269a441ac653e564
parent84449216b01f9c2b4c9b1882f9d6abba07b7b7ca (diff)
mfd: remove use of __devinit
CONFIG_HOTPLUG is going away as an option so __devinit is no longer needed. Signed-off-by: Bill Pemberton <wfp5p@virginia.edu> Cc: Srinidhi Kasagar <srinidhi.kasagar@stericsson.com> Cc: Peter Tyser <ptyser@xes-inc.com> Cc: Daniel Walker <dwalker@fifo99.com> Cc: Bryan Huntsman <bryanh@codeaurora.org> Acked-by: David Brown <davidb@codeaurora.org> Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat
-rw-r--r--drivers/mfd/88pm800.c8
-rw-r--r--drivers/mfd/88pm805.c6
-rw-r--r--drivers/mfd/88pm80x.c2
-rw-r--r--drivers/mfd/88pm860x-core.c30
-rw-r--r--drivers/mfd/ab3100-core.c4
-rw-r--r--drivers/mfd/ab8500-core.c2
-rw-r--r--drivers/mfd/ab8500-debugfs.c2
-rw-r--r--drivers/mfd/ab8500-gpadc.c2
-rw-r--r--drivers/mfd/ab8500-sysctrl.c2
-rw-r--r--drivers/mfd/adp5520.c2
-rw-r--r--drivers/mfd/arizona-core.c2
-rw-r--r--drivers/mfd/arizona-i2c.c2
-rw-r--r--drivers/mfd/arizona-spi.c2
-rw-r--r--drivers/mfd/cs5535-mfd.c4
-rw-r--r--drivers/mfd/da903x.c6
-rw-r--r--drivers/mfd/da9052-core.c2
-rw-r--r--drivers/mfd/da9052-i2c.c2
-rw-r--r--drivers/mfd/da9052-spi.c2
-rw-r--r--drivers/mfd/da9055-core.c2
-rw-r--r--drivers/mfd/da9055-i2c.c2
-rw-r--r--drivers/mfd/db8500-prcmu.c2
-rw-r--r--drivers/mfd/ezx-pcap.c4
-rw-r--r--drivers/mfd/htc-i2cpld.c12
-rw-r--r--drivers/mfd/intel_msic.c4
-rw-r--r--drivers/mfd/janz-cmodio.c6
-rw-r--r--drivers/mfd/jz4740-adc.c2
-rw-r--r--drivers/mfd/lm3533-core.c12
-rw-r--r--drivers/mfd/lpc_ich.c14
-rw-r--r--drivers/mfd/lpc_sch.c2
-rw-r--r--drivers/mfd/max8907.c2
-rw-r--r--drivers/mfd/max8925-core.c4
-rw-r--r--drivers/mfd/max8925-i2c.c2
-rw-r--r--drivers/mfd/omap-usb-host.c2
-rw-r--r--drivers/mfd/omap-usb-tll.c2
-rw-r--r--drivers/mfd/palmas.c4
-rw-r--r--drivers/mfd/pcf50633-adc.c2
-rw-r--r--drivers/mfd/pcf50633-core.c2
-rw-r--r--drivers/mfd/pm8921-core.c4
-rw-r--r--drivers/mfd/pm8xxx-irq.c2
-rw-r--r--drivers/mfd/rc5t583.c2
-rw-r--r--drivers/mfd/rdc321x-southbridge.c2
-rw-r--r--drivers/mfd/sm501.c10
-rw-r--r--drivers/mfd/sta2x11-mfd.c4
-rw-r--r--drivers/mfd/stmpe-i2c.c2
-rw-r--r--drivers/mfd/stmpe-spi.c2
-rw-r--r--drivers/mfd/syscon.c2
-rw-r--r--drivers/mfd/tc3589x.c4
-rw-r--r--drivers/mfd/tc6387xb.c2
-rw-r--r--drivers/mfd/tc6393xb.c2
-rw-r--r--drivers/mfd/ti-ssp.c2
-rw-r--r--drivers/mfd/timberdale.c2
-rw-r--r--drivers/mfd/tps6105x.c4
-rw-r--r--drivers/mfd/tps65090.c4
-rw-r--r--drivers/mfd/tps65217.c2
-rw-r--r--drivers/mfd/tps6586x.c6
-rw-r--r--drivers/mfd/tps65910.c6
-rw-r--r--drivers/mfd/tps65911-comparator.c2
-rw-r--r--drivers/mfd/tps65912-spi.c2
-rw-r--r--drivers/mfd/twl-core.c2
-rw-r--r--drivers/mfd/twl4030-audio.c2
-rw-r--r--drivers/mfd/twl4030-madc.c2
-rw-r--r--drivers/mfd/twl4030-power.c20
-rw-r--r--drivers/mfd/vx855.c2
-rw-r--r--drivers/mfd/wl1273-core.c2
-rw-r--r--drivers/mfd/wm831x-spi.c2
-rw-r--r--drivers/mfd/wm8994-core.c4
-rw-r--r--include/linux/mfd/88pm80x.h2
-rw-r--r--include/linux/mfd/abx500/ab8500.h2
-rw-r--r--include/linux/mfd/pm8xxx/irq.h4
69 files changed, 138 insertions, 138 deletions
diff --git a/drivers/mfd/88pm800.c b/drivers/mfd/88pm800.c
index 321a50cdebf9..6746ecd260ad 100644
--- a/drivers/mfd/88pm800.c
+++ b/drivers/mfd/88pm800.c
@@ -248,7 +248,7 @@ static const struct regmap_irq pm800_irqs[] = {
248 }, 248 },
249}; 249};
250 250
251static int __devinit device_gpadc_init(struct pm80x_chip *chip, 251static int device_gpadc_init(struct pm80x_chip *chip,
252 struct pm80x_platform_data *pdata) 252 struct pm80x_platform_data *pdata)
253{ 253{
254 struct pm80x_subchip *subchip = chip->subchip; 254 struct pm80x_subchip *subchip = chip->subchip;
@@ -315,7 +315,7 @@ out:
315 return ret; 315 return ret;
316} 316}
317 317
318static int __devinit device_irq_init_800(struct pm80x_chip *chip) 318static int device_irq_init_800(struct pm80x_chip *chip)
319{ 319{
320 struct regmap *map = chip->regmap; 320 struct regmap *map = chip->regmap;
321 unsigned long flags = IRQF_TRIGGER_FALLING | IRQF_ONESHOT; 321 unsigned long flags = IRQF_TRIGGER_FALLING | IRQF_ONESHOT;
@@ -415,7 +415,7 @@ static void pm800_pages_exit(struct pm80x_chip *chip)
415 } 415 }
416} 416}
417 417
418static int __devinit device_800_init(struct pm80x_chip *chip, 418static int device_800_init(struct pm80x_chip *chip,
419 struct pm80x_platform_data *pdata) 419 struct pm80x_platform_data *pdata)
420{ 420{
421 int ret, pmic_id; 421 int ret, pmic_id;
@@ -499,7 +499,7 @@ out:
499 return ret; 499 return ret;
500} 500}
501 501
502static int __devinit pm800_probe(struct i2c_client *client, 502static int pm800_probe(struct i2c_client *client,
503 const struct i2c_device_id *id) 503 const struct i2c_device_id *id)
504{ 504{
505 int ret = 0; 505 int ret = 0;
diff --git a/drivers/mfd/88pm805.c b/drivers/mfd/88pm805.c
index 41e0488b4e3b..13c09941dc2c 100644
--- a/drivers/mfd/88pm805.c
+++ b/drivers/mfd/88pm805.c
@@ -135,7 +135,7 @@ static struct regmap_irq pm805_irqs[] = {
135 }, 135 },
136}; 136};
137 137
138static int __devinit device_irq_init_805(struct pm80x_chip *chip) 138static int device_irq_init_805(struct pm80x_chip *chip)
139{ 139{
140 struct regmap *map = chip->regmap; 140 struct regmap *map = chip->regmap;
141 unsigned long flags = IRQF_TRIGGER_FALLING | IRQF_ONESHOT; 141 unsigned long flags = IRQF_TRIGGER_FALLING | IRQF_ONESHOT;
@@ -189,7 +189,7 @@ static struct regmap_irq_chip pm805_irq_chip = {
189 .ack_base = PM805_INT_STATUS1, 189 .ack_base = PM805_INT_STATUS1,
190}; 190};
191 191
192static int __devinit device_805_init(struct pm80x_chip *chip) 192static int device_805_init(struct pm80x_chip *chip)
193{ 193{
194 int ret = 0; 194 int ret = 0;
195 unsigned int val; 195 unsigned int val;
@@ -232,7 +232,7 @@ out_irq_init:
232 return ret; 232 return ret;
233} 233}
234 234
235static int __devinit pm805_probe(struct i2c_client *client, 235static int pm805_probe(struct i2c_client *client,
236 const struct i2c_device_id *id) 236 const struct i2c_device_id *id)
237{ 237{
238 int ret = 0; 238 int ret = 0;
diff --git a/drivers/mfd/88pm80x.c b/drivers/mfd/88pm80x.c
index cd0bf527d764..1adb355d86d1 100644
--- a/drivers/mfd/88pm80x.c
+++ b/drivers/mfd/88pm80x.c
@@ -31,7 +31,7 @@ const struct regmap_config pm80x_regmap_config = {
31}; 31};
32EXPORT_SYMBOL_GPL(pm80x_regmap_config); 32EXPORT_SYMBOL_GPL(pm80x_regmap_config);
33 33
34int __devinit pm80x_init(struct i2c_client *client, 34int pm80x_init(struct i2c_client *client,
35 const struct i2c_device_id *id) 35 const struct i2c_device_id *id)
36{ 36{
37 struct pm80x_chip *chip; 37 struct pm80x_chip *chip;
diff --git a/drivers/mfd/88pm860x-core.c b/drivers/mfd/88pm860x-core.c
index c2d5595e49d0..ad36ad70a0c2 100644
--- a/drivers/mfd/88pm860x-core.c
+++ b/drivers/mfd/88pm860x-core.c
@@ -565,7 +565,7 @@ static struct irq_domain_ops pm860x_irq_domain_ops = {
565 .xlate = irq_domain_xlate_onetwocell, 565 .xlate = irq_domain_xlate_onetwocell,
566}; 566};
567 567
568static int __devinit device_irq_init(struct pm860x_chip *chip, 568static int device_irq_init(struct pm860x_chip *chip,
569 struct pm860x_platform_data *pdata) 569 struct pm860x_platform_data *pdata)
570{ 570{
571 struct i2c_client *i2c = (chip->id == CHIP_PM8607) ? chip->client \ 571 struct i2c_client *i2c = (chip->id == CHIP_PM8607) ? chip->client \
@@ -730,7 +730,7 @@ out:
730} 730}
731EXPORT_SYMBOL(pm8606_osc_disable); 731EXPORT_SYMBOL(pm8606_osc_disable);
732 732
733static void __devinit device_osc_init(struct i2c_client *i2c) 733static void device_osc_init(struct i2c_client *i2c)
734{ 734{
735 struct pm860x_chip *chip = i2c_get_clientdata(i2c); 735 struct pm860x_chip *chip = i2c_get_clientdata(i2c);
736 736
@@ -745,7 +745,7 @@ static void __devinit device_osc_init(struct i2c_client *i2c)
745 chip->osc_status = PM8606_REF_GP_OSC_OFF; 745 chip->osc_status = PM8606_REF_GP_OSC_OFF;
746} 746}
747 747
748static void __devinit device_bk_init(struct pm860x_chip *chip, 748static void device_bk_init(struct pm860x_chip *chip,
749 struct pm860x_platform_data *pdata) 749 struct pm860x_platform_data *pdata)
750{ 750{
751 int ret, i; 751 int ret, i;
@@ -765,7 +765,7 @@ static void __devinit device_bk_init(struct pm860x_chip *chip,
765 dev_err(chip->dev, "Failed to add backlight subdev\n"); 765 dev_err(chip->dev, "Failed to add backlight subdev\n");
766} 766}
767 767
768static void __devinit device_led_init(struct pm860x_chip *chip, 768static void device_led_init(struct pm860x_chip *chip,
769 struct pm860x_platform_data *pdata) 769 struct pm860x_platform_data *pdata)
770{ 770{
771 int ret, i; 771 int ret, i;
@@ -787,7 +787,7 @@ static void __devinit device_led_init(struct pm860x_chip *chip,
787 } 787 }
788} 788}
789 789
790static void __devinit device_regulator_init(struct pm860x_chip *chip, 790static void device_regulator_init(struct pm860x_chip *chip,
791 struct pm860x_platform_data *pdata) 791 struct pm860x_platform_data *pdata)
792{ 792{
793 int ret; 793 int ret;
@@ -866,7 +866,7 @@ static void __devinit device_regulator_init(struct pm860x_chip *chip,
866 } 866 }
867} 867}
868 868
869static void __devinit device_rtc_init(struct pm860x_chip *chip, 869static void device_rtc_init(struct pm860x_chip *chip,
870 struct pm860x_platform_data *pdata) 870 struct pm860x_platform_data *pdata)
871{ 871{
872 int ret; 872 int ret;
@@ -885,7 +885,7 @@ static void __devinit device_rtc_init(struct pm860x_chip *chip,
885 dev_err(chip->dev, "Failed to add rtc subdev\n"); 885 dev_err(chip->dev, "Failed to add rtc subdev\n");
886} 886}
887 887
888static void __devinit device_touch_init(struct pm860x_chip *chip, 888static void device_touch_init(struct pm860x_chip *chip,
889 struct pm860x_platform_data *pdata) 889 struct pm860x_platform_data *pdata)
890{ 890{
891 int ret; 891 int ret;
@@ -904,7 +904,7 @@ static void __devinit device_touch_init(struct pm860x_chip *chip,
904 dev_err(chip->dev, "Failed to add touch subdev\n"); 904 dev_err(chip->dev, "Failed to add touch subdev\n");
905} 905}
906 906
907static void __devinit device_power_init(struct pm860x_chip *chip, 907static void device_power_init(struct pm860x_chip *chip,
908 struct pm860x_platform_data *pdata) 908 struct pm860x_platform_data *pdata)
909{ 909{
910 int ret; 910 int ret;
@@ -951,7 +951,7 @@ static void __devinit device_power_init(struct pm860x_chip *chip,
951 } 951 }
952} 952}
953 953
954static void __devinit device_onkey_init(struct pm860x_chip *chip, 954static void device_onkey_init(struct pm860x_chip *chip,
955 struct pm860x_platform_data *pdata) 955 struct pm860x_platform_data *pdata)
956{ 956{
957 int ret; 957 int ret;
@@ -965,7 +965,7 @@ static void __devinit device_onkey_init(struct pm860x_chip *chip,
965 dev_err(chip->dev, "Failed to add onkey subdev\n"); 965 dev_err(chip->dev, "Failed to add onkey subdev\n");
966} 966}
967 967
968static void __devinit device_codec_init(struct pm860x_chip *chip, 968static void device_codec_init(struct pm860x_chip *chip,
969 struct pm860x_platform_data *pdata) 969 struct pm860x_platform_data *pdata)
970{ 970{
971 int ret; 971 int ret;
@@ -979,7 +979,7 @@ static void __devinit device_codec_init(struct pm860x_chip *chip,
979 dev_err(chip->dev, "Failed to add codec subdev\n"); 979 dev_err(chip->dev, "Failed to add codec subdev\n");
980} 980}
981 981
982static void __devinit device_8607_init(struct pm860x_chip *chip, 982static void device_8607_init(struct pm860x_chip *chip,
983 struct i2c_client *i2c, 983 struct i2c_client *i2c,
984 struct pm860x_platform_data *pdata) 984 struct pm860x_platform_data *pdata)
985{ 985{
@@ -1040,7 +1040,7 @@ out:
1040 return; 1040 return;
1041} 1041}
1042 1042
1043static void __devinit device_8606_init(struct pm860x_chip *chip, 1043static void device_8606_init(struct pm860x_chip *chip,
1044 struct i2c_client *i2c, 1044 struct i2c_client *i2c,
1045 struct pm860x_platform_data *pdata) 1045 struct pm860x_platform_data *pdata)
1046{ 1046{
@@ -1049,7 +1049,7 @@ static void __devinit device_8606_init(struct pm860x_chip *chip,
1049 device_led_init(chip, pdata); 1049 device_led_init(chip, pdata);
1050} 1050}
1051 1051
1052static int __devinit pm860x_device_init(struct pm860x_chip *chip, 1052static int pm860x_device_init(struct pm860x_chip *chip,
1053 struct pm860x_platform_data *pdata) 1053 struct pm860x_platform_data *pdata)
1054{ 1054{
1055 chip->core_irq = 0; 1055 chip->core_irq = 0;
@@ -1109,7 +1109,7 @@ static struct regmap_config pm860x_regmap_config = {
1109 .val_bits = 8, 1109 .val_bits = 8,
1110}; 1110};
1111 1111
1112static int __devinit pm860x_dt_init(struct device_node *np, 1112static int pm860x_dt_init(struct device_node *np,
1113 struct device *dev, 1113 struct device *dev,
1114 struct pm860x_platform_data *pdata) 1114 struct pm860x_platform_data *pdata)
1115{ 1115{
@@ -1127,7 +1127,7 @@ static int __devinit pm860x_dt_init(struct device_node *np,
1127 return 0; 1127 return 0;
1128} 1128}
1129 1129
1130static int __devinit pm860x_probe(struct i2c_client *client, 1130static int pm860x_probe(struct i2c_client *client,
1131 const struct i2c_device_id *id) 1131 const struct i2c_device_id *id)
1132{ 1132{
1133 struct pm860x_platform_data *pdata = client->dev.platform_data; 1133 struct pm860x_platform_data *pdata = client->dev.platform_data;
diff --git a/drivers/mfd/ab3100-core.c b/drivers/mfd/ab3100-core.c
index 8355d4ee6edd..84b2303bc770 100644
--- a/drivers/mfd/ab3100-core.c
+++ b/drivers/mfd/ab3100-core.c
@@ -708,7 +708,7 @@ ab3100_init_settings[] = {
708 }, 708 },
709}; 709};
710 710
711static int __devinit ab3100_setup(struct ab3100 *ab3100) 711static int ab3100_setup(struct ab3100 *ab3100)
712{ 712{
713 int err = 0; 713 int err = 0;
714 int i; 714 int i;
@@ -857,7 +857,7 @@ static const struct ab_family_id ids[] __devinitconst = {
857 }, 857 },
858}; 858};
859 859
860static int __devinit ab3100_probe(struct i2c_client *client, 860static int ab3100_probe(struct i2c_client *client,
861 const struct i2c_device_id *id) 861 const struct i2c_device_id *id)
862{ 862{
863 struct ab3100 *ab3100; 863 struct ab3100 *ab3100;
diff --git a/drivers/mfd/ab8500-core.c b/drivers/mfd/ab8500-core.c
index 01a0e01f6a6c..43245f2ce758 100644
--- a/drivers/mfd/ab8500-core.c
+++ b/drivers/mfd/ab8500-core.c
@@ -1248,7 +1248,7 @@ static struct attribute_group ab9540_attr_group = {
1248 .attrs = ab9540_sysfs_entries, 1248 .attrs = ab9540_sysfs_entries,
1249}; 1249};
1250 1250
1251static int __devinit ab8500_probe(struct platform_device *pdev) 1251static int ab8500_probe(struct platform_device *pdev)
1252{ 1252{
1253 static char *switch_off_status[] = { 1253 static char *switch_off_status[] = {
1254 "Swoff bit programming", 1254 "Swoff bit programming",
diff --git a/drivers/mfd/ab8500-debugfs.c b/drivers/mfd/ab8500-debugfs.c
index efdbc7bebd01..44843680d982 100644
--- a/drivers/mfd/ab8500-debugfs.c
+++ b/drivers/mfd/ab8500-debugfs.c
@@ -552,7 +552,7 @@ static struct dentry *ab8500_bank_file;
552static struct dentry *ab8500_address_file; 552static struct dentry *ab8500_address_file;
553static struct dentry *ab8500_val_file; 553static struct dentry *ab8500_val_file;
554 554
555static int __devinit ab8500_debug_probe(struct platform_device *plf) 555static int ab8500_debug_probe(struct platform_device *plf)
556{ 556{
557 debug_bank = AB8500_MISC; 557 debug_bank = AB8500_MISC;
558 debug_address = AB8500_REV_REG & 0x00FF; 558 debug_address = AB8500_REV_REG & 0x00FF;
diff --git a/drivers/mfd/ab8500-gpadc.c b/drivers/mfd/ab8500-gpadc.c
index 97daf61f068c..c5e168e3ef11 100644
--- a/drivers/mfd/ab8500-gpadc.c
+++ b/drivers/mfd/ab8500-gpadc.c
@@ -571,7 +571,7 @@ static void ab8500_gpadc_read_calibration_data(struct ab8500_gpadc *gpadc)
571 gpadc->cal_data[ADC_INPUT_VBAT].offset); 571 gpadc->cal_data[ADC_INPUT_VBAT].offset);
572} 572}
573 573
574static int __devinit ab8500_gpadc_probe(struct platform_device *pdev) 574static int ab8500_gpadc_probe(struct platform_device *pdev)
575{ 575{
576 int ret = 0; 576 int ret = 0;
577 struct ab8500_gpadc *gpadc; 577 struct ab8500_gpadc *gpadc;
diff --git a/drivers/mfd/ab8500-sysctrl.c b/drivers/mfd/ab8500-sysctrl.c
index d8cc157af3e8..499263c3110a 100644
--- a/drivers/mfd/ab8500-sysctrl.c
+++ b/drivers/mfd/ab8500-sysctrl.c
@@ -49,7 +49,7 @@ int ab8500_sysctrl_write(u16 reg, u8 mask, u8 value)
49 (u8)(reg & 0xFF), mask, value); 49 (u8)(reg & 0xFF), mask, value);
50} 50}
51 51
52static int __devinit ab8500_sysctrl_probe(struct platform_device *pdev) 52static int ab8500_sysctrl_probe(struct platform_device *pdev)
53{ 53{
54 sysctrl_dev = &pdev->dev; 54 sysctrl_dev = &pdev->dev;
55 return 0; 55 return 0;
diff --git a/drivers/mfd/adp5520.c b/drivers/mfd/adp5520.c
index f664a52687d5..f2f9d8ff6416 100644
--- a/drivers/mfd/adp5520.c
+++ b/drivers/mfd/adp5520.c
@@ -203,7 +203,7 @@ static int adp5520_remove_subdevs(struct adp5520_chip *chip)
203 return device_for_each_child(chip->dev, NULL, __remove_subdev); 203 return device_for_each_child(chip->dev, NULL, __remove_subdev);
204} 204}
205 205
206static int __devinit adp5520_probe(struct i2c_client *client, 206static int adp5520_probe(struct i2c_client *client,
207 const struct i2c_device_id *id) 207 const struct i2c_device_id *id)
208{ 208{
209 struct adp5520_platform_data *pdata = client->dev.platform_data; 209 struct adp5520_platform_data *pdata = client->dev.platform_data;
diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c
index 1b48f2094806..47e711674739 100644
--- a/drivers/mfd/arizona-core.c
+++ b/drivers/mfd/arizona-core.c
@@ -285,7 +285,7 @@ static struct mfd_cell wm5110_devs[] = {
285 { .name = "wm5110-codec" }, 285 { .name = "wm5110-codec" },
286}; 286};
287 287
288int __devinit arizona_dev_init(struct arizona *arizona) 288int arizona_dev_init(struct arizona *arizona)
289{ 289{
290 struct device *dev = arizona->dev; 290 struct device *dev = arizona->dev;
291 const char *type_name; 291 const char *type_name;
diff --git a/drivers/mfd/arizona-i2c.c b/drivers/mfd/arizona-i2c.c
index 43d164736fcb..aaf1a69134df 100644
--- a/drivers/mfd/arizona-i2c.c
+++ b/drivers/mfd/arizona-i2c.c
@@ -22,7 +22,7 @@
22 22
23#include "arizona.h" 23#include "arizona.h"
24 24
25static __devinit int arizona_i2c_probe(struct i2c_client *i2c, 25static int arizona_i2c_probe(struct i2c_client *i2c,
26 const struct i2c_device_id *id) 26 const struct i2c_device_id *id)
27{ 27{
28 struct arizona *arizona; 28 struct arizona *arizona;
diff --git a/drivers/mfd/arizona-spi.c b/drivers/mfd/arizona-spi.c
index cc79b824f706..9663cafdb7ff 100644
--- a/drivers/mfd/arizona-spi.c
+++ b/drivers/mfd/arizona-spi.c
@@ -22,7 +22,7 @@
22 22
23#include "arizona.h" 23#include "arizona.h"
24 24
25static int __devinit arizona_spi_probe(struct spi_device *spi) 25static int arizona_spi_probe(struct spi_device *spi)
26{ 26{
27 const struct spi_device_id *id = spi_get_device_id(spi); 27 const struct spi_device_id *id = spi_get_device_id(spi);
28 struct arizona *arizona; 28 struct arizona *arizona;
diff --git a/drivers/mfd/cs5535-mfd.c b/drivers/mfd/cs5535-mfd.c
index 5d3878ad39a6..0779b13a7dd1 100644
--- a/drivers/mfd/cs5535-mfd.c
+++ b/drivers/mfd/cs5535-mfd.c
@@ -113,7 +113,7 @@ static __devinitdata struct mfd_cell cs5535_mfd_cells[] = {
113}; 113};
114 114
115#ifdef CONFIG_OLPC 115#ifdef CONFIG_OLPC
116static void __devinit cs5535_clone_olpc_cells(void) 116static void cs5535_clone_olpc_cells(void)
117{ 117{
118 const char *acpi_clones[] = { "olpc-xo1-pm-acpi", "olpc-xo1-sci-acpi" }; 118 const char *acpi_clones[] = { "olpc-xo1-pm-acpi", "olpc-xo1-sci-acpi" };
119 119
@@ -126,7 +126,7 @@ static void __devinit cs5535_clone_olpc_cells(void)
126static void cs5535_clone_olpc_cells(void) { } 126static void cs5535_clone_olpc_cells(void) { }
127#endif 127#endif
128 128
129static int __devinit cs5535_mfd_probe(struct pci_dev *pdev, 129static int cs5535_mfd_probe(struct pci_dev *pdev,
130 const struct pci_device_id *id) 130 const struct pci_device_id *id)
131{ 131{
132 int err, i; 132 int err, i;
diff --git a/drivers/mfd/da903x.c b/drivers/mfd/da903x.c
index c715475df377..5fa1e91a9532 100644
--- a/drivers/mfd/da903x.c
+++ b/drivers/mfd/da903x.c
@@ -246,7 +246,7 @@ int da903x_query_status(struct device *dev, unsigned int sbits)
246} 246}
247EXPORT_SYMBOL(da903x_query_status); 247EXPORT_SYMBOL(da903x_query_status);
248 248
249static int __devinit da9030_init_chip(struct da903x_chip *chip) 249static int da9030_init_chip(struct da903x_chip *chip)
250{ 250{
251 uint8_t chip_id; 251 uint8_t chip_id;
252 int err; 252 int err;
@@ -459,7 +459,7 @@ static int da903x_remove_subdevs(struct da903x_chip *chip)
459 return device_for_each_child(chip->dev, NULL, __remove_subdev); 459 return device_for_each_child(chip->dev, NULL, __remove_subdev);
460} 460}
461 461
462static int __devinit da903x_add_subdevs(struct da903x_chip *chip, 462static int da903x_add_subdevs(struct da903x_chip *chip,
463 struct da903x_platform_data *pdata) 463 struct da903x_platform_data *pdata)
464{ 464{
465 struct da903x_subdev_info *subdev; 465 struct da903x_subdev_info *subdev;
@@ -491,7 +491,7 @@ failed:
491 return ret; 491 return ret;
492} 492}
493 493
494static int __devinit da903x_probe(struct i2c_client *client, 494static int da903x_probe(struct i2c_client *client,
495 const struct i2c_device_id *id) 495 const struct i2c_device_id *id)
496{ 496{
497 struct da903x_platform_data *pdata = client->dev.platform_data; 497 struct da903x_platform_data *pdata = client->dev.platform_data;
diff --git a/drivers/mfd/da9052-core.c b/drivers/mfd/da9052-core.c
index a0a62b24621b..c71c4a247186 100644
--- a/drivers/mfd/da9052-core.c
+++ b/drivers/mfd/da9052-core.c
@@ -769,7 +769,7 @@ struct regmap_config da9052_regmap_config = {
769}; 769};
770EXPORT_SYMBOL_GPL(da9052_regmap_config); 770EXPORT_SYMBOL_GPL(da9052_regmap_config);
771 771
772int __devinit da9052_device_init(struct da9052 *da9052, u8 chip_id) 772int da9052_device_init(struct da9052 *da9052, u8 chip_id)
773{ 773{
774 struct da9052_pdata *pdata = da9052->dev->platform_data; 774 struct da9052_pdata *pdata = da9052->dev->platform_data;
775 int ret; 775 int ret;
diff --git a/drivers/mfd/da9052-i2c.c b/drivers/mfd/da9052-i2c.c
index 8af0f0c5cefe..96f66ed8dbfc 100644
--- a/drivers/mfd/da9052-i2c.c
+++ b/drivers/mfd/da9052-i2c.c
@@ -64,7 +64,7 @@ static const struct of_device_id dialog_dt_ids[] = {
64}; 64};
65#endif 65#endif
66 66
67static int __devinit da9052_i2c_probe(struct i2c_client *client, 67static int da9052_i2c_probe(struct i2c_client *client,
68 const struct i2c_device_id *id) 68 const struct i2c_device_id *id)
69{ 69{
70 struct da9052 *da9052; 70 struct da9052 *da9052;
diff --git a/drivers/mfd/da9052-spi.c b/drivers/mfd/da9052-spi.c
index cbcc9bebbbe1..1ad324373c97 100644
--- a/drivers/mfd/da9052-spi.c
+++ b/drivers/mfd/da9052-spi.c
@@ -21,7 +21,7 @@
21 21
22#include <linux/mfd/da9052/da9052.h> 22#include <linux/mfd/da9052/da9052.h>
23 23
24static int __devinit da9052_spi_probe(struct spi_device *spi) 24static int da9052_spi_probe(struct spi_device *spi)
25{ 25{
26 int ret; 26 int ret;
27 const struct spi_device_id *id = spi_get_device_id(spi); 27 const struct spi_device_id *id = spi_get_device_id(spi);
diff --git a/drivers/mfd/da9055-core.c b/drivers/mfd/da9055-core.c
index ff6c77f392bd..6f5a4984f0aa 100644
--- a/drivers/mfd/da9055-core.c
+++ b/drivers/mfd/da9055-core.c
@@ -377,7 +377,7 @@ static struct regmap_irq_chip da9055_regmap_irq_chip = {
377 .num_irqs = ARRAY_SIZE(da9055_irqs), 377 .num_irqs = ARRAY_SIZE(da9055_irqs),
378}; 378};
379 379
380int __devinit da9055_device_init(struct da9055 *da9055) 380int da9055_device_init(struct da9055 *da9055)
381{ 381{
382 struct da9055_pdata *pdata = da9055->dev->platform_data; 382 struct da9055_pdata *pdata = da9055->dev->platform_data;
383 int ret; 383 int ret;
diff --git a/drivers/mfd/da9055-i2c.c b/drivers/mfd/da9055-i2c.c
index dbaca7bc36da..7778d042fb5d 100644
--- a/drivers/mfd/da9055-i2c.c
+++ b/drivers/mfd/da9055-i2c.c
@@ -18,7 +18,7 @@
18 18
19#include <linux/mfd/da9055/core.h> 19#include <linux/mfd/da9055/core.h>
20 20
21static int __devinit da9055_i2c_probe(struct i2c_client *i2c, 21static int da9055_i2c_probe(struct i2c_client *i2c,
22 const struct i2c_device_id *id) 22 const struct i2c_device_id *id)
23{ 23{
24 struct da9055 *da9055; 24 struct da9055 *da9055;
diff --git a/drivers/mfd/db8500-prcmu.c b/drivers/mfd/db8500-prcmu.c
index 00b8b0f3dfb6..084a58776837 100644
--- a/drivers/mfd/db8500-prcmu.c
+++ b/drivers/mfd/db8500-prcmu.c
@@ -3034,7 +3034,7 @@ static struct mfd_cell db8500_prcmu_devs[] = {
3034 * prcmu_fw_init - arch init call for the Linux PRCMU fw init logic 3034 * prcmu_fw_init - arch init call for the Linux PRCMU fw init logic
3035 * 3035 *
3036 */ 3036 */
3037static int __devinit db8500_prcmu_probe(struct platform_device *pdev) 3037static int db8500_prcmu_probe(struct platform_device *pdev)
3038{ 3038{
3039 struct ab8500_platform_data *ab8500_platdata = pdev->dev.platform_data; 3039 struct ab8500_platform_data *ab8500_platdata = pdev->dev.platform_data;
3040 struct device_node *np = pdev->dev.of_node; 3040 struct device_node *np = pdev->dev.of_node;
diff --git a/drivers/mfd/ezx-pcap.c b/drivers/mfd/ezx-pcap.c
index d7e4de041526..d81505e50d12 100644
--- a/drivers/mfd/ezx-pcap.c
+++ b/drivers/mfd/ezx-pcap.c
@@ -371,7 +371,7 @@ static int pcap_remove_subdev(struct device *dev, void *unused)
371 return 0; 371 return 0;
372} 372}
373 373
374static int __devinit pcap_add_subdev(struct pcap_chip *pcap, 374static int pcap_add_subdev(struct pcap_chip *pcap,
375 struct pcap_subdev *subdev) 375 struct pcap_subdev *subdev)
376{ 376{
377 struct platform_device *pdev; 377 struct platform_device *pdev;
@@ -420,7 +420,7 @@ static int __devexit ezx_pcap_remove(struct spi_device *spi)
420 return 0; 420 return 0;
421} 421}
422 422
423static int __devinit ezx_pcap_probe(struct spi_device *spi) 423static int ezx_pcap_probe(struct spi_device *spi)
424{ 424{
425 struct pcap_platform_data *pdata = spi->dev.platform_data; 425 struct pcap_platform_data *pdata = spi->dev.platform_data;
426 struct pcap_chip *pcap; 426 struct pcap_chip *pcap;
diff --git a/drivers/mfd/htc-i2cpld.c b/drivers/mfd/htc-i2cpld.c
index d55065cc324c..324187c0c124 100644
--- a/drivers/mfd/htc-i2cpld.c
+++ b/drivers/mfd/htc-i2cpld.c
@@ -327,7 +327,7 @@ static void htcpld_chip_reset(struct i2c_client *client)
327 client, (chip_data->cache_out = chip_data->reset)); 327 client, (chip_data->cache_out = chip_data->reset));
328} 328}
329 329
330static int __devinit htcpld_setup_chip_irq( 330static int htcpld_setup_chip_irq(
331 struct platform_device *pdev, 331 struct platform_device *pdev,
332 int chip_index) 332 int chip_index)
333{ 333{
@@ -361,7 +361,7 @@ static int __devinit htcpld_setup_chip_irq(
361 return ret; 361 return ret;
362} 362}
363 363
364static int __devinit htcpld_register_chip_i2c( 364static int htcpld_register_chip_i2c(
365 struct platform_device *pdev, 365 struct platform_device *pdev,
366 int chip_index) 366 int chip_index)
367{ 367{
@@ -419,7 +419,7 @@ static int __devinit htcpld_register_chip_i2c(
419 return 0; 419 return 0;
420} 420}
421 421
422static void __devinit htcpld_unregister_chip_i2c( 422static void htcpld_unregister_chip_i2c(
423 struct platform_device *pdev, 423 struct platform_device *pdev,
424 int chip_index) 424 int chip_index)
425{ 425{
@@ -434,7 +434,7 @@ static void __devinit htcpld_unregister_chip_i2c(
434 i2c_unregister_device(chip->client); 434 i2c_unregister_device(chip->client);
435} 435}
436 436
437static int __devinit htcpld_register_chip_gpio( 437static int htcpld_register_chip_gpio(
438 struct platform_device *pdev, 438 struct platform_device *pdev,
439 int chip_index) 439 int chip_index)
440{ 440{
@@ -501,7 +501,7 @@ static int __devinit htcpld_register_chip_gpio(
501 return 0; 501 return 0;
502} 502}
503 503
504static int __devinit htcpld_setup_chips(struct platform_device *pdev) 504static int htcpld_setup_chips(struct platform_device *pdev)
505{ 505{
506 struct htcpld_data *htcpld; 506 struct htcpld_data *htcpld;
507 struct device *dev = &pdev->dev; 507 struct device *dev = &pdev->dev;
@@ -563,7 +563,7 @@ static int __devinit htcpld_setup_chips(struct platform_device *pdev)
563 return 0; 563 return 0;
564} 564}
565 565
566static int __devinit htcpld_core_probe(struct platform_device *pdev) 566static int htcpld_core_probe(struct platform_device *pdev)
567{ 567{
568 struct htcpld_data *htcpld; 568 struct htcpld_data *htcpld;
569 struct device *dev = &pdev->dev; 569 struct device *dev = &pdev->dev;
diff --git a/drivers/mfd/intel_msic.c b/drivers/mfd/intel_msic.c
index c5f478eb4e18..438ac3df166b 100644
--- a/drivers/mfd/intel_msic.c
+++ b/drivers/mfd/intel_msic.c
@@ -306,7 +306,7 @@ int intel_msic_irq_read(struct intel_msic *msic, unsigned short reg, u8 *val)
306} 306}
307EXPORT_SYMBOL_GPL(intel_msic_irq_read); 307EXPORT_SYMBOL_GPL(intel_msic_irq_read);
308 308
309static int __devinit intel_msic_init_devices(struct intel_msic *msic) 309static int intel_msic_init_devices(struct intel_msic *msic)
310{ 310{
311 struct platform_device *pdev = msic->pdev; 311 struct platform_device *pdev = msic->pdev;
312 struct intel_msic_platform_data *pdata = pdev->dev.platform_data; 312 struct intel_msic_platform_data *pdata = pdev->dev.platform_data;
@@ -375,7 +375,7 @@ static void __devexit intel_msic_remove_devices(struct intel_msic *msic)
375 gpio_free(pdata->ocd->gpio); 375 gpio_free(pdata->ocd->gpio);
376} 376}
377 377
378static int __devinit intel_msic_probe(struct platform_device *pdev) 378static int intel_msic_probe(struct platform_device *pdev)
379{ 379{
380 struct intel_msic_platform_data *pdata = pdev->dev.platform_data; 380 struct intel_msic_platform_data *pdata = pdev->dev.platform_data;
381 struct intel_msic *msic; 381 struct intel_msic *msic;
diff --git a/drivers/mfd/janz-cmodio.c b/drivers/mfd/janz-cmodio.c
index 1a3627784246..55c479e57aad 100644
--- a/drivers/mfd/janz-cmodio.c
+++ b/drivers/mfd/janz-cmodio.c
@@ -63,7 +63,7 @@ struct cmodio_device {
63 * Subdevices using the mfd-core API 63 * Subdevices using the mfd-core API
64 */ 64 */
65 65
66static int __devinit cmodio_setup_subdevice(struct cmodio_device *priv, 66static int cmodio_setup_subdevice(struct cmodio_device *priv,
67 char *name, unsigned int devno, 67 char *name, unsigned int devno,
68 unsigned int modno) 68 unsigned int modno)
69{ 69{
@@ -120,7 +120,7 @@ static int __devinit cmodio_setup_subdevice(struct cmodio_device *priv,
120} 120}
121 121
122/* Probe each submodule using kernel parameters */ 122/* Probe each submodule using kernel parameters */
123static int __devinit cmodio_probe_submodules(struct cmodio_device *priv) 123static int cmodio_probe_submodules(struct cmodio_device *priv)
124{ 124{
125 struct pci_dev *pdev = priv->pdev; 125 struct pci_dev *pdev = priv->pdev;
126 unsigned int num_probed = 0; 126 unsigned int num_probed = 0;
@@ -177,7 +177,7 @@ static const struct attribute_group cmodio_sysfs_attr_group = {
177 * PCI Driver 177 * PCI Driver
178 */ 178 */
179 179
180static int __devinit cmodio_pci_probe(struct pci_dev *dev, 180static int cmodio_pci_probe(struct pci_dev *dev,
181 const struct pci_device_id *id) 181 const struct pci_device_id *id)
182{ 182{
183 struct cmodio_device *priv; 183 struct cmodio_device *priv;
diff --git a/drivers/mfd/jz4740-adc.c b/drivers/mfd/jz4740-adc.c
index 9aed2a66180e..c0d38c597f0c 100644
--- a/drivers/mfd/jz4740-adc.c
+++ b/drivers/mfd/jz4740-adc.c
@@ -202,7 +202,7 @@ static struct mfd_cell jz4740_adc_cells[] = {
202 }, 202 },
203}; 203};
204 204
205static int __devinit jz4740_adc_probe(struct platform_device *pdev) 205static int jz4740_adc_probe(struct platform_device *pdev)
206{ 206{
207 struct irq_chip_generic *gc; 207 struct irq_chip_generic *gc;
208 struct irq_chip_type *ct; 208 struct irq_chip_type *ct;
diff --git a/drivers/mfd/lm3533-core.c b/drivers/mfd/lm3533-core.c
index e7aa2a5a826b..2b74508655d4 100644
--- a/drivers/mfd/lm3533-core.c
+++ b/drivers/mfd/lm3533-core.c
@@ -382,7 +382,7 @@ static struct attribute_group lm3533_attribute_group = {
382 .attrs = lm3533_attributes 382 .attrs = lm3533_attributes
383}; 383};
384 384
385static int __devinit lm3533_device_als_init(struct lm3533 *lm3533) 385static int lm3533_device_als_init(struct lm3533 *lm3533)
386{ 386{
387 struct lm3533_platform_data *pdata = lm3533->dev->platform_data; 387 struct lm3533_platform_data *pdata = lm3533->dev->platform_data;
388 int ret; 388 int ret;
@@ -405,7 +405,7 @@ static int __devinit lm3533_device_als_init(struct lm3533 *lm3533)
405 return 0; 405 return 0;
406} 406}
407 407
408static int __devinit lm3533_device_bl_init(struct lm3533 *lm3533) 408static int lm3533_device_bl_init(struct lm3533 *lm3533)
409{ 409{
410 struct lm3533_platform_data *pdata = lm3533->dev->platform_data; 410 struct lm3533_platform_data *pdata = lm3533->dev->platform_data;
411 int i; 411 int i;
@@ -434,7 +434,7 @@ static int __devinit lm3533_device_bl_init(struct lm3533 *lm3533)
434 return 0; 434 return 0;
435} 435}
436 436
437static int __devinit lm3533_device_led_init(struct lm3533 *lm3533) 437static int lm3533_device_led_init(struct lm3533 *lm3533)
438{ 438{
439 struct lm3533_platform_data *pdata = lm3533->dev->platform_data; 439 struct lm3533_platform_data *pdata = lm3533->dev->platform_data;
440 int i; 440 int i;
@@ -463,7 +463,7 @@ static int __devinit lm3533_device_led_init(struct lm3533 *lm3533)
463 return 0; 463 return 0;
464} 464}
465 465
466static int __devinit lm3533_device_setup(struct lm3533 *lm3533, 466static int lm3533_device_setup(struct lm3533 *lm3533,
467 struct lm3533_platform_data *pdata) 467 struct lm3533_platform_data *pdata)
468{ 468{
469 int ret; 469 int ret;
@@ -479,7 +479,7 @@ static int __devinit lm3533_device_setup(struct lm3533 *lm3533,
479 return 0; 479 return 0;
480} 480}
481 481
482static int __devinit lm3533_device_init(struct lm3533 *lm3533) 482static int lm3533_device_init(struct lm3533 *lm3533)
483{ 483{
484 struct lm3533_platform_data *pdata = lm3533->dev->platform_data; 484 struct lm3533_platform_data *pdata = lm3533->dev->platform_data;
485 int ret; 485 int ret;
@@ -596,7 +596,7 @@ static struct regmap_config regmap_config = {
596 .precious_reg = lm3533_precious_register, 596 .precious_reg = lm3533_precious_register,
597}; 597};
598 598
599static int __devinit lm3533_i2c_probe(struct i2c_client *i2c, 599static int lm3533_i2c_probe(struct i2c_client *i2c,
600 const struct i2c_device_id *id) 600 const struct i2c_device_id *id)
601{ 601{
602 struct lm3533 *lm3533; 602 struct lm3533 *lm3533;
diff --git a/drivers/mfd/lpc_ich.c b/drivers/mfd/lpc_ich.c
index a43c73ac25b0..99891752c338 100644
--- a/drivers/mfd/lpc_ich.c
+++ b/drivers/mfd/lpc_ich.c
@@ -672,7 +672,7 @@ static void lpc_ich_restore_config_space(struct pci_dev *dev)
672 } 672 }
673} 673}
674 674
675static void __devinit lpc_ich_enable_acpi_space(struct pci_dev *dev) 675static void lpc_ich_enable_acpi_space(struct pci_dev *dev)
676{ 676{
677 u8 reg_save; 677 u8 reg_save;
678 678
@@ -681,7 +681,7 @@ static void __devinit lpc_ich_enable_acpi_space(struct pci_dev *dev)
681 lpc_ich_acpi_save = reg_save; 681 lpc_ich_acpi_save = reg_save;
682} 682}
683 683
684static void __devinit lpc_ich_enable_gpio_space(struct pci_dev *dev) 684static void lpc_ich_enable_gpio_space(struct pci_dev *dev)
685{ 685{
686 u8 reg_save; 686 u8 reg_save;
687 687
@@ -690,7 +690,7 @@ static void __devinit lpc_ich_enable_gpio_space(struct pci_dev *dev)
690 lpc_ich_gpio_save = reg_save; 690 lpc_ich_gpio_save = reg_save;
691} 691}
692 692
693static void __devinit lpc_ich_finalize_cell(struct mfd_cell *cell, 693static void lpc_ich_finalize_cell(struct mfd_cell *cell,
694 const struct pci_device_id *id) 694 const struct pci_device_id *id)
695{ 695{
696 cell->platform_data = &lpc_chipset_info[id->driver_data]; 696 cell->platform_data = &lpc_chipset_info[id->driver_data];
@@ -702,7 +702,7 @@ static void __devinit lpc_ich_finalize_cell(struct mfd_cell *cell,
702 * GPIO groups and it's enough to have access to one of these to instantiate 702 * GPIO groups and it's enough to have access to one of these to instantiate
703 * the device. 703 * the device.
704 */ 704 */
705static int __devinit lpc_ich_check_conflict_gpio(struct resource *res) 705static int lpc_ich_check_conflict_gpio(struct resource *res)
706{ 706{
707 int ret; 707 int ret;
708 u8 use_gpio = 0; 708 u8 use_gpio = 0;
@@ -721,7 +721,7 @@ static int __devinit lpc_ich_check_conflict_gpio(struct resource *res)
721 return use_gpio ? use_gpio : ret; 721 return use_gpio ? use_gpio : ret;
722} 722}
723 723
724static int __devinit lpc_ich_init_gpio(struct pci_dev *dev, 724static int lpc_ich_init_gpio(struct pci_dev *dev,
725 const struct pci_device_id *id) 725 const struct pci_device_id *id)
726{ 726{
727 u32 base_addr_cfg; 727 u32 base_addr_cfg;
@@ -798,7 +798,7 @@ gpio_done:
798 return ret; 798 return ret;
799} 799}
800 800
801static int __devinit lpc_ich_init_wdt(struct pci_dev *dev, 801static int lpc_ich_init_wdt(struct pci_dev *dev,
802 const struct pci_device_id *id) 802 const struct pci_device_id *id)
803{ 803{
804 u32 base_addr_cfg; 804 u32 base_addr_cfg;
@@ -852,7 +852,7 @@ wdt_done:
852 return ret; 852 return ret;
853} 853}
854 854
855static int __devinit lpc_ich_probe(struct pci_dev *dev, 855static int lpc_ich_probe(struct pci_dev *dev,
856 const struct pci_device_id *id) 856 const struct pci_device_id *id)
857{ 857{
858 int ret; 858 int ret;
diff --git a/drivers/mfd/lpc_sch.c b/drivers/mfd/lpc_sch.c
index 27477f4533ea..5756a6af08dc 100644
--- a/drivers/mfd/lpc_sch.c
+++ b/drivers/mfd/lpc_sch.c
@@ -83,7 +83,7 @@ static DEFINE_PCI_DEVICE_TABLE(lpc_sch_ids) = {
83}; 83};
84MODULE_DEVICE_TABLE(pci, lpc_sch_ids); 84MODULE_DEVICE_TABLE(pci, lpc_sch_ids);
85 85
86static int __devinit lpc_sch_probe(struct pci_dev *dev, 86static int lpc_sch_probe(struct pci_dev *dev,
87 const struct pci_device_id *id) 87 const struct pci_device_id *id)
88{ 88{
89 unsigned int base_addr_cfg; 89 unsigned int base_addr_cfg;
diff --git a/drivers/mfd/max8907.c b/drivers/mfd/max8907.c
index 17f2593d82b8..81ded7a4ca8c 100644
--- a/drivers/mfd/max8907.c
+++ b/drivers/mfd/max8907.c
@@ -183,7 +183,7 @@ static void max8907_power_off(void)
183 MAX8907_MASK_POWER_OFF, MAX8907_MASK_POWER_OFF); 183 MAX8907_MASK_POWER_OFF, MAX8907_MASK_POWER_OFF);
184} 184}
185 185
186static __devinit int max8907_i2c_probe(struct i2c_client *i2c, 186static int max8907_i2c_probe(struct i2c_client *i2c,
187 const struct i2c_device_id *id) 187 const struct i2c_device_id *id)
188{ 188{
189 struct max8907 *max8907; 189 struct max8907 *max8907;
diff --git a/drivers/mfd/max8925-core.c b/drivers/mfd/max8925-core.c
index 9f54c04912f2..20daa16b83c9 100644
--- a/drivers/mfd/max8925-core.c
+++ b/drivers/mfd/max8925-core.c
@@ -714,7 +714,7 @@ tsc_irq:
714 return 0; 714 return 0;
715} 715}
716 716
717static void __devinit init_regulator(struct max8925_chip *chip, 717static void init_regulator(struct max8925_chip *chip,
718 struct max8925_platform_data *pdata) 718 struct max8925_platform_data *pdata)
719{ 719{
720 int ret; 720 int ret;
@@ -821,7 +821,7 @@ static void __devinit init_regulator(struct max8925_chip *chip,
821 } 821 }
822} 822}
823 823
824int __devinit max8925_device_init(struct max8925_chip *chip, 824int max8925_device_init(struct max8925_chip *chip,
825 struct max8925_platform_data *pdata) 825 struct max8925_platform_data *pdata)
826{ 826{
827 int ret; 827 int ret;
diff --git a/drivers/mfd/max8925-i2c.c b/drivers/mfd/max8925-i2c.c
index 375e0475f6d2..6e3d30aa00df 100644
--- a/drivers/mfd/max8925-i2c.c
+++ b/drivers/mfd/max8925-i2c.c
@@ -135,7 +135,7 @@ static const struct i2c_device_id max8925_id_table[] = {
135}; 135};
136MODULE_DEVICE_TABLE(i2c, max8925_id_table); 136MODULE_DEVICE_TABLE(i2c, max8925_id_table);
137 137
138static int __devinit max8925_probe(struct i2c_client *client, 138static int max8925_probe(struct i2c_client *client,
139 const struct i2c_device_id *id) 139 const struct i2c_device_id *id)
140{ 140{
141 struct max8925_platform_data *pdata = client->dev.platform_data; 141 struct max8925_platform_data *pdata = client->dev.platform_data;
diff --git a/drivers/mfd/omap-usb-host.c b/drivers/mfd/omap-usb-host.c
index 23cec57c02ba..fc23dfbb6910 100644
--- a/drivers/mfd/omap-usb-host.c
+++ b/drivers/mfd/omap-usb-host.c
@@ -464,7 +464,7 @@ static void omap_usbhs_deinit(struct device *dev)
464 * 464 *
465 * Allocates basic resources for this USB host controller. 465 * Allocates basic resources for this USB host controller.
466 */ 466 */
467static int __devinit usbhs_omap_probe(struct platform_device *pdev) 467static int usbhs_omap_probe(struct platform_device *pdev)
468{ 468{
469 struct device *dev = &pdev->dev; 469 struct device *dev = &pdev->dev;
470 struct usbhs_omap_platform_data *pdata = dev->platform_data; 470 struct usbhs_omap_platform_data *pdata = dev->platform_data;
diff --git a/drivers/mfd/omap-usb-tll.c b/drivers/mfd/omap-usb-tll.c
index 2d8edfd85e1c..0b586885446b 100644
--- a/drivers/mfd/omap-usb-tll.c
+++ b/drivers/mfd/omap-usb-tll.c
@@ -200,7 +200,7 @@ static unsigned ohci_omap3_fslsmode(enum usbhs_omap_port_mode mode)
200 * 200 *
201 * Allocates basic resources for this USB host controller. 201 * Allocates basic resources for this USB host controller.
202 */ 202 */
203static int __devinit usbtll_omap_probe(struct platform_device *pdev) 203static int usbtll_omap_probe(struct platform_device *pdev)
204{ 204{
205 struct device *dev = &pdev->dev; 205 struct device *dev = &pdev->dev;
206 struct usbtll_omap_platform_data *pdata = dev->platform_data; 206 struct usbtll_omap_platform_data *pdata = dev->platform_data;
diff --git a/drivers/mfd/palmas.c b/drivers/mfd/palmas.c
index 4f8d6e6b19aa..cb52783390c1 100644
--- a/drivers/mfd/palmas.c
+++ b/drivers/mfd/palmas.c
@@ -247,7 +247,7 @@ static struct regmap_irq_chip palmas_irq_chip = {
247 PALMAS_INT1_MASK), 247 PALMAS_INT1_MASK),
248}; 248};
249 249
250static void __devinit palmas_dt_to_pdata(struct device_node *node, 250static void palmas_dt_to_pdata(struct device_node *node,
251 struct palmas_platform_data *pdata) 251 struct palmas_platform_data *pdata)
252{ 252{
253 int ret; 253 int ret;
@@ -275,7 +275,7 @@ static void __devinit palmas_dt_to_pdata(struct device_node *node,
275 PALMAS_POWER_CTRL_ENABLE2_MASK; 275 PALMAS_POWER_CTRL_ENABLE2_MASK;
276} 276}
277 277
278static int __devinit palmas_i2c_probe(struct i2c_client *i2c, 278static int palmas_i2c_probe(struct i2c_client *i2c,
279 const struct i2c_device_id *id) 279 const struct i2c_device_id *id)
280{ 280{
281 struct palmas *palmas; 281 struct palmas *palmas;
diff --git a/drivers/mfd/pcf50633-adc.c b/drivers/mfd/pcf50633-adc.c
index a285b5111edb..dbd2f0d0078e 100644
--- a/drivers/mfd/pcf50633-adc.c
+++ b/drivers/mfd/pcf50633-adc.c
@@ -199,7 +199,7 @@ static void pcf50633_adc_irq(int irq, void *data)
199 kfree(req); 199 kfree(req);
200} 200}
201 201
202static int __devinit pcf50633_adc_probe(struct platform_device *pdev) 202static int pcf50633_adc_probe(struct platform_device *pdev)
203{ 203{
204 struct pcf50633_adc *adc; 204 struct pcf50633_adc *adc;
205 205
diff --git a/drivers/mfd/pcf50633-core.c b/drivers/mfd/pcf50633-core.c
index ad438e85cbf7..fc477353081e 100644
--- a/drivers/mfd/pcf50633-core.c
+++ b/drivers/mfd/pcf50633-core.c
@@ -191,7 +191,7 @@ static struct regmap_config pcf50633_regmap_config = {
191 .val_bits = 8, 191 .val_bits = 8,
192}; 192};
193 193
194static int __devinit pcf50633_probe(struct i2c_client *client, 194static int pcf50633_probe(struct i2c_client *client,
195 const struct i2c_device_id *ids) 195 const struct i2c_device_id *ids)
196{ 196{
197 struct pcf50633 *pcf; 197 struct pcf50633 *pcf;
diff --git a/drivers/mfd/pm8921-core.c b/drivers/mfd/pm8921-core.c
index 24d57bcc98b6..43491346e7d0 100644
--- a/drivers/mfd/pm8921-core.c
+++ b/drivers/mfd/pm8921-core.c
@@ -80,7 +80,7 @@ static struct pm8xxx_drvdata pm8921_drvdata = {
80 .pmic_read_irq_stat = pm8921_read_irq_stat, 80 .pmic_read_irq_stat = pm8921_read_irq_stat,
81}; 81};
82 82
83static int __devinit pm8921_add_subdevices(const struct pm8921_platform_data 83static int pm8921_add_subdevices(const struct pm8921_platform_data
84 *pdata, 84 *pdata,
85 struct pm8921 *pmic, 85 struct pm8921 *pmic,
86 u32 rev) 86 u32 rev)
@@ -104,7 +104,7 @@ static int __devinit pm8921_add_subdevices(const struct pm8921_platform_data
104 return ret; 104 return ret;
105} 105}
106 106
107static int __devinit pm8921_probe(struct platform_device *pdev) 107static int pm8921_probe(struct platform_device *pdev)
108{ 108{
109 const struct pm8921_platform_data *pdata = pdev->dev.platform_data; 109 const struct pm8921_platform_data *pdata = pdev->dev.platform_data;
110 struct pm8921 *pmic; 110 struct pm8921 *pmic;
diff --git a/drivers/mfd/pm8xxx-irq.c b/drivers/mfd/pm8xxx-irq.c
index d452dd013081..59c20ea329de 100644
--- a/drivers/mfd/pm8xxx-irq.c
+++ b/drivers/mfd/pm8xxx-irq.c
@@ -309,7 +309,7 @@ bail_out:
309} 309}
310EXPORT_SYMBOL_GPL(pm8xxx_get_irq_stat); 310EXPORT_SYMBOL_GPL(pm8xxx_get_irq_stat);
311 311
312struct pm_irq_chip * __devinit pm8xxx_irq_init(struct device *dev, 312struct pm_irq_chip * pm8xxx_irq_init(struct device *dev,
313 const struct pm8xxx_irq_platform_data *pdata) 313 const struct pm8xxx_irq_platform_data *pdata)
314{ 314{
315 struct pm_irq_chip *chip; 315 struct pm_irq_chip *chip;
diff --git a/drivers/mfd/rc5t583.c b/drivers/mfd/rc5t583.c
index d38ee24302ca..f721b13e986c 100644
--- a/drivers/mfd/rc5t583.c
+++ b/drivers/mfd/rc5t583.c
@@ -246,7 +246,7 @@ static const struct regmap_config rc5t583_regmap_config = {
246 .cache_type = REGCACHE_RBTREE, 246 .cache_type = REGCACHE_RBTREE,
247}; 247};
248 248
249static int __devinit rc5t583_i2c_probe(struct i2c_client *i2c, 249static int rc5t583_i2c_probe(struct i2c_client *i2c,
250 const struct i2c_device_id *id) 250 const struct i2c_device_id *id)
251{ 251{
252 struct rc5t583 *rc5t583; 252 struct rc5t583 *rc5t583;
diff --git a/drivers/mfd/rdc321x-southbridge.c b/drivers/mfd/rdc321x-southbridge.c
index 330396306d62..be46539c3080 100644
--- a/drivers/mfd/rdc321x-southbridge.c
+++ b/drivers/mfd/rdc321x-southbridge.c
@@ -72,7 +72,7 @@ static struct mfd_cell rdc321x_sb_cells[] = {
72 }, 72 },
73}; 73};
74 74
75static int __devinit rdc321x_sb_probe(struct pci_dev *pdev, 75static int rdc321x_sb_probe(struct pci_dev *pdev,
76 const struct pci_device_id *ent) 76 const struct pci_device_id *ent)
77{ 77{
78 int err; 78 int err;
diff --git a/drivers/mfd/sm501.c b/drivers/mfd/sm501.c
index 777af5ec25d4..c9c102c49028 100644
--- a/drivers/mfd/sm501.c
+++ b/drivers/mfd/sm501.c
@@ -1014,7 +1014,7 @@ static struct gpio_chip gpio_chip_template = {
1014 .get = sm501_gpio_get, 1014 .get = sm501_gpio_get,
1015}; 1015};
1016 1016
1017static int __devinit sm501_gpio_register_chip(struct sm501_devdata *sm, 1017static int sm501_gpio_register_chip(struct sm501_devdata *sm,
1018 struct sm501_gpio *gpio, 1018 struct sm501_gpio *gpio,
1019 struct sm501_gpio_chip *chip) 1019 struct sm501_gpio_chip *chip)
1020{ 1020{
@@ -1042,7 +1042,7 @@ static int __devinit sm501_gpio_register_chip(struct sm501_devdata *sm,
1042 return gpiochip_add(gchip); 1042 return gpiochip_add(gchip);
1043} 1043}
1044 1044
1045static int __devinit sm501_register_gpio(struct sm501_devdata *sm) 1045static int sm501_register_gpio(struct sm501_devdata *sm)
1046{ 1046{
1047 struct sm501_gpio *gpio = &sm->gpio; 1047 struct sm501_gpio *gpio = &sm->gpio;
1048 resource_size_t iobase = sm->io_res->start + SM501_GPIO; 1048 resource_size_t iobase = sm->io_res->start + SM501_GPIO;
@@ -1313,7 +1313,7 @@ static unsigned int sm501_mem_local[] = {
1313 * Common init code for an SM501 1313 * Common init code for an SM501
1314*/ 1314*/
1315 1315
1316static int __devinit sm501_init_dev(struct sm501_devdata *sm) 1316static int sm501_init_dev(struct sm501_devdata *sm)
1317{ 1317{
1318 struct sm501_initdata *idata; 1318 struct sm501_initdata *idata;
1319 struct sm501_platdata *pdata; 1319 struct sm501_platdata *pdata;
@@ -1389,7 +1389,7 @@ static int __devinit sm501_init_dev(struct sm501_devdata *sm)
1389 return 0; 1389 return 0;
1390} 1390}
1391 1391
1392static int __devinit sm501_plat_probe(struct platform_device *dev) 1392static int sm501_plat_probe(struct platform_device *dev)
1393{ 1393{
1394 struct sm501_devdata *sm; 1394 struct sm501_devdata *sm;
1395 int ret; 1395 int ret;
@@ -1578,7 +1578,7 @@ static struct sm501_platdata sm501_pci_platdata = {
1578 .gpio_base = -1, 1578 .gpio_base = -1,
1579}; 1579};
1580 1580
1581static int __devinit sm501_pci_probe(struct pci_dev *dev, 1581static int sm501_pci_probe(struct pci_dev *dev,
1582 const struct pci_device_id *id) 1582 const struct pci_device_id *id)
1583{ 1583{
1584 struct sm501_devdata *sm; 1584 struct sm501_devdata *sm;
diff --git a/drivers/mfd/sta2x11-mfd.c b/drivers/mfd/sta2x11-mfd.c
index d35da6820bea..2cfd55f343c2 100644
--- a/drivers/mfd/sta2x11-mfd.c
+++ b/drivers/mfd/sta2x11-mfd.c
@@ -69,7 +69,7 @@ static struct sta2x11_mfd *sta2x11_mfd_find(struct pci_dev *pdev)
69 return NULL; 69 return NULL;
70} 70}
71 71
72static int __devinit sta2x11_mfd_add(struct pci_dev *pdev, gfp_t flags) 72static int sta2x11_mfd_add(struct pci_dev *pdev, gfp_t flags)
73{ 73{
74 struct sta2x11_mfd *mfd = sta2x11_mfd_find(pdev); 74 struct sta2x11_mfd *mfd = sta2x11_mfd_find(pdev);
75 struct sta2x11_instance *instance; 75 struct sta2x11_instance *instance;
@@ -363,7 +363,7 @@ static int sta2x11_mfd_resume(struct pci_dev *pdev)
363 return 0; 363 return 0;
364} 364}
365 365
366static int __devinit sta2x11_mfd_probe(struct pci_dev *pdev, 366static int sta2x11_mfd_probe(struct pci_dev *pdev,
367 const struct pci_device_id *pci_id) 367 const struct pci_device_id *pci_id)
368{ 368{
369 int err, i; 369 int err, i;
diff --git a/drivers/mfd/stmpe-i2c.c b/drivers/mfd/stmpe-i2c.c
index 6a6aed74b946..8195ca2ac74b 100644
--- a/drivers/mfd/stmpe-i2c.c
+++ b/drivers/mfd/stmpe-i2c.c
@@ -52,7 +52,7 @@ static struct stmpe_client_info i2c_ci = {
52 .write_block = i2c_block_write, 52 .write_block = i2c_block_write,
53}; 53};
54 54
55static int __devinit 55static int
56stmpe_i2c_probe(struct i2c_client *i2c, const struct i2c_device_id *id) 56stmpe_i2c_probe(struct i2c_client *i2c, const struct i2c_device_id *id)
57{ 57{
58 i2c_ci.data = (void *)id; 58 i2c_ci.data = (void *)id;
diff --git a/drivers/mfd/stmpe-spi.c b/drivers/mfd/stmpe-spi.c
index 29590ad6a6e4..52774338998f 100644
--- a/drivers/mfd/stmpe-spi.c
+++ b/drivers/mfd/stmpe-spi.c
@@ -82,7 +82,7 @@ static struct stmpe_client_info spi_ci = {
82 .init = spi_init, 82 .init = spi_init,
83}; 83};
84 84
85static int __devinit 85static int
86stmpe_spi_probe(struct spi_device *spi) 86stmpe_spi_probe(struct spi_device *spi)
87{ 87{
88 const struct spi_device_id *id = spi_get_device_id(spi); 88 const struct spi_device_id *id = spi_get_device_id(spi);
diff --git a/drivers/mfd/syscon.c b/drivers/mfd/syscon.c
index d258b595d0b7..3dbfe9ab889c 100644
--- a/drivers/mfd/syscon.c
+++ b/drivers/mfd/syscon.c
@@ -97,7 +97,7 @@ static struct regmap_config syscon_regmap_config = {
97 .reg_stride = 4, 97 .reg_stride = 4,
98}; 98};
99 99
100static int __devinit syscon_probe(struct platform_device *pdev) 100static int syscon_probe(struct platform_device *pdev)
101{ 101{
102 struct device *dev = &pdev->dev; 102 struct device *dev = &pdev->dev;
103 struct device_node *np = dev->of_node; 103 struct device_node *np = dev->of_node;
diff --git a/drivers/mfd/tc3589x.c b/drivers/mfd/tc3589x.c
index 553ce956da6d..7e197f788b0a 100644
--- a/drivers/mfd/tc3589x.c
+++ b/drivers/mfd/tc3589x.c
@@ -282,7 +282,7 @@ static int tc3589x_chip_init(struct tc3589x *tc3589x)
282 return tc3589x_reg_write(tc3589x, TC3589x_RSTINTCLR, 0x1); 282 return tc3589x_reg_write(tc3589x, TC3589x_RSTINTCLR, 0x1);
283} 283}
284 284
285static int __devinit tc3589x_device_init(struct tc3589x *tc3589x) 285static int tc3589x_device_init(struct tc3589x *tc3589x)
286{ 286{
287 int ret = 0; 287 int ret = 0;
288 unsigned int blocks = tc3589x->pdata->block; 288 unsigned int blocks = tc3589x->pdata->block;
@@ -329,7 +329,7 @@ static int tc3589x_of_probe(struct device_node *np,
329 return 0; 329 return 0;
330} 330}
331 331
332static int __devinit tc3589x_probe(struct i2c_client *i2c, 332static int tc3589x_probe(struct i2c_client *i2c,
333 const struct i2c_device_id *id) 333 const struct i2c_device_id *id)
334{ 334{
335 struct tc3589x_platform_data *pdata = i2c->dev.platform_data; 335 struct tc3589x_platform_data *pdata = i2c->dev.platform_data;
diff --git a/drivers/mfd/tc6387xb.c b/drivers/mfd/tc6387xb.c
index 186f053e36ef..ca18f262c34a 100644
--- a/drivers/mfd/tc6387xb.c
+++ b/drivers/mfd/tc6387xb.c
@@ -138,7 +138,7 @@ static struct mfd_cell tc6387xb_cells[] = {
138 }, 138 },
139}; 139};
140 140
141static int __devinit tc6387xb_probe(struct platform_device *dev) 141static int tc6387xb_probe(struct platform_device *dev)
142{ 142{
143 struct tc6387xb_platform_data *pdata = dev->dev.platform_data; 143 struct tc6387xb_platform_data *pdata = dev->dev.platform_data;
144 struct resource *iomem, *rscr; 144 struct resource *iomem, *rscr;
diff --git a/drivers/mfd/tc6393xb.c b/drivers/mfd/tc6393xb.c
index 9411a88770b8..256723231a4e 100644
--- a/drivers/mfd/tc6393xb.c
+++ b/drivers/mfd/tc6393xb.c
@@ -602,7 +602,7 @@ static void tc6393xb_detach_irq(struct platform_device *dev)
602 602
603/*--------------------------------------------------------------------------*/ 603/*--------------------------------------------------------------------------*/
604 604
605static int __devinit tc6393xb_probe(struct platform_device *dev) 605static int tc6393xb_probe(struct platform_device *dev)
606{ 606{
607 struct tc6393xb_platform_data *tcpd = dev->dev.platform_data; 607 struct tc6393xb_platform_data *tcpd = dev->dev.platform_data;
608 struct tc6393xb *tc6393xb; 608 struct tc6393xb *tc6393xb;
diff --git a/drivers/mfd/ti-ssp.c b/drivers/mfd/ti-ssp.c
index 1c31f877c6bb..b177f96da864 100644
--- a/drivers/mfd/ti-ssp.c
+++ b/drivers/mfd/ti-ssp.c
@@ -315,7 +315,7 @@ static irqreturn_t ti_ssp_interrupt(int irq, void *dev_data)
315 return IRQ_HANDLED; 315 return IRQ_HANDLED;
316} 316}
317 317
318static int __devinit ti_ssp_probe(struct platform_device *pdev) 318static int ti_ssp_probe(struct platform_device *pdev)
319{ 319{
320 static struct ti_ssp *ssp; 320 static struct ti_ssp *ssp;
321 const struct ti_ssp_data *pdata = pdev->dev.platform_data; 321 const struct ti_ssp_data *pdata = pdev->dev.platform_data;
diff --git a/drivers/mfd/timberdale.c b/drivers/mfd/timberdale.c
index 61badece0b9a..dddf1df57838 100644
--- a/drivers/mfd/timberdale.c
+++ b/drivers/mfd/timberdale.c
@@ -650,7 +650,7 @@ static DEVICE_ATTR(fw_ver, S_IRUGO, show_fw_ver, NULL);
650 650
651/*--------------------------------------------------------------------------*/ 651/*--------------------------------------------------------------------------*/
652 652
653static int __devinit timb_probe(struct pci_dev *dev, 653static int timb_probe(struct pci_dev *dev,
654 const struct pci_device_id *id) 654 const struct pci_device_id *id)
655{ 655{
656 struct timberdale_device *priv; 656 struct timberdale_device *priv;
diff --git a/drivers/mfd/tps6105x.c b/drivers/mfd/tps6105x.c
index 45389600f86e..75a84ac4672e 100644
--- a/drivers/mfd/tps6105x.c
+++ b/drivers/mfd/tps6105x.c
@@ -86,7 +86,7 @@ fail:
86} 86}
87EXPORT_SYMBOL(tps6105x_mask_and_set); 87EXPORT_SYMBOL(tps6105x_mask_and_set);
88 88
89static int __devinit tps6105x_startup(struct tps6105x *tps6105x) 89static int tps6105x_startup(struct tps6105x *tps6105x)
90{ 90{
91 int ret; 91 int ret;
92 u8 regval; 92 u8 regval;
@@ -133,7 +133,7 @@ static struct mfd_cell tps6105x_cells[] = {
133 }, 133 },
134}; 134};
135 135
136static int __devinit tps6105x_probe(struct i2c_client *client, 136static int tps6105x_probe(struct i2c_client *client,
137 const struct i2c_device_id *id) 137 const struct i2c_device_id *id)
138{ 138{
139 struct tps6105x *tps6105x; 139 struct tps6105x *tps6105x;
diff --git a/drivers/mfd/tps65090.c b/drivers/mfd/tps65090.c
index d43ff16d8c4c..0c446eb86bdb 100644
--- a/drivers/mfd/tps65090.c
+++ b/drivers/mfd/tps65090.c
@@ -188,7 +188,7 @@ static irqreturn_t tps65090_irq(int irq, void *data)
188 return acks ? IRQ_HANDLED : IRQ_NONE; 188 return acks ? IRQ_HANDLED : IRQ_NONE;
189} 189}
190 190
191static int __devinit tps65090_irq_init(struct tps65090 *tps65090, int irq, 191static int tps65090_irq_init(struct tps65090 *tps65090, int irq,
192 int irq_base) 192 int irq_base)
193{ 193{
194 int i, ret; 194 int i, ret;
@@ -251,7 +251,7 @@ static const struct regmap_config tps65090_regmap_config = {
251 .volatile_reg = is_volatile_reg, 251 .volatile_reg = is_volatile_reg,
252}; 252};
253 253
254static int __devinit tps65090_i2c_probe(struct i2c_client *client, 254static int tps65090_i2c_probe(struct i2c_client *client,
255 const struct i2c_device_id *id) 255 const struct i2c_device_id *id)
256{ 256{
257 struct tps65090_platform_data *pdata = client->dev.platform_data; 257 struct tps65090_platform_data *pdata = client->dev.platform_data;
diff --git a/drivers/mfd/tps65217.c b/drivers/mfd/tps65217.c
index 76360c10246e..8cba75750e91 100644
--- a/drivers/mfd/tps65217.c
+++ b/drivers/mfd/tps65217.c
@@ -153,7 +153,7 @@ static const struct of_device_id tps65217_of_match[] = {
153 { /* sentinel */ }, 153 { /* sentinel */ },
154}; 154};
155 155
156static int __devinit tps65217_probe(struct i2c_client *client, 156static int tps65217_probe(struct i2c_client *client,
157 const struct i2c_device_id *ids) 157 const struct i2c_device_id *ids)
158{ 158{
159 struct tps65217 *tps; 159 struct tps65217 *tps;
diff --git a/drivers/mfd/tps6586x.c b/drivers/mfd/tps6586x.c
index a2e226f0f185..975fbb5f36aa 100644
--- a/drivers/mfd/tps6586x.c
+++ b/drivers/mfd/tps6586x.c
@@ -267,7 +267,7 @@ static irqreturn_t tps6586x_irq(int irq, void *data)
267 return IRQ_HANDLED; 267 return IRQ_HANDLED;
268} 268}
269 269
270static int __devinit tps6586x_irq_init(struct tps6586x *tps6586x, int irq, 270static int tps6586x_irq_init(struct tps6586x *tps6586x, int irq,
271 int irq_base) 271 int irq_base)
272{ 272{
273 int i, ret; 273 int i, ret;
@@ -316,7 +316,7 @@ static int __devinit tps6586x_irq_init(struct tps6586x *tps6586x, int irq,
316 return ret; 316 return ret;
317} 317}
318 318
319static int __devinit tps6586x_add_subdevs(struct tps6586x *tps6586x, 319static int tps6586x_add_subdevs(struct tps6586x *tps6586x,
320 struct tps6586x_platform_data *pdata) 320 struct tps6586x_platform_data *pdata)
321{ 321{
322 struct tps6586x_subdev_info *subdev; 322 struct tps6586x_subdev_info *subdev;
@@ -468,7 +468,7 @@ static void tps6586x_power_off(void)
468 tps6586x_set_bits(tps6586x_dev, TPS6586X_SUPPLYENE, SLEEP_MODE_BIT); 468 tps6586x_set_bits(tps6586x_dev, TPS6586X_SUPPLYENE, SLEEP_MODE_BIT);
469} 469}
470 470
471static int __devinit tps6586x_i2c_probe(struct i2c_client *client, 471static int tps6586x_i2c_probe(struct i2c_client *client,
472 const struct i2c_device_id *id) 472 const struct i2c_device_id *id)
473{ 473{
474 struct tps6586x_platform_data *pdata = client->dev.platform_data; 474 struct tps6586x_platform_data *pdata = client->dev.platform_data;
diff --git a/drivers/mfd/tps65910.c b/drivers/mfd/tps65910.c
index a3d732bcb519..3a3402290a74 100644
--- a/drivers/mfd/tps65910.c
+++ b/drivers/mfd/tps65910.c
@@ -78,7 +78,7 @@ static const struct regmap_config tps65910_regmap_config = {
78 .cache_type = REGCACHE_RBTREE, 78 .cache_type = REGCACHE_RBTREE,
79}; 79};
80 80
81static int __devinit tps65910_ck32k_init(struct tps65910 *tps65910, 81static int tps65910_ck32k_init(struct tps65910 *tps65910,
82 struct tps65910_board *pmic_pdata) 82 struct tps65910_board *pmic_pdata)
83{ 83{
84 int ret; 84 int ret;
@@ -96,7 +96,7 @@ static int __devinit tps65910_ck32k_init(struct tps65910 *tps65910,
96 return 0; 96 return 0;
97} 97}
98 98
99static int __devinit tps65910_sleepinit(struct tps65910 *tps65910, 99static int tps65910_sleepinit(struct tps65910 *tps65910,
100 struct tps65910_board *pmic_pdata) 100 struct tps65910_board *pmic_pdata)
101{ 101{
102 struct device *dev = NULL; 102 struct device *dev = NULL;
@@ -237,7 +237,7 @@ static void tps65910_power_off(void)
237 DEVCTRL_DEV_ON_MASK); 237 DEVCTRL_DEV_ON_MASK);
238} 238}
239 239
240static __devinit int tps65910_i2c_probe(struct i2c_client *i2c, 240static int tps65910_i2c_probe(struct i2c_client *i2c,
241 const struct i2c_device_id *id) 241 const struct i2c_device_id *id)
242{ 242{
243 struct tps65910 *tps65910; 243 struct tps65910 *tps65910;
diff --git a/drivers/mfd/tps65911-comparator.c b/drivers/mfd/tps65911-comparator.c
index a0255874fb1d..b3d268f95a77 100644
--- a/drivers/mfd/tps65911-comparator.c
+++ b/drivers/mfd/tps65911-comparator.c
@@ -122,7 +122,7 @@ static ssize_t comp_threshold_show(struct device *dev,
122static DEVICE_ATTR(comp1_threshold, S_IRUGO, comp_threshold_show, NULL); 122static DEVICE_ATTR(comp1_threshold, S_IRUGO, comp_threshold_show, NULL);
123static DEVICE_ATTR(comp2_threshold, S_IRUGO, comp_threshold_show, NULL); 123static DEVICE_ATTR(comp2_threshold, S_IRUGO, comp_threshold_show, NULL);
124 124
125static __devinit int tps65911_comparator_probe(struct platform_device *pdev) 125static int tps65911_comparator_probe(struct platform_device *pdev)
126{ 126{
127 struct tps65910 *tps65910 = dev_get_drvdata(pdev->dev.parent); 127 struct tps65910 *tps65910 = dev_get_drvdata(pdev->dev.parent);
128 struct tps65910_board *pdata = dev_get_platdata(tps65910->dev); 128 struct tps65910_board *pdata = dev_get_platdata(tps65910->dev);
diff --git a/drivers/mfd/tps65912-spi.c b/drivers/mfd/tps65912-spi.c
index 054315da9d5f..6366576a3056 100644
--- a/drivers/mfd/tps65912-spi.c
+++ b/drivers/mfd/tps65912-spi.c
@@ -81,7 +81,7 @@ static int tps65912_spi_read(struct tps65912 *tps65912, u8 addr,
81 return ret; 81 return ret;
82} 82}
83 83
84static int __devinit tps65912_spi_probe(struct spi_device *spi) 84static int tps65912_spi_probe(struct spi_device *spi)
85{ 85{
86 struct tps65912 *tps65912; 86 struct tps65912 *tps65912;
87 87
diff --git a/drivers/mfd/twl-core.c b/drivers/mfd/twl-core.c
index 4ae642320205..271d98a83caf 100644
--- a/drivers/mfd/twl-core.c
+++ b/drivers/mfd/twl-core.c
@@ -1170,7 +1170,7 @@ static int twl_remove(struct i2c_client *client)
1170} 1170}
1171 1171
1172/* NOTE: This driver only handles a single twl4030/tps659x0 chip */ 1172/* NOTE: This driver only handles a single twl4030/tps659x0 chip */
1173static int __devinit 1173static int
1174twl_probe(struct i2c_client *client, const struct i2c_device_id *id) 1174twl_probe(struct i2c_client *client, const struct i2c_device_id *id)
1175{ 1175{
1176 struct twl4030_platform_data *pdata = client->dev.platform_data; 1176 struct twl4030_platform_data *pdata = client->dev.platform_data;
diff --git a/drivers/mfd/twl4030-audio.c b/drivers/mfd/twl4030-audio.c
index 08f99055b0fa..aacccdcf997c 100644
--- a/drivers/mfd/twl4030-audio.c
+++ b/drivers/mfd/twl4030-audio.c
@@ -184,7 +184,7 @@ static bool twl4030_audio_has_vibra(struct twl4030_audio_data *pdata,
184 return false; 184 return false;
185} 185}
186 186
187static int __devinit twl4030_audio_probe(struct platform_device *pdev) 187static int twl4030_audio_probe(struct platform_device *pdev)
188{ 188{
189 struct twl4030_audio *audio; 189 struct twl4030_audio *audio;
190 struct twl4030_audio_data *pdata = pdev->dev.platform_data; 190 struct twl4030_audio_data *pdata = pdev->dev.platform_data;
diff --git a/drivers/mfd/twl4030-madc.c b/drivers/mfd/twl4030-madc.c
index 456ecb5ac4fe..228d5aacd332 100644
--- a/drivers/mfd/twl4030-madc.c
+++ b/drivers/mfd/twl4030-madc.c
@@ -692,7 +692,7 @@ static int twl4030_madc_set_power(struct twl4030_madc_data *madc, int on)
692/* 692/*
693 * Initialize MADC and request for threaded irq 693 * Initialize MADC and request for threaded irq
694 */ 694 */
695static int __devinit twl4030_madc_probe(struct platform_device *pdev) 695static int twl4030_madc_probe(struct platform_device *pdev)
696{ 696{
697 struct twl4030_madc_data *madc; 697 struct twl4030_madc_data *madc;
698 struct twl4030_madc_platform_data *pdata = pdev->dev.platform_data; 698 struct twl4030_madc_platform_data *pdata = pdev->dev.platform_data;
diff --git a/drivers/mfd/twl4030-power.c b/drivers/mfd/twl4030-power.c
index 79ca33dfacca..a5332063183a 100644
--- a/drivers/mfd/twl4030-power.c
+++ b/drivers/mfd/twl4030-power.c
@@ -124,7 +124,7 @@ static u8 res_config_addrs[] = {
124 [RES_MAIN_REF] = 0x94, 124 [RES_MAIN_REF] = 0x94,
125}; 125};
126 126
127static int __devinit twl4030_write_script_byte(u8 address, u8 byte) 127static int twl4030_write_script_byte(u8 address, u8 byte)
128{ 128{
129 int err; 129 int err;
130 130
@@ -138,7 +138,7 @@ out:
138 return err; 138 return err;
139} 139}
140 140
141static int __devinit twl4030_write_script_ins(u8 address, u16 pmb_message, 141static int twl4030_write_script_ins(u8 address, u16 pmb_message,
142 u8 delay, u8 next) 142 u8 delay, u8 next)
143{ 143{
144 int err; 144 int err;
@@ -158,7 +158,7 @@ out:
158 return err; 158 return err;
159} 159}
160 160
161static int __devinit twl4030_write_script(u8 address, struct twl4030_ins *script, 161static int twl4030_write_script(u8 address, struct twl4030_ins *script,
162 int len) 162 int len)
163{ 163{
164 int err; 164 int err;
@@ -183,7 +183,7 @@ static int __devinit twl4030_write_script(u8 address, struct twl4030_ins *script
183 return err; 183 return err;
184} 184}
185 185
186static int __devinit twl4030_config_wakeup3_sequence(u8 address) 186static int twl4030_config_wakeup3_sequence(u8 address)
187{ 187{
188 int err; 188 int err;
189 u8 data; 189 u8 data;
@@ -208,7 +208,7 @@ out:
208 return err; 208 return err;
209} 209}
210 210
211static int __devinit twl4030_config_wakeup12_sequence(u8 address) 211static int twl4030_config_wakeup12_sequence(u8 address)
212{ 212{
213 int err = 0; 213 int err = 0;
214 u8 data; 214 u8 data;
@@ -262,7 +262,7 @@ out:
262 return err; 262 return err;
263} 263}
264 264
265static int __devinit twl4030_config_sleep_sequence(u8 address) 265static int twl4030_config_sleep_sequence(u8 address)
266{ 266{
267 int err; 267 int err;
268 268
@@ -276,7 +276,7 @@ static int __devinit twl4030_config_sleep_sequence(u8 address)
276 return err; 276 return err;
277} 277}
278 278
279static int __devinit twl4030_config_warmreset_sequence(u8 address) 279static int twl4030_config_warmreset_sequence(u8 address)
280{ 280{
281 int err; 281 int err;
282 u8 rd_data; 282 u8 rd_data;
@@ -324,7 +324,7 @@ out:
324 return err; 324 return err;
325} 325}
326 326
327static int __devinit twl4030_configure_resource(struct twl4030_resconfig *rconfig) 327static int twl4030_configure_resource(struct twl4030_resconfig *rconfig)
328{ 328{
329 int rconfig_addr; 329 int rconfig_addr;
330 int err; 330 int err;
@@ -416,7 +416,7 @@ static int __devinit twl4030_configure_resource(struct twl4030_resconfig *rconfi
416 return 0; 416 return 0;
417} 417}
418 418
419static int __devinit load_twl4030_script(struct twl4030_script *tscript, 419static int load_twl4030_script(struct twl4030_script *tscript,
420 u8 address) 420 u8 address)
421{ 421{
422 int err; 422 int err;
@@ -527,7 +527,7 @@ void twl4030_power_off(void)
527 pr_err("TWL4030 Unable to power off\n"); 527 pr_err("TWL4030 Unable to power off\n");
528} 528}
529 529
530void __devinit twl4030_power_init(struct twl4030_power_data *twl4030_scripts) 530void twl4030_power_init(struct twl4030_power_data *twl4030_scripts)
531{ 531{
532 int err = 0; 532 int err = 0;
533 int i; 533 int i;
diff --git a/drivers/mfd/vx855.c b/drivers/mfd/vx855.c
index c5a7df84e6da..66ef03b02569 100644
--- a/drivers/mfd/vx855.c
+++ b/drivers/mfd/vx855.c
@@ -72,7 +72,7 @@ static struct mfd_cell vx855_cells[] = {
72 }, 72 },
73}; 73};
74 74
75static __devinit int vx855_probe(struct pci_dev *pdev, 75static int vx855_probe(struct pci_dev *pdev,
76 const struct pci_device_id *id) 76 const struct pci_device_id *id)
77{ 77{
78 int ret; 78 int ret;
diff --git a/drivers/mfd/wl1273-core.c b/drivers/mfd/wl1273-core.c
index 7f3f3896662d..edbe6c1b755a 100644
--- a/drivers/mfd/wl1273-core.c
+++ b/drivers/mfd/wl1273-core.c
@@ -182,7 +182,7 @@ static int wl1273_core_remove(struct i2c_client *client)
182 return 0; 182 return 0;
183} 183}
184 184
185static int __devinit wl1273_core_probe(struct i2c_client *client, 185static int wl1273_core_probe(struct i2c_client *client,
186 const struct i2c_device_id *id) 186 const struct i2c_device_id *id)
187{ 187{
188 struct wl1273_fm_platform_data *pdata = client->dev.platform_data; 188 struct wl1273_fm_platform_data *pdata = client->dev.platform_data;
diff --git a/drivers/mfd/wm831x-spi.c b/drivers/mfd/wm831x-spi.c
index 4329a3a9726f..4c7225a53ba2 100644
--- a/drivers/mfd/wm831x-spi.c
+++ b/drivers/mfd/wm831x-spi.c
@@ -21,7 +21,7 @@
21 21
22#include <linux/mfd/wm831x/core.h> 22#include <linux/mfd/wm831x/core.h>
23 23
24static int __devinit wm831x_spi_probe(struct spi_device *spi) 24static int wm831x_spi_probe(struct spi_device *spi)
25{ 25{
26 const struct spi_device_id *id = spi_get_device_id(spi); 26 const struct spi_device_id *id = spi_get_device_id(spi);
27 struct wm831x *wm831x; 27 struct wm831x *wm831x;
diff --git a/drivers/mfd/wm8994-core.c b/drivers/mfd/wm8994-core.c
index bb9cf5216115..46429495836d 100644
--- a/drivers/mfd/wm8994-core.c
+++ b/drivers/mfd/wm8994-core.c
@@ -399,7 +399,7 @@ static const __devinitconst struct reg_default wm1811_reva_patch[] = {
399/* 399/*
400 * Instantiate the generic non-control parts of the device. 400 * Instantiate the generic non-control parts of the device.
401 */ 401 */
402static __devinit int wm8994_device_init(struct wm8994 *wm8994, int irq) 402static int wm8994_device_init(struct wm8994 *wm8994, int irq)
403{ 403{
404 struct wm8994_pdata *pdata = wm8994->dev->platform_data; 404 struct wm8994_pdata *pdata = wm8994->dev->platform_data;
405 struct regmap_config *regmap_config; 405 struct regmap_config *regmap_config;
@@ -689,7 +689,7 @@ static const struct of_device_id wm8994_of_match[] = {
689}; 689};
690MODULE_DEVICE_TABLE(of, wm8994_of_match); 690MODULE_DEVICE_TABLE(of, wm8994_of_match);
691 691
692static __devinit int wm8994_i2c_probe(struct i2c_client *i2c, 692static int wm8994_i2c_probe(struct i2c_client *i2c,
693 const struct i2c_device_id *id) 693 const struct i2c_device_id *id)
694{ 694{
695 struct wm8994 *wm8994; 695 struct wm8994 *wm8994;
diff --git a/include/linux/mfd/88pm80x.h b/include/linux/mfd/88pm80x.h
index a0ca0dca1244..478672ed0c3d 100644
--- a/include/linux/mfd/88pm80x.h
+++ b/include/linux/mfd/88pm80x.h
@@ -364,6 +364,6 @@ static inline int pm80x_dev_resume(struct device *dev)
364#endif 364#endif
365 365
366extern int pm80x_init(struct i2c_client *client, 366extern int pm80x_init(struct i2c_client *client,
367 const struct i2c_device_id *id) __devinit; 367 const struct i2c_device_id *id);
368extern int pm80x_deinit(struct i2c_client *client); 368extern int pm80x_deinit(struct i2c_client *client);
369#endif /* __LINUX_MFD_88PM80X_H */ 369#endif /* __LINUX_MFD_88PM80X_H */
diff --git a/include/linux/mfd/abx500/ab8500.h b/include/linux/mfd/abx500/ab8500.h
index 1491044efa10..83f0bdc530b7 100644
--- a/include/linux/mfd/abx500/ab8500.h
+++ b/include/linux/mfd/abx500/ab8500.h
@@ -291,7 +291,7 @@ struct ab8500_platform_data {
291 struct ab8500_codec_platform_data *codec; 291 struct ab8500_codec_platform_data *codec;
292}; 292};
293 293
294extern int __devinit ab8500_init(struct ab8500 *ab8500, 294extern int ab8500_init(struct ab8500 *ab8500,
295 enum ab8500_version version); 295 enum ab8500_version version);
296extern int __devexit ab8500_exit(struct ab8500 *ab8500); 296extern int __devexit ab8500_exit(struct ab8500 *ab8500);
297 297
diff --git a/include/linux/mfd/pm8xxx/irq.h b/include/linux/mfd/pm8xxx/irq.h
index 4b21769f4483..ddaa7f5e9ed9 100644
--- a/include/linux/mfd/pm8xxx/irq.h
+++ b/include/linux/mfd/pm8xxx/irq.h
@@ -37,7 +37,7 @@ struct pm_irq_chip;
37 37
38#ifdef CONFIG_MFD_PM8XXX_IRQ 38#ifdef CONFIG_MFD_PM8XXX_IRQ
39int pm8xxx_get_irq_stat(struct pm_irq_chip *chip, int irq); 39int pm8xxx_get_irq_stat(struct pm_irq_chip *chip, int irq);
40struct pm_irq_chip * __devinit pm8xxx_irq_init(struct device *dev, 40struct pm_irq_chip *pm8xxx_irq_init(struct device *dev,
41 const struct pm8xxx_irq_platform_data *pdata); 41 const struct pm8xxx_irq_platform_data *pdata);
42int __devexit pm8xxx_irq_exit(struct pm_irq_chip *chip); 42int __devexit pm8xxx_irq_exit(struct pm_irq_chip *chip);
43#else 43#else
@@ -45,7 +45,7 @@ static inline int pm8xxx_get_irq_stat(struct pm_irq_chip *chip, int irq)
45{ 45{
46 return -ENXIO; 46 return -ENXIO;
47} 47}
48static inline struct pm_irq_chip * __devinit pm8xxx_irq_init( 48static inline struct pm_irq_chip *pm8xxx_irq_init(
49 const struct device *dev, 49 const struct device *dev,
50 const struct pm8xxx_irq_platform_data *pdata) 50 const struct pm8xxx_irq_platform_data *pdata)
51{ 51{
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-10 03:16:59 -0500