summaryrefslogtreecommitdiffstats
path: root/drivers/mfd
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-12-11 16:13:55 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2012-12-11 16:13:55 -0500
commitcff2f741b8ee8a70b208830e330de053efd4fc45 (patch)
tree83367ed74d889e2c8179f1f8b5d6f6f73b857982 /drivers/mfd
parentb0885d01f9ab1274109c02942c881d598f939623 (diff)
parent92e9e6d1f9844b73a26215025a922e7d7aeae361 (diff)
Merge tag 'driver-core-3.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
Pull driver core updates from Greg Kroah-Hartman: "Here's the large driver core updates for 3.8-rc1. The biggest thing here is the various __dev* marking removals. This is going to be a pain for the merge with different subsystem trees, I know, but all of the patches included here have been ACKed by their various subsystem maintainers, as they wanted them to go through here. If this is too much of a pain, I can pull all of them out of this tree and just send you one with the other fixes/updates and then, after 3.8-rc1 is out, do the rest of the removals to ensure we catch them all, it's up to you. The merges should all be trivial, and Stephen has been doing them all in linux-next for a few weeks now quite easily. Other than the __dev* marking removals, there's nothing major here, some firmware loading updates and other minor things in the driver core. All of these have (much to Stephen's annoyance), been in linux-next for a while. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>" Fixed up trivial conflicts in drivers/gpio/gpio-{em,stmpe}.c due to gpio update. * tag 'driver-core-3.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (93 commits) modpost.c: Stop checking __dev* section mismatches init.h: Remove __dev* sections from the kernel acpi: remove use of __devinit PCI: Remove __dev* markings PCI: Always build setup-bus when PCI is enabled PCI: Move pci_uevent into pci-driver.c PCI: Remove CONFIG_HOTPLUG ifdefs unicore32/PCI: Remove CONFIG_HOTPLUG ifdefs sh/PCI: Remove CONFIG_HOTPLUG ifdefs powerpc/PCI: Remove CONFIG_HOTPLUG ifdefs mips/PCI: Remove CONFIG_HOTPLUG ifdefs microblaze/PCI: Remove CONFIG_HOTPLUG ifdefs dma: remove use of __devinit dma: remove use of __devexit_p firewire: remove use of __devinitdata firewire: remove use of __devinit leds: remove use of __devexit leds: remove use of __devinit leds: remove use of __devexit_p mmc: remove use of __devexit ...
Diffstat (limited to 'drivers/mfd')
-rw-r--r--drivers/mfd/88pm800.c12
-rw-r--r--drivers/mfd/88pm805.c10
-rw-r--r--drivers/mfd/88pm80x.c2
-rw-r--r--drivers/mfd/88pm860x-core.c104
-rw-r--r--drivers/mfd/ab3100-core.c13
-rw-r--r--drivers/mfd/ab8500-core.c40
-rw-r--r--drivers/mfd/ab8500-debugfs.c6
-rw-r--r--drivers/mfd/ab8500-gpadc.c6
-rw-r--r--drivers/mfd/ab8500-sysctrl.c6
-rw-r--r--drivers/mfd/adp5520.c6
-rw-r--r--drivers/mfd/arizona-core.c4
-rw-r--r--drivers/mfd/arizona-i2c.c6
-rw-r--r--drivers/mfd/arizona-spi.c6
-rw-r--r--drivers/mfd/asic3.c4
-rw-r--r--drivers/mfd/cs5535-mfd.c12
-rw-r--r--drivers/mfd/da903x.c10
-rw-r--r--drivers/mfd/da9052-core.c4
-rw-r--r--drivers/mfd/da9052-i2c.c6
-rw-r--r--drivers/mfd/da9052-spi.c6
-rw-r--r--drivers/mfd/da9055-core.c4
-rw-r--r--drivers/mfd/da9055-i2c.c6
-rw-r--r--drivers/mfd/davinci_voicecodec.c4
-rw-r--r--drivers/mfd/db8500-prcmu.c2
-rw-r--r--drivers/mfd/ezx-pcap.c8
-rw-r--r--drivers/mfd/htc-i2cpld.c12
-rw-r--r--drivers/mfd/intel_msic.c10
-rw-r--r--drivers/mfd/janz-cmodio.c10
-rw-r--r--drivers/mfd/jz4740-adc.c6
-rw-r--r--drivers/mfd/lm3533-core.c18
-rw-r--r--drivers/mfd/lp8788.c4
-rw-r--r--drivers/mfd/lpc_ich.c20
-rw-r--r--drivers/mfd/lpc_sch.c6
-rw-r--r--drivers/mfd/max77686.c2
-rw-r--r--drivers/mfd/max8907.c4
-rw-r--r--drivers/mfd/max8925-core.c58
-rw-r--r--drivers/mfd/max8925-i2c.c6
-rw-r--r--drivers/mfd/mc13xxx-i2c.c4
-rw-r--r--drivers/mfd/mc13xxx-spi.c4
-rw-r--r--drivers/mfd/omap-usb-host.c4
-rw-r--r--drivers/mfd/omap-usb-tll.c6
-rw-r--r--drivers/mfd/palmas.c6
-rw-r--r--drivers/mfd/pcf50633-adc.c6
-rw-r--r--drivers/mfd/pcf50633-core.c6
-rw-r--r--drivers/mfd/pm8921-core.c8
-rw-r--r--drivers/mfd/pm8xxx-irq.c4
-rw-r--r--drivers/mfd/rc5t583.c6
-rw-r--r--drivers/mfd/rdc321x-southbridge.c6
-rw-r--r--drivers/mfd/sm501.c16
-rw-r--r--drivers/mfd/sta2x11-mfd.c20
-rw-r--r--drivers/mfd/stmpe-i2c.c6
-rw-r--r--drivers/mfd/stmpe-spi.c6
-rw-r--r--drivers/mfd/syscon.c6
-rw-r--r--drivers/mfd/tc3589x.c8
-rw-r--r--drivers/mfd/tc6387xb.c6
-rw-r--r--drivers/mfd/tc6393xb.c12
-rw-r--r--drivers/mfd/ti-ssp.c6
-rw-r--r--drivers/mfd/timberdale.c64
-rw-r--r--drivers/mfd/tps6105x.c8
-rw-r--r--drivers/mfd/tps65090.c8
-rw-r--r--drivers/mfd/tps65217.c6
-rw-r--r--drivers/mfd/tps6586x.c10
-rw-r--r--drivers/mfd/tps65910.c10
-rw-r--r--drivers/mfd/tps65911-comparator.c6
-rw-r--r--drivers/mfd/tps65912-spi.c6
-rw-r--r--drivers/mfd/twl-core.c2
-rw-r--r--drivers/mfd/twl4030-audio.c6
-rw-r--r--drivers/mfd/twl4030-madc.c4
-rw-r--r--drivers/mfd/twl4030-power.c20
-rw-r--r--drivers/mfd/vx855.c6
-rw-r--r--drivers/mfd/wl1273-core.c4
-rw-r--r--drivers/mfd/wm831x-spi.c6
-rw-r--r--drivers/mfd/wm8994-core.c16
72 files changed, 385 insertions, 386 deletions
diff --git a/drivers/mfd/88pm800.c b/drivers/mfd/88pm800.c
index ce229ea933d1..391e23e6a647 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;
@@ -554,7 +554,7 @@ out_init:
554 return ret; 554 return ret;
555} 555}
556 556
557static int __devexit pm800_remove(struct i2c_client *client) 557static int pm800_remove(struct i2c_client *client)
558{ 558{
559 struct pm80x_chip *chip = i2c_get_clientdata(client); 559 struct pm80x_chip *chip = i2c_get_clientdata(client);
560 560
@@ -576,7 +576,7 @@ static struct i2c_driver pm800_driver = {
576 .pm = &pm80x_pm_ops, 576 .pm = &pm80x_pm_ops,
577 }, 577 },
578 .probe = pm800_probe, 578 .probe = pm800_probe,
579 .remove = __devexit_p(pm800_remove), 579 .remove = pm800_remove,
580 .id_table = pm80x_id_table, 580 .id_table = pm80x_id_table,
581}; 581};
582 582
diff --git a/drivers/mfd/88pm805.c b/drivers/mfd/88pm805.c
index c20a31136f04..e671230be2b1 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;
@@ -262,7 +262,7 @@ out_init:
262 return ret; 262 return ret;
263} 263}
264 264
265static int __devexit pm805_remove(struct i2c_client *client) 265static int pm805_remove(struct i2c_client *client)
266{ 266{
267 struct pm80x_chip *chip = i2c_get_clientdata(client); 267 struct pm80x_chip *chip = i2c_get_clientdata(client);
268 268
@@ -281,7 +281,7 @@ static struct i2c_driver pm805_driver = {
281 .pm = &pm80x_pm_ops, 281 .pm = &pm80x_pm_ops,
282 }, 282 },
283 .probe = pm805_probe, 283 .probe = pm805_probe,
284 .remove = __devexit_p(pm805_remove), 284 .remove = pm805_remove,
285 .id_table = pm80x_id_table, 285 .id_table = pm80x_id_table,
286}; 286};
287 287
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 8fa86edf70d4..893fc1ba6ead 100644
--- a/drivers/mfd/88pm860x-core.c
+++ b/drivers/mfd/88pm860x-core.c
@@ -28,111 +28,111 @@
28 28
29#define INT_STATUS_NUM 3 29#define INT_STATUS_NUM 3
30 30
31static struct resource bk0_resources[] __devinitdata = { 31static struct resource bk0_resources[] = {
32 {2, 2, "duty cycle", IORESOURCE_REG, }, 32 {2, 2, "duty cycle", IORESOURCE_REG, },
33 {3, 3, "always on", IORESOURCE_REG, }, 33 {3, 3, "always on", IORESOURCE_REG, },
34 {3, 3, "current", IORESOURCE_REG, }, 34 {3, 3, "current", IORESOURCE_REG, },
35}; 35};
36static struct resource bk1_resources[] __devinitdata = { 36static struct resource bk1_resources[] = {
37 {4, 4, "duty cycle", IORESOURCE_REG, }, 37 {4, 4, "duty cycle", IORESOURCE_REG, },
38 {5, 5, "always on", IORESOURCE_REG, }, 38 {5, 5, "always on", IORESOURCE_REG, },
39 {5, 5, "current", IORESOURCE_REG, }, 39 {5, 5, "current", IORESOURCE_REG, },
40}; 40};
41static struct resource bk2_resources[] __devinitdata = { 41static struct resource bk2_resources[] = {
42 {6, 6, "duty cycle", IORESOURCE_REG, }, 42 {6, 6, "duty cycle", IORESOURCE_REG, },
43 {7, 7, "always on", IORESOURCE_REG, }, 43 {7, 7, "always on", IORESOURCE_REG, },
44 {5, 5, "current", IORESOURCE_REG, }, 44 {5, 5, "current", IORESOURCE_REG, },
45}; 45};
46 46
47static struct resource led0_resources[] __devinitdata = { 47static struct resource led0_resources[] = {
48 /* RGB1 Red LED */ 48 /* RGB1 Red LED */
49 {0xd, 0xd, "control", IORESOURCE_REG, }, 49 {0xd, 0xd, "control", IORESOURCE_REG, },
50 {0xc, 0xc, "blink", IORESOURCE_REG, }, 50 {0xc, 0xc, "blink", IORESOURCE_REG, },
51}; 51};
52static struct resource led1_resources[] __devinitdata = { 52static struct resource led1_resources[] = {
53 /* RGB1 Green LED */ 53 /* RGB1 Green LED */
54 {0xe, 0xe, "control", IORESOURCE_REG, }, 54 {0xe, 0xe, "control", IORESOURCE_REG, },
55 {0xc, 0xc, "blink", IORESOURCE_REG, }, 55 {0xc, 0xc, "blink", IORESOURCE_REG, },
56}; 56};
57static struct resource led2_resources[] __devinitdata = { 57static struct resource led2_resources[] = {
58 /* RGB1 Blue LED */ 58 /* RGB1 Blue LED */
59 {0xf, 0xf, "control", IORESOURCE_REG, }, 59 {0xf, 0xf, "control", IORESOURCE_REG, },
60 {0xc, 0xc, "blink", IORESOURCE_REG, }, 60 {0xc, 0xc, "blink", IORESOURCE_REG, },
61}; 61};
62static struct resource led3_resources[] __devinitdata = { 62static struct resource led3_resources[] = {
63 /* RGB2 Red LED */ 63 /* RGB2 Red LED */
64 {0x9, 0x9, "control", IORESOURCE_REG, }, 64 {0x9, 0x9, "control", IORESOURCE_REG, },
65 {0x8, 0x8, "blink", IORESOURCE_REG, }, 65 {0x8, 0x8, "blink", IORESOURCE_REG, },
66}; 66};
67static struct resource led4_resources[] __devinitdata = { 67static struct resource led4_resources[] = {
68 /* RGB2 Green LED */ 68 /* RGB2 Green LED */
69 {0xa, 0xa, "control", IORESOURCE_REG, }, 69 {0xa, 0xa, "control", IORESOURCE_REG, },
70 {0x8, 0x8, "blink", IORESOURCE_REG, }, 70 {0x8, 0x8, "blink", IORESOURCE_REG, },
71}; 71};
72static struct resource led5_resources[] __devinitdata = { 72static struct resource led5_resources[] = {
73 /* RGB2 Blue LED */ 73 /* RGB2 Blue LED */
74 {0xb, 0xb, "control", IORESOURCE_REG, }, 74 {0xb, 0xb, "control", IORESOURCE_REG, },
75 {0x8, 0x8, "blink", IORESOURCE_REG, }, 75 {0x8, 0x8, "blink", IORESOURCE_REG, },
76}; 76};
77 77
78static struct resource buck1_resources[] __devinitdata = { 78static struct resource buck1_resources[] = {
79 {0x24, 0x24, "buck set", IORESOURCE_REG, }, 79 {0x24, 0x24, "buck set", IORESOURCE_REG, },
80}; 80};
81static struct resource buck2_resources[] __devinitdata = { 81static struct resource buck2_resources[] = {
82 {0x25, 0x25, "buck set", IORESOURCE_REG, }, 82 {0x25, 0x25, "buck set", IORESOURCE_REG, },
83}; 83};
84static struct resource buck3_resources[] __devinitdata = { 84static struct resource buck3_resources[] = {
85 {0x26, 0x26, "buck set", IORESOURCE_REG, }, 85 {0x26, 0x26, "buck set", IORESOURCE_REG, },
86}; 86};
87static struct resource ldo1_resources[] __devinitdata = { 87static struct resource ldo1_resources[] = {
88 {0x10, 0x10, "ldo set", IORESOURCE_REG, }, 88 {0x10, 0x10, "ldo set", IORESOURCE_REG, },
89}; 89};
90static struct resource ldo2_resources[] __devinitdata = { 90static struct resource ldo2_resources[] = {
91 {0x11, 0x11, "ldo set", IORESOURCE_REG, }, 91 {0x11, 0x11, "ldo set", IORESOURCE_REG, },
92}; 92};
93static struct resource ldo3_resources[] __devinitdata = { 93static struct resource ldo3_resources[] = {
94 {0x12, 0x12, "ldo set", IORESOURCE_REG, }, 94 {0x12, 0x12, "ldo set", IORESOURCE_REG, },
95}; 95};
96static struct resource ldo4_resources[] __devinitdata = { 96static struct resource ldo4_resources[] = {
97 {0x13, 0x13, "ldo set", IORESOURCE_REG, }, 97 {0x13, 0x13, "ldo set", IORESOURCE_REG, },
98}; 98};
99static struct resource ldo5_resources[] __devinitdata = { 99static struct resource ldo5_resources[] = {
100 {0x14, 0x14, "ldo set", IORESOURCE_REG, }, 100 {0x14, 0x14, "ldo set", IORESOURCE_REG, },
101}; 101};
102static struct resource ldo6_resources[] __devinitdata = { 102static struct resource ldo6_resources[] = {
103 {0x15, 0x15, "ldo set", IORESOURCE_REG, }, 103 {0x15, 0x15, "ldo set", IORESOURCE_REG, },
104}; 104};
105static struct resource ldo7_resources[] __devinitdata = { 105static struct resource ldo7_resources[] = {
106 {0x16, 0x16, "ldo set", IORESOURCE_REG, }, 106 {0x16, 0x16, "ldo set", IORESOURCE_REG, },
107}; 107};
108static struct resource ldo8_resources[] __devinitdata = { 108static struct resource ldo8_resources[] = {
109 {0x17, 0x17, "ldo set", IORESOURCE_REG, }, 109 {0x17, 0x17, "ldo set", IORESOURCE_REG, },
110}; 110};
111static struct resource ldo9_resources[] __devinitdata = { 111static struct resource ldo9_resources[] = {
112 {0x18, 0x18, "ldo set", IORESOURCE_REG, }, 112 {0x18, 0x18, "ldo set", IORESOURCE_REG, },
113}; 113};
114static struct resource ldo10_resources[] __devinitdata = { 114static struct resource ldo10_resources[] = {
115 {0x19, 0x19, "ldo set", IORESOURCE_REG, }, 115 {0x19, 0x19, "ldo set", IORESOURCE_REG, },
116}; 116};
117static struct resource ldo12_resources[] __devinitdata = { 117static struct resource ldo12_resources[] = {
118 {0x1a, 0x1a, "ldo set", IORESOURCE_REG, }, 118 {0x1a, 0x1a, "ldo set", IORESOURCE_REG, },
119}; 119};
120static struct resource ldo_vibrator_resources[] __devinitdata = { 120static struct resource ldo_vibrator_resources[] = {
121 {0x28, 0x28, "ldo set", IORESOURCE_REG, }, 121 {0x28, 0x28, "ldo set", IORESOURCE_REG, },
122}; 122};
123static struct resource ldo14_resources[] __devinitdata = { 123static struct resource ldo14_resources[] = {
124 {0x1b, 0x1b, "ldo set", IORESOURCE_REG, }, 124 {0x1b, 0x1b, "ldo set", IORESOURCE_REG, },
125}; 125};
126 126
127static struct resource touch_resources[] __devinitdata = { 127static struct resource touch_resources[] = {
128 {PM8607_IRQ_PEN, PM8607_IRQ_PEN, "touch", IORESOURCE_IRQ,}, 128 {PM8607_IRQ_PEN, PM8607_IRQ_PEN, "touch", IORESOURCE_IRQ,},
129}; 129};
130 130
131static struct resource onkey_resources[] __devinitdata = { 131static struct resource onkey_resources[] = {
132 {PM8607_IRQ_ONKEY, PM8607_IRQ_ONKEY, "onkey", IORESOURCE_IRQ,}, 132 {PM8607_IRQ_ONKEY, PM8607_IRQ_ONKEY, "onkey", IORESOURCE_IRQ,},
133}; 133};
134 134
135static struct resource codec_resources[] __devinitdata = { 135static struct resource codec_resources[] = {
136 /* Headset microphone insertion or removal */ 136 /* Headset microphone insertion or removal */
137 {PM8607_IRQ_MICIN, PM8607_IRQ_MICIN, "micin", IORESOURCE_IRQ,}, 137 {PM8607_IRQ_MICIN, PM8607_IRQ_MICIN, "micin", IORESOURCE_IRQ,},
138 /* Hook-switch press or release */ 138 /* Hook-switch press or release */
@@ -143,12 +143,12 @@ static struct resource codec_resources[] __devinitdata = {
143 {PM8607_IRQ_AUDIO_SHORT, PM8607_IRQ_AUDIO_SHORT, "audio-short", IORESOURCE_IRQ,}, 143 {PM8607_IRQ_AUDIO_SHORT, PM8607_IRQ_AUDIO_SHORT, "audio-short", IORESOURCE_IRQ,},
144}; 144};
145 145
146static struct resource battery_resources[] __devinitdata = { 146static struct resource battery_resources[] = {
147 {PM8607_IRQ_CC, PM8607_IRQ_CC, "columb counter", IORESOURCE_IRQ,}, 147 {PM8607_IRQ_CC, PM8607_IRQ_CC, "columb counter", IORESOURCE_IRQ,},
148 {PM8607_IRQ_BAT, PM8607_IRQ_BAT, "battery", IORESOURCE_IRQ,}, 148 {PM8607_IRQ_BAT, PM8607_IRQ_BAT, "battery", IORESOURCE_IRQ,},
149}; 149};
150 150
151static struct resource charger_resources[] __devinitdata = { 151static struct resource charger_resources[] = {
152 {PM8607_IRQ_CHG, PM8607_IRQ_CHG, "charger detect", IORESOURCE_IRQ,}, 152 {PM8607_IRQ_CHG, PM8607_IRQ_CHG, "charger detect", IORESOURCE_IRQ,},
153 {PM8607_IRQ_CHG_DONE, PM8607_IRQ_CHG_DONE, "charging done", IORESOURCE_IRQ,}, 153 {PM8607_IRQ_CHG_DONE, PM8607_IRQ_CHG_DONE, "charging done", IORESOURCE_IRQ,},
154 {PM8607_IRQ_CHG_FAIL, PM8607_IRQ_CHG_FAIL, "charging timeout", IORESOURCE_IRQ,}, 154 {PM8607_IRQ_CHG_FAIL, PM8607_IRQ_CHG_FAIL, "charging timeout", IORESOURCE_IRQ,},
@@ -158,11 +158,11 @@ static struct resource charger_resources[] __devinitdata = {
158 {PM8607_IRQ_VCHG, PM8607_IRQ_VCHG, "vchg voltage", IORESOURCE_IRQ,}, 158 {PM8607_IRQ_VCHG, PM8607_IRQ_VCHG, "vchg voltage", IORESOURCE_IRQ,},
159}; 159};
160 160
161static struct resource rtc_resources[] __devinitdata = { 161static struct resource rtc_resources[] = {
162 {PM8607_IRQ_RTC, PM8607_IRQ_RTC, "rtc", IORESOURCE_IRQ,}, 162 {PM8607_IRQ_RTC, PM8607_IRQ_RTC, "rtc", IORESOURCE_IRQ,},
163}; 163};
164 164
165static struct mfd_cell bk_devs[] __devinitdata = { 165static struct mfd_cell bk_devs[] = {
166 { 166 {
167 .name = "88pm860x-backlight", 167 .name = "88pm860x-backlight",
168 .id = 0, 168 .id = 0,
@@ -181,7 +181,7 @@ static struct mfd_cell bk_devs[] __devinitdata = {
181 }, 181 },
182}; 182};
183 183
184static struct mfd_cell led_devs[] __devinitdata = { 184static struct mfd_cell led_devs[] = {
185 { 185 {
186 .name = "88pm860x-led", 186 .name = "88pm860x-led",
187 .id = 0, 187 .id = 0,
@@ -215,7 +215,7 @@ static struct mfd_cell led_devs[] __devinitdata = {
215 }, 215 },
216}; 216};
217 217
218static struct mfd_cell reg_devs[] __devinitdata = { 218static struct mfd_cell reg_devs[] = {
219 { 219 {
220 .name = "88pm860x-regulator", 220 .name = "88pm860x-regulator",
221 .id = 0, 221 .id = 0,
@@ -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;
@@ -1077,7 +1077,7 @@ static int __devinit pm860x_device_init(struct pm860x_chip *chip,
1077 return 0; 1077 return 0;
1078} 1078}
1079 1079
1080static void __devexit pm860x_device_exit(struct pm860x_chip *chip) 1080static void pm860x_device_exit(struct pm860x_chip *chip)
1081{ 1081{
1082 device_irq_exit(chip); 1082 device_irq_exit(chip);
1083 mfd_remove_devices(chip->dev); 1083 mfd_remove_devices(chip->dev);
@@ -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;
@@ -1200,7 +1200,7 @@ err:
1200 return ret; 1200 return ret;
1201} 1201}
1202 1202
1203static int __devexit pm860x_remove(struct i2c_client *client) 1203static int pm860x_remove(struct i2c_client *client)
1204{ 1204{
1205 struct pm860x_chip *chip = i2c_get_clientdata(client); 1205 struct pm860x_chip *chip = i2c_get_clientdata(client);
1206 1206
@@ -1258,7 +1258,7 @@ static struct i2c_driver pm860x_driver = {
1258 .of_match_table = of_match_ptr(pm860x_dt_ids), 1258 .of_match_table = of_match_ptr(pm860x_dt_ids),
1259 }, 1259 },
1260 .probe = pm860x_probe, 1260 .probe = pm860x_probe,
1261 .remove = __devexit_p(pm860x_remove), 1261 .remove = pm860x_remove,
1262 .id_table = pm860x_id_table, 1262 .id_table = pm860x_id_table,
1263}; 1263};
1264 1264
diff --git a/drivers/mfd/ab3100-core.c b/drivers/mfd/ab3100-core.c
index 2b3dde571a50..2ec7725f4a08 100644
--- a/drivers/mfd/ab3100-core.c
+++ b/drivers/mfd/ab3100-core.c
@@ -661,8 +661,7 @@ struct ab3100_init_setting {
661 u8 setting; 661 u8 setting;
662}; 662};
663 663
664static const struct ab3100_init_setting __devinitconst 664static const struct ab3100_init_setting ab3100_init_settings[] = {
665ab3100_init_settings[] = {
666 { 665 {
667 .abreg = AB3100_MCA, 666 .abreg = AB3100_MCA,
668 .setting = 0x01 667 .setting = 0x01
@@ -708,7 +707,7 @@ ab3100_init_settings[] = {
708 }, 707 },
709}; 708};
710 709
711static int __devinit ab3100_setup(struct ab3100 *ab3100) 710static int ab3100_setup(struct ab3100 *ab3100)
712{ 711{
713 int err = 0; 712 int err = 0;
714 int i; 713 int i;
@@ -803,7 +802,7 @@ struct ab_family_id {
803 char *name; 802 char *name;
804}; 803};
805 804
806static const struct ab_family_id ids[] __devinitconst = { 805static const struct ab_family_id ids[] = {
807 /* AB3100 */ 806 /* AB3100 */
808 { 807 {
809 .id = 0xc0, 808 .id = 0xc0,
@@ -857,7 +856,7 @@ static const struct ab_family_id ids[] __devinitconst = {
857 }, 856 },
858}; 857};
859 858
860static int __devinit ab3100_probe(struct i2c_client *client, 859static int ab3100_probe(struct i2c_client *client,
861 const struct i2c_device_id *id) 860 const struct i2c_device_id *id)
862{ 861{
863 struct ab3100 *ab3100; 862 struct ab3100 *ab3100;
@@ -962,7 +961,7 @@ static int __devinit ab3100_probe(struct i2c_client *client,
962 return err; 961 return err;
963} 962}
964 963
965static int __devexit ab3100_remove(struct i2c_client *client) 964static int ab3100_remove(struct i2c_client *client)
966{ 965{
967 struct ab3100 *ab3100 = i2c_get_clientdata(client); 966 struct ab3100 *ab3100 = i2c_get_clientdata(client);
968 967
@@ -986,7 +985,7 @@ static struct i2c_driver ab3100_driver = {
986 }, 985 },
987 .id_table = ab3100_id, 986 .id_table = ab3100_id,
988 .probe = ab3100_probe, 987 .probe = ab3100_probe,
989 .remove = __devexit_p(ab3100_remove), 988 .remove = ab3100_remove,
990}; 989};
991 990
992static int __init ab3100_i2c_init(void) 991static int __init ab3100_i2c_init(void)
diff --git a/drivers/mfd/ab8500-core.c b/drivers/mfd/ab8500-core.c
index 1667c77b5cde..127b00aadae3 100644
--- a/drivers/mfd/ab8500-core.c
+++ b/drivers/mfd/ab8500-core.c
@@ -623,7 +623,7 @@ static struct resource __devinitdata ab9540_gpio_resources[] = {
623 } 623 }
624}; 624};
625 625
626static struct resource __devinitdata ab8500_gpadc_resources[] = { 626static struct resource ab8500_gpadc_resources[] = {
627 { 627 {
628 .name = "HW_CONV_END", 628 .name = "HW_CONV_END",
629 .start = AB8500_INT_GP_HW_ADC_CONV_END, 629 .start = AB8500_INT_GP_HW_ADC_CONV_END,
@@ -638,7 +638,7 @@ static struct resource __devinitdata ab8500_gpadc_resources[] = {
638 }, 638 },
639}; 639};
640 640
641static struct resource __devinitdata ab8500_rtc_resources[] = { 641static struct resource ab8500_rtc_resources[] = {
642 { 642 {
643 .name = "60S", 643 .name = "60S",
644 .start = AB8500_INT_RTC_60S, 644 .start = AB8500_INT_RTC_60S,
@@ -653,7 +653,7 @@ static struct resource __devinitdata ab8500_rtc_resources[] = {
653 }, 653 },
654}; 654};
655 655
656static struct resource __devinitdata ab8500_poweronkey_db_resources[] = { 656static struct resource ab8500_poweronkey_db_resources[] = {
657 { 657 {
658 .name = "ONKEY_DBF", 658 .name = "ONKEY_DBF",
659 .start = AB8500_INT_PON_KEY1DB_F, 659 .start = AB8500_INT_PON_KEY1DB_F,
@@ -668,7 +668,7 @@ static struct resource __devinitdata ab8500_poweronkey_db_resources[] = {
668 }, 668 },
669}; 669};
670 670
671static struct resource __devinitdata ab8500_av_acc_detect_resources[] = { 671static struct resource ab8500_av_acc_detect_resources[] = {
672 { 672 {
673 .name = "ACC_DETECT_1DB_F", 673 .name = "ACC_DETECT_1DB_F",
674 .start = AB8500_INT_ACC_DETECT_1DB_F, 674 .start = AB8500_INT_ACC_DETECT_1DB_F,
@@ -707,7 +707,7 @@ static struct resource __devinitdata ab8500_av_acc_detect_resources[] = {
707 }, 707 },
708}; 708};
709 709
710static struct resource __devinitdata ab8500_charger_resources[] = { 710static struct resource ab8500_charger_resources[] = {
711 { 711 {
712 .name = "MAIN_CH_UNPLUG_DET", 712 .name = "MAIN_CH_UNPLUG_DET",
713 .start = AB8500_INT_MAIN_CH_UNPLUG_DET, 713 .start = AB8500_INT_MAIN_CH_UNPLUG_DET,
@@ -788,7 +788,7 @@ static struct resource __devinitdata ab8500_charger_resources[] = {
788 }, 788 },
789}; 789};
790 790
791static struct resource __devinitdata ab8500_btemp_resources[] = { 791static struct resource ab8500_btemp_resources[] = {
792 { 792 {
793 .name = "BAT_CTRL_INDB", 793 .name = "BAT_CTRL_INDB",
794 .start = AB8500_INT_BAT_CTRL_INDB, 794 .start = AB8500_INT_BAT_CTRL_INDB,
@@ -821,7 +821,7 @@ static struct resource __devinitdata ab8500_btemp_resources[] = {
821 }, 821 },
822}; 822};
823 823
824static struct resource __devinitdata ab8500_fg_resources[] = { 824static struct resource ab8500_fg_resources[] = {
825 { 825 {
826 .name = "NCONV_ACCU", 826 .name = "NCONV_ACCU",
827 .start = AB8500_INT_CCN_CONV_ACC, 827 .start = AB8500_INT_CCN_CONV_ACC,
@@ -860,10 +860,10 @@ static struct resource __devinitdata ab8500_fg_resources[] = {
860 }, 860 },
861}; 861};
862 862
863static struct resource __devinitdata ab8500_chargalg_resources[] = {}; 863static struct resource ab8500_chargalg_resources[] = {};
864 864
865#ifdef CONFIG_DEBUG_FS 865#ifdef CONFIG_DEBUG_FS
866static struct resource __devinitdata ab8500_debug_resources[] = { 866static struct resource ab8500_debug_resources[] = {
867 { 867 {
868 .name = "IRQ_FIRST", 868 .name = "IRQ_FIRST",
869 .start = AB8500_INT_MAIN_EXT_CH_NOT_OK, 869 .start = AB8500_INT_MAIN_EXT_CH_NOT_OK,
@@ -879,7 +879,7 @@ static struct resource __devinitdata ab8500_debug_resources[] = {
879}; 879};
880#endif 880#endif
881 881
882static struct resource __devinitdata ab8500_usb_resources[] = { 882static struct resource ab8500_usb_resources[] = {
883 { 883 {
884 .name = "ID_WAKEUP_R", 884 .name = "ID_WAKEUP_R",
885 .start = AB8500_INT_ID_WAKEUP_R, 885 .start = AB8500_INT_ID_WAKEUP_R,
@@ -924,7 +924,7 @@ static struct resource __devinitdata ab8500_usb_resources[] = {
924 }, 924 },
925}; 925};
926 926
927static struct resource __devinitdata ab8505_iddet_resources[] = { 927static struct resource ab8505_iddet_resources[] = {
928 { 928 {
929 .name = "KeyDeglitch", 929 .name = "KeyDeglitch",
930 .start = AB8505_INT_KEYDEGLITCH, 930 .start = AB8505_INT_KEYDEGLITCH,
@@ -957,7 +957,7 @@ static struct resource __devinitdata ab8505_iddet_resources[] = {
957 }, 957 },
958}; 958};
959 959
960static struct resource __devinitdata ab8500_temp_resources[] = { 960static struct resource ab8500_temp_resources[] = {
961 { 961 {
962 .name = "AB8500_TEMP_WARM", 962 .name = "AB8500_TEMP_WARM",
963 .start = AB8500_INT_TEMP_WARM, 963 .start = AB8500_INT_TEMP_WARM,
@@ -966,7 +966,7 @@ static struct resource __devinitdata ab8500_temp_resources[] = {
966 }, 966 },
967}; 967};
968 968
969static struct mfd_cell __devinitdata abx500_common_devs[] = { 969static struct mfd_cell abx500_common_devs[] = {
970#ifdef CONFIG_DEBUG_FS 970#ifdef CONFIG_DEBUG_FS
971 { 971 {
972 .name = "ab8500-debug", 972 .name = "ab8500-debug",
@@ -1038,7 +1038,7 @@ static struct mfd_cell __devinitdata abx500_common_devs[] = {
1038 }, 1038 },
1039}; 1039};
1040 1040
1041static struct mfd_cell __devinitdata ab8500_bm_devs[] = { 1041static struct mfd_cell ab8500_bm_devs[] = {
1042 { 1042 {
1043 .name = "ab8500-charger", 1043 .name = "ab8500-charger",
1044 .num_resources = ARRAY_SIZE(ab8500_charger_resources), 1044 .num_resources = ARRAY_SIZE(ab8500_charger_resources),
@@ -1061,7 +1061,7 @@ static struct mfd_cell __devinitdata ab8500_bm_devs[] = {
1061 }, 1061 },
1062}; 1062};
1063 1063
1064static struct mfd_cell __devinitdata ab8500_devs[] = { 1064static struct mfd_cell ab8500_devs[] = {
1065 { 1065 {
1066 .name = "ab8500-gpio", 1066 .name = "ab8500-gpio",
1067 .of_compatible = "stericsson,ab8500-gpio", 1067 .of_compatible = "stericsson,ab8500-gpio",
@@ -1080,7 +1080,7 @@ static struct mfd_cell __devinitdata ab8500_devs[] = {
1080 }, 1080 },
1081}; 1081};
1082 1082
1083static struct mfd_cell __devinitdata ab9540_devs[] = { 1083static struct mfd_cell ab9540_devs[] = {
1084 { 1084 {
1085 .name = "ab8500-gpio", 1085 .name = "ab8500-gpio",
1086 .num_resources = ARRAY_SIZE(ab9540_gpio_resources), 1086 .num_resources = ARRAY_SIZE(ab9540_gpio_resources),
@@ -1097,7 +1097,7 @@ static struct mfd_cell __devinitdata ab9540_devs[] = {
1097}; 1097};
1098 1098
1099/* Device list common to ab9540 and ab8505 */ 1099/* Device list common to ab9540 and ab8505 */
1100static struct mfd_cell __devinitdata ab9540_ab8505_devs[] = { 1100static struct mfd_cell ab9540_ab8505_devs[] = {
1101 { 1101 {
1102 .name = "ab-iddet", 1102 .name = "ab-iddet",
1103 .num_resources = ARRAY_SIZE(ab8505_iddet_resources), 1103 .num_resources = ARRAY_SIZE(ab8505_iddet_resources),
@@ -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",
@@ -1473,7 +1473,7 @@ out_free_ab8500:
1473 return ret; 1473 return ret;
1474} 1474}
1475 1475
1476static int __devexit ab8500_remove(struct platform_device *pdev) 1476static int ab8500_remove(struct platform_device *pdev)
1477{ 1477{
1478 struct ab8500 *ab8500 = platform_get_drvdata(pdev); 1478 struct ab8500 *ab8500 = platform_get_drvdata(pdev);
1479 1479
@@ -1506,7 +1506,7 @@ static struct platform_driver ab8500_core_driver = {
1506 .owner = THIS_MODULE, 1506 .owner = THIS_MODULE,
1507 }, 1507 },
1508 .probe = ab8500_probe, 1508 .probe = ab8500_probe,
1509 .remove = __devexit_p(ab8500_remove), 1509 .remove = ab8500_remove,
1510 .id_table = ab8500_id, 1510 .id_table = ab8500_id,
1511}; 1511};
1512 1512
diff --git a/drivers/mfd/ab8500-debugfs.c b/drivers/mfd/ab8500-debugfs.c
index c4cb806978ac..5a8e707bc038 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;
@@ -597,7 +597,7 @@ exit_no_debugfs:
597 return -ENOMEM; 597 return -ENOMEM;
598} 598}
599 599
600static int __devexit ab8500_debug_remove(struct platform_device *plf) 600static int ab8500_debug_remove(struct platform_device *plf)
601{ 601{
602 debugfs_remove(ab8500_val_file); 602 debugfs_remove(ab8500_val_file);
603 debugfs_remove(ab8500_address_file); 603 debugfs_remove(ab8500_address_file);
@@ -614,7 +614,7 @@ static struct platform_driver ab8500_debug_driver = {
614 .owner = THIS_MODULE, 614 .owner = THIS_MODULE,
615 }, 615 },
616 .probe = ab8500_debug_probe, 616 .probe = ab8500_debug_probe,
617 .remove = __devexit_p(ab8500_debug_remove) 617 .remove = ab8500_debug_remove
618}; 618};
619 619
620static int __init ab8500_debug_init(void) 620static int __init ab8500_debug_init(void)
diff --git a/drivers/mfd/ab8500-gpadc.c b/drivers/mfd/ab8500-gpadc.c
index 29d72a259c85..3fb1f40d6389 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;
@@ -634,7 +634,7 @@ fail:
634 return ret; 634 return ret;
635} 635}
636 636
637static int __devexit ab8500_gpadc_remove(struct platform_device *pdev) 637static int ab8500_gpadc_remove(struct platform_device *pdev)
638{ 638{
639 struct ab8500_gpadc *gpadc = platform_get_drvdata(pdev); 639 struct ab8500_gpadc *gpadc = platform_get_drvdata(pdev);
640 640
@@ -651,7 +651,7 @@ static int __devexit ab8500_gpadc_remove(struct platform_device *pdev)
651 651
652static struct platform_driver ab8500_gpadc_driver = { 652static struct platform_driver ab8500_gpadc_driver = {
653 .probe = ab8500_gpadc_probe, 653 .probe = ab8500_gpadc_probe,
654 .remove = __devexit_p(ab8500_gpadc_remove), 654 .remove = ab8500_gpadc_remove,
655 .driver = { 655 .driver = {
656 .name = "ab8500-gpadc", 656 .name = "ab8500-gpadc",
657 .owner = THIS_MODULE, 657 .owner = THIS_MODULE,
diff --git a/drivers/mfd/ab8500-sysctrl.c b/drivers/mfd/ab8500-sysctrl.c
index c28d4eb1eff0..8a33b2c7eead 100644
--- a/drivers/mfd/ab8500-sysctrl.c
+++ b/drivers/mfd/ab8500-sysctrl.c
@@ -49,13 +49,13 @@ 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;
56} 56}
57 57
58static int __devexit ab8500_sysctrl_remove(struct platform_device *pdev) 58static int ab8500_sysctrl_remove(struct platform_device *pdev)
59{ 59{
60 sysctrl_dev = NULL; 60 sysctrl_dev = NULL;
61 return 0; 61 return 0;
@@ -67,7 +67,7 @@ static struct platform_driver ab8500_sysctrl_driver = {
67 .owner = THIS_MODULE, 67 .owner = THIS_MODULE,
68 }, 68 },
69 .probe = ab8500_sysctrl_probe, 69 .probe = ab8500_sysctrl_probe,
70 .remove = __devexit_p(ab8500_sysctrl_remove), 70 .remove = ab8500_sysctrl_remove,
71}; 71};
72 72
73static int __init ab8500_sysctrl_init(void) 73static int __init ab8500_sysctrl_init(void)
diff --git a/drivers/mfd/adp5520.c b/drivers/mfd/adp5520.c
index ea8b9475731d..210dd038bb5a 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;
@@ -307,7 +307,7 @@ out_free_chip:
307 return ret; 307 return ret;
308} 308}
309 309
310static int __devexit adp5520_remove(struct i2c_client *client) 310static int adp5520_remove(struct i2c_client *client)
311{ 311{
312 struct adp5520_chip *chip = dev_get_drvdata(&client->dev); 312 struct adp5520_chip *chip = dev_get_drvdata(&client->dev);
313 313
@@ -356,7 +356,7 @@ static struct i2c_driver adp5520_driver = {
356 .pm = &adp5520_pm, 356 .pm = &adp5520_pm,
357 }, 357 },
358 .probe = adp5520_probe, 358 .probe = adp5520_probe,
359 .remove = __devexit_p(adp5520_remove), 359 .remove = adp5520_remove,
360 .id_table = adp5520_id, 360 .id_table = adp5520_id,
361}; 361};
362 362
diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c
index f4f9bf84bc7b..1a6f943f7337 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;
@@ -561,7 +561,7 @@ err_early:
561} 561}
562EXPORT_SYMBOL_GPL(arizona_dev_init); 562EXPORT_SYMBOL_GPL(arizona_dev_init);
563 563
564int __devexit arizona_dev_exit(struct arizona *arizona) 564int arizona_dev_exit(struct arizona *arizona)
565{ 565{
566 mfd_remove_devices(arizona->dev); 566 mfd_remove_devices(arizona->dev);
567 arizona_free_irq(arizona, ARIZONA_IRQ_UNDERCLOCKED, arizona); 567 arizona_free_irq(arizona, ARIZONA_IRQ_UNDERCLOCKED, arizona);
diff --git a/drivers/mfd/arizona-i2c.c b/drivers/mfd/arizona-i2c.c
index 570c4b438086..44a1bb969841 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;
@@ -65,7 +65,7 @@ static __devinit int arizona_i2c_probe(struct i2c_client *i2c,
65 return arizona_dev_init(arizona); 65 return arizona_dev_init(arizona);
66} 66}
67 67
68static int __devexit arizona_i2c_remove(struct i2c_client *i2c) 68static int arizona_i2c_remove(struct i2c_client *i2c)
69{ 69{
70 struct arizona *arizona = dev_get_drvdata(&i2c->dev); 70 struct arizona *arizona = dev_get_drvdata(&i2c->dev);
71 arizona_dev_exit(arizona); 71 arizona_dev_exit(arizona);
@@ -86,7 +86,7 @@ static struct i2c_driver arizona_i2c_driver = {
86 .pm = &arizona_pm_ops, 86 .pm = &arizona_pm_ops,
87 }, 87 },
88 .probe = arizona_i2c_probe, 88 .probe = arizona_i2c_probe,
89 .remove = __devexit_p(arizona_i2c_remove), 89 .remove = arizona_i2c_remove,
90 .id_table = arizona_i2c_id, 90 .id_table = arizona_i2c_id,
91}; 91};
92 92
diff --git a/drivers/mfd/arizona-spi.c b/drivers/mfd/arizona-spi.c
index df2e5a8bee28..1b9fdd698b03 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;
@@ -65,7 +65,7 @@ static int __devinit arizona_spi_probe(struct spi_device *spi)
65 return arizona_dev_init(arizona); 65 return arizona_dev_init(arizona);
66} 66}
67 67
68static int __devexit arizona_spi_remove(struct spi_device *spi) 68static int arizona_spi_remove(struct spi_device *spi)
69{ 69{
70 struct arizona *arizona = dev_get_drvdata(&spi->dev); 70 struct arizona *arizona = dev_get_drvdata(&spi->dev);
71 arizona_dev_exit(arizona); 71 arizona_dev_exit(arizona);
@@ -86,7 +86,7 @@ static struct spi_driver arizona_spi_driver = {
86 .pm = &arizona_pm_ops, 86 .pm = &arizona_pm_ops,
87 }, 87 },
88 .probe = arizona_spi_probe, 88 .probe = arizona_spi_probe,
89 .remove = __devexit_p(arizona_spi_remove), 89 .remove = arizona_spi_remove,
90 .id_table = arizona_spi_ids, 90 .id_table = arizona_spi_ids,
91}; 91};
92 92
diff --git a/drivers/mfd/asic3.c b/drivers/mfd/asic3.c
index 62f0883a7630..1b15986c01e1 100644
--- a/drivers/mfd/asic3.c
+++ b/drivers/mfd/asic3.c
@@ -1039,7 +1039,7 @@ static int __init asic3_probe(struct platform_device *pdev)
1039 return ret; 1039 return ret;
1040} 1040}
1041 1041
1042static int __devexit asic3_remove(struct platform_device *pdev) 1042static int asic3_remove(struct platform_device *pdev)
1043{ 1043{
1044 int ret; 1044 int ret;
1045 struct asic3 *asic = platform_get_drvdata(pdev); 1045 struct asic3 *asic = platform_get_drvdata(pdev);
@@ -1071,7 +1071,7 @@ static struct platform_driver asic3_device_driver = {
1071 .driver = { 1071 .driver = {
1072 .name = "asic3", 1072 .name = "asic3",
1073 }, 1073 },
1074 .remove = __devexit_p(asic3_remove), 1074 .remove = asic3_remove,
1075 .shutdown = asic3_shutdown, 1075 .shutdown = asic3_shutdown,
1076}; 1076};
1077 1077
diff --git a/drivers/mfd/cs5535-mfd.c b/drivers/mfd/cs5535-mfd.c
index 2b282133c725..2e4752a9220a 100644
--- a/drivers/mfd/cs5535-mfd.c
+++ b/drivers/mfd/cs5535-mfd.c
@@ -71,9 +71,9 @@ static int cs5535_mfd_res_disable(struct platform_device *pdev)
71 return 0; 71 return 0;
72} 72}
73 73
74static __devinitdata struct resource cs5535_mfd_resources[NR_BARS]; 74static struct resource cs5535_mfd_resources[NR_BARS];
75 75
76static __devinitdata struct mfd_cell cs5535_mfd_cells[] = { 76static struct mfd_cell cs5535_mfd_cells[] = {
77 { 77 {
78 .id = SMB_BAR, 78 .id = SMB_BAR,
79 .name = "cs5535-smb", 79 .name = "cs5535-smb",
@@ -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;
@@ -166,7 +166,7 @@ err_disable:
166 return err; 166 return err;
167} 167}
168 168
169static void __devexit cs5535_mfd_remove(struct pci_dev *pdev) 169static void cs5535_mfd_remove(struct pci_dev *pdev)
170{ 170{
171 mfd_remove_devices(&pdev->dev); 171 mfd_remove_devices(&pdev->dev);
172 pci_disable_device(pdev); 172 pci_disable_device(pdev);
@@ -183,7 +183,7 @@ static struct pci_driver cs5535_mfd_driver = {
183 .name = DRV_NAME, 183 .name = DRV_NAME,
184 .id_table = cs5535_mfd_pci_tbl, 184 .id_table = cs5535_mfd_pci_tbl,
185 .probe = cs5535_mfd_probe, 185 .probe = cs5535_mfd_probe,
186 .remove = __devexit_p(cs5535_mfd_remove), 186 .remove = cs5535_mfd_remove,
187}; 187};
188 188
189module_pci_driver(cs5535_mfd_driver); 189module_pci_driver(cs5535_mfd_driver);
diff --git a/drivers/mfd/da903x.c b/drivers/mfd/da903x.c
index 1924b857a0fb..05176cd2862b 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;
@@ -544,7 +544,7 @@ out_free_chip:
544 return ret; 544 return ret;
545} 545}
546 546
547static int __devexit da903x_remove(struct i2c_client *client) 547static int da903x_remove(struct i2c_client *client)
548{ 548{
549 struct da903x_chip *chip = i2c_get_clientdata(client); 549 struct da903x_chip *chip = i2c_get_clientdata(client);
550 550
@@ -560,7 +560,7 @@ static struct i2c_driver da903x_driver = {
560 .owner = THIS_MODULE, 560 .owner = THIS_MODULE,
561 }, 561 },
562 .probe = da903x_probe, 562 .probe = da903x_probe,
563 .remove = __devexit_p(da903x_remove), 563 .remove = da903x_remove,
564 .id_table = da903x_id_table, 564 .id_table = da903x_id_table,
565}; 565};
566 566
diff --git a/drivers/mfd/da9052-core.c b/drivers/mfd/da9052-core.c
index a0a62b24621b..689b747416af 100644
--- a/drivers/mfd/da9052-core.c
+++ b/drivers/mfd/da9052-core.c
@@ -515,7 +515,7 @@ static struct resource da9052_tsi_resources[] = {
515 }, 515 },
516}; 516};
517 517
518static struct mfd_cell __devinitdata da9052_subdev_info[] = { 518static struct mfd_cell da9052_subdev_info[] = {
519 { 519 {
520 .name = "da9052-regulator", 520 .name = "da9052-regulator",
521 .id = 1, 521 .id = 1,
@@ -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 352c58b5a90d..ac74a4d1daea 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;
@@ -121,7 +121,7 @@ static int __devinit da9052_i2c_probe(struct i2c_client *client,
121 return 0; 121 return 0;
122} 122}
123 123
124static int __devexit da9052_i2c_remove(struct i2c_client *client) 124static int da9052_i2c_remove(struct i2c_client *client)
125{ 125{
126 struct da9052 *da9052 = i2c_get_clientdata(client); 126 struct da9052 *da9052 = i2c_get_clientdata(client);
127 127
@@ -131,7 +131,7 @@ static int __devexit da9052_i2c_remove(struct i2c_client *client)
131 131
132static struct i2c_driver da9052_i2c_driver = { 132static struct i2c_driver da9052_i2c_driver = {
133 .probe = da9052_i2c_probe, 133 .probe = da9052_i2c_probe,
134 .remove = __devexit_p(da9052_i2c_remove), 134 .remove = da9052_i2c_remove,
135 .id_table = da9052_i2c_id, 135 .id_table = da9052_i2c_id,
136 .driver = { 136 .driver = {
137 .name = "da9052", 137 .name = "da9052",
diff --git a/drivers/mfd/da9052-spi.c b/drivers/mfd/da9052-spi.c
index dbeadc5a6436..61d63b93576c 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);
@@ -58,7 +58,7 @@ static int __devinit da9052_spi_probe(struct spi_device *spi)
58 return 0; 58 return 0;
59} 59}
60 60
61static int __devexit da9052_spi_remove(struct spi_device *spi) 61static int da9052_spi_remove(struct spi_device *spi)
62{ 62{
63 struct da9052 *da9052 = dev_get_drvdata(&spi->dev); 63 struct da9052 *da9052 = dev_get_drvdata(&spi->dev);
64 64
@@ -76,7 +76,7 @@ static struct spi_device_id da9052_spi_id[] = {
76 76
77static struct spi_driver da9052_spi_driver = { 77static struct spi_driver da9052_spi_driver = {
78 .probe = da9052_spi_probe, 78 .probe = da9052_spi_probe,
79 .remove = __devexit_p(da9052_spi_remove), 79 .remove = da9052_spi_remove,
80 .id_table = da9052_spi_id, 80 .id_table = da9052_spi_id,
81 .driver = { 81 .driver = {
82 .name = "da9052", 82 .name = "da9052",
diff --git a/drivers/mfd/da9055-core.c b/drivers/mfd/da9055-core.c
index ff6c77f392bd..f56a1a9f7777 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;
@@ -412,7 +412,7 @@ err:
412 return ret; 412 return ret;
413} 413}
414 414
415void __devexit da9055_device_exit(struct da9055 *da9055) 415void da9055_device_exit(struct da9055 *da9055)
416{ 416{
417 regmap_del_irq_chip(da9055->chip_irq, da9055->irq_data); 417 regmap_del_irq_chip(da9055->chip_irq, da9055->irq_data);
418 mfd_remove_devices(da9055->dev); 418 mfd_remove_devices(da9055->dev);
diff --git a/drivers/mfd/da9055-i2c.c b/drivers/mfd/da9055-i2c.c
index 88f6dca53bac..607387ffe8ca 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;
@@ -44,7 +44,7 @@ static int __devinit da9055_i2c_probe(struct i2c_client *i2c,
44 return da9055_device_init(da9055); 44 return da9055_device_init(da9055);
45} 45}
46 46
47static int __devexit da9055_i2c_remove(struct i2c_client *i2c) 47static int da9055_i2c_remove(struct i2c_client *i2c)
48{ 48{
49 struct da9055 *da9055 = i2c_get_clientdata(i2c); 49 struct da9055 *da9055 = i2c_get_clientdata(i2c);
50 50
@@ -60,7 +60,7 @@ static struct i2c_device_id da9055_i2c_id[] = {
60 60
61static struct i2c_driver da9055_i2c_driver = { 61static struct i2c_driver da9055_i2c_driver = {
62 .probe = da9055_i2c_probe, 62 .probe = da9055_i2c_probe,
63 .remove = __devexit_p(da9055_i2c_remove), 63 .remove = da9055_i2c_remove,
64 .id_table = da9055_i2c_id, 64 .id_table = da9055_i2c_id,
65 .driver = { 65 .driver = {
66 .name = "da9055", 66 .name = "da9055",
diff --git a/drivers/mfd/davinci_voicecodec.c b/drivers/mfd/davinci_voicecodec.c
index 45e83a68641b..c0bcc872af4e 100644
--- a/drivers/mfd/davinci_voicecodec.c
+++ b/drivers/mfd/davinci_voicecodec.c
@@ -151,7 +151,7 @@ fail1:
151 return ret; 151 return ret;
152} 152}
153 153
154static int __devexit davinci_vc_remove(struct platform_device *pdev) 154static int davinci_vc_remove(struct platform_device *pdev)
155{ 155{
156 struct davinci_vc *davinci_vc = platform_get_drvdata(pdev); 156 struct davinci_vc *davinci_vc = platform_get_drvdata(pdev);
157 157
@@ -174,7 +174,7 @@ static struct platform_driver davinci_vc_driver = {
174 .name = "davinci_voicecodec", 174 .name = "davinci_voicecodec",
175 .owner = THIS_MODULE, 175 .owner = THIS_MODULE,
176 }, 176 },
177 .remove = __devexit_p(davinci_vc_remove), 177 .remove = davinci_vc_remove,
178}; 178};
179 179
180static int __init davinci_vc_init(void) 180static int __init davinci_vc_init(void)
diff --git a/drivers/mfd/db8500-prcmu.c b/drivers/mfd/db8500-prcmu.c
index b96661d453aa..dc5691569370 100644
--- a/drivers/mfd/db8500-prcmu.c
+++ b/drivers/mfd/db8500-prcmu.c
@@ -3088,7 +3088,7 @@ static void db8500_prcmu_update_cpufreq(void)
3088 * prcmu_fw_init - arch init call for the Linux PRCMU fw init logic 3088 * prcmu_fw_init - arch init call for the Linux PRCMU fw init logic
3089 * 3089 *
3090 */ 3090 */
3091static int __devinit db8500_prcmu_probe(struct platform_device *pdev) 3091static int db8500_prcmu_probe(struct platform_device *pdev)
3092{ 3092{
3093 struct ab8500_platform_data *ab8500_platdata = pdev->dev.platform_data; 3093 struct ab8500_platform_data *ab8500_platdata = pdev->dev.platform_data;
3094 struct device_node *np = pdev->dev.of_node; 3094 struct device_node *np = pdev->dev.of_node;
diff --git a/drivers/mfd/ezx-pcap.c b/drivers/mfd/ezx-pcap.c
index db662e2dcfa5..b7a61f0f27a4 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;
@@ -391,7 +391,7 @@ static int __devinit pcap_add_subdev(struct pcap_chip *pcap,
391 return ret; 391 return ret;
392} 392}
393 393
394static int __devexit ezx_pcap_remove(struct spi_device *spi) 394static int ezx_pcap_remove(struct spi_device *spi)
395{ 395{
396 struct pcap_chip *pcap = dev_get_drvdata(&spi->dev); 396 struct pcap_chip *pcap = dev_get_drvdata(&spi->dev);
397 struct pcap_platform_data *pdata = spi->dev.platform_data; 397 struct pcap_platform_data *pdata = spi->dev.platform_data;
@@ -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;
@@ -525,7 +525,7 @@ ret:
525 525
526static struct spi_driver ezxpcap_driver = { 526static struct spi_driver ezxpcap_driver = {
527 .probe = ezx_pcap_probe, 527 .probe = ezx_pcap_probe,
528 .remove = __devexit_p(ezx_pcap_remove), 528 .remove = ezx_pcap_remove,
529 .driver = { 529 .driver = {
530 .name = "ezx-pcap", 530 .name = "ezx-pcap",
531 .owner = THIS_MODULE, 531 .owner = THIS_MODULE,
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 266bdc5bd96d..ab8d0b2739b2 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;
@@ -364,7 +364,7 @@ fail:
364 return ret; 364 return ret;
365} 365}
366 366
367static void __devexit intel_msic_remove_devices(struct intel_msic *msic) 367static void intel_msic_remove_devices(struct intel_msic *msic)
368{ 368{
369 struct platform_device *pdev = msic->pdev; 369 struct platform_device *pdev = msic->pdev;
370 struct intel_msic_platform_data *pdata = pdev->dev.platform_data; 370 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;
@@ -445,7 +445,7 @@ static int __devinit intel_msic_probe(struct platform_device *pdev)
445 return 0; 445 return 0;
446} 446}
447 447
448static int __devexit intel_msic_remove(struct platform_device *pdev) 448static int intel_msic_remove(struct platform_device *pdev)
449{ 449{
450 struct intel_msic *msic = platform_get_drvdata(pdev); 450 struct intel_msic *msic = platform_get_drvdata(pdev);
451 451
@@ -457,7 +457,7 @@ static int __devexit intel_msic_remove(struct platform_device *pdev)
457 457
458static struct platform_driver intel_msic_driver = { 458static struct platform_driver intel_msic_driver = {
459 .probe = intel_msic_probe, 459 .probe = intel_msic_probe,
460 .remove = __devexit_p(intel_msic_remove), 460 .remove = intel_msic_remove,
461 .driver = { 461 .driver = {
462 .name = "intel_msic", 462 .name = "intel_msic",
463 .owner = THIS_MODULE, 463 .owner = THIS_MODULE,
diff --git a/drivers/mfd/janz-cmodio.c b/drivers/mfd/janz-cmodio.c
index 965c4801df8a..45ece11cc27c 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;
@@ -254,7 +254,7 @@ out_return:
254 return ret; 254 return ret;
255} 255}
256 256
257static void __devexit cmodio_pci_remove(struct pci_dev *dev) 257static void cmodio_pci_remove(struct pci_dev *dev)
258{ 258{
259 struct cmodio_device *priv = pci_get_drvdata(dev); 259 struct cmodio_device *priv = pci_get_drvdata(dev);
260 260
@@ -280,7 +280,7 @@ static struct pci_driver cmodio_pci_driver = {
280 .name = DRV_NAME, 280 .name = DRV_NAME,
281 .id_table = cmodio_pci_ids, 281 .id_table = cmodio_pci_ids,
282 .probe = cmodio_pci_probe, 282 .probe = cmodio_pci_probe,
283 .remove = __devexit_p(cmodio_pci_remove), 283 .remove = cmodio_pci_remove,
284}; 284};
285 285
286module_pci_driver(cmodio_pci_driver); 286module_pci_driver(cmodio_pci_driver);
diff --git a/drivers/mfd/jz4740-adc.c b/drivers/mfd/jz4740-adc.c
index c6b6d7dda517..0b8b55bb9b11 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;
@@ -307,7 +307,7 @@ err_free:
307 return ret; 307 return ret;
308} 308}
309 309
310static int __devexit jz4740_adc_remove(struct platform_device *pdev) 310static int jz4740_adc_remove(struct platform_device *pdev)
311{ 311{
312 struct jz4740_adc *adc = platform_get_drvdata(pdev); 312 struct jz4740_adc *adc = platform_get_drvdata(pdev);
313 313
@@ -332,7 +332,7 @@ static int __devexit jz4740_adc_remove(struct platform_device *pdev)
332 332
333static struct platform_driver jz4740_adc_driver = { 333static struct platform_driver jz4740_adc_driver = {
334 .probe = jz4740_adc_probe, 334 .probe = jz4740_adc_probe,
335 .remove = __devexit_p(jz4740_adc_remove), 335 .remove = jz4740_adc_remove,
336 .driver = { 336 .driver = {
337 .name = "jz4740-adc", 337 .name = "jz4740-adc",
338 .owner = THIS_MODULE, 338 .owner = THIS_MODULE,
diff --git a/drivers/mfd/lm3533-core.c b/drivers/mfd/lm3533-core.c
index 24212f45b201..ceebf2c1ea97 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;
@@ -534,7 +534,7 @@ err_disable:
534 return ret; 534 return ret;
535} 535}
536 536
537static void __devexit lm3533_device_exit(struct lm3533 *lm3533) 537static void lm3533_device_exit(struct lm3533 *lm3533)
538{ 538{
539 dev_dbg(lm3533->dev, "%s\n", __func__); 539 dev_dbg(lm3533->dev, "%s\n", __func__);
540 540
@@ -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;
@@ -624,7 +624,7 @@ static int __devinit lm3533_i2c_probe(struct i2c_client *i2c,
624 return 0; 624 return 0;
625} 625}
626 626
627static int __devexit lm3533_i2c_remove(struct i2c_client *i2c) 627static int lm3533_i2c_remove(struct i2c_client *i2c)
628{ 628{
629 struct lm3533 *lm3533 = i2c_get_clientdata(i2c); 629 struct lm3533 *lm3533 = i2c_get_clientdata(i2c);
630 630
@@ -648,7 +648,7 @@ static struct i2c_driver lm3533_i2c_driver = {
648 }, 648 },
649 .id_table = lm3533_i2c_ids, 649 .id_table = lm3533_i2c_ids,
650 .probe = lm3533_i2c_probe, 650 .probe = lm3533_i2c_probe,
651 .remove = __devexit_p(lm3533_i2c_remove), 651 .remove = lm3533_i2c_remove,
652}; 652};
653 653
654static int __init lm3533_i2c_init(void) 654static int __init lm3533_i2c_init(void)
diff --git a/drivers/mfd/lp8788.c b/drivers/mfd/lp8788.c
index 3e94a699833c..c3d3c9b4d3ad 100644
--- a/drivers/mfd/lp8788.c
+++ b/drivers/mfd/lp8788.c
@@ -203,7 +203,7 @@ static int lp8788_probe(struct i2c_client *cl, const struct i2c_device_id *id)
203 ARRAY_SIZE(lp8788_devs), NULL, 0, NULL); 203 ARRAY_SIZE(lp8788_devs), NULL, 0, NULL);
204} 204}
205 205
206static int __devexit lp8788_remove(struct i2c_client *cl) 206static int lp8788_remove(struct i2c_client *cl)
207{ 207{
208 struct lp8788 *lp = i2c_get_clientdata(cl); 208 struct lp8788 *lp = i2c_get_clientdata(cl);
209 209
@@ -224,7 +224,7 @@ static struct i2c_driver lp8788_driver = {
224 .owner = THIS_MODULE, 224 .owner = THIS_MODULE,
225 }, 225 },
226 .probe = lp8788_probe, 226 .probe = lp8788_probe,
227 .remove = __devexit_p(lp8788_remove), 227 .remove = lp8788_remove,
228 .id_table = lp8788_ids, 228 .id_table = lp8788_ids,
229}; 229};
230 230
diff --git a/drivers/mfd/lpc_ich.c b/drivers/mfd/lpc_ich.c
index a22544fe5319..2ad24caa07db 100644
--- a/drivers/mfd/lpc_ich.c
+++ b/drivers/mfd/lpc_ich.c
@@ -196,7 +196,7 @@ enum lpc_chipsets {
196 LPC_LPT_LP, /* Lynx Point-LP */ 196 LPC_LPT_LP, /* Lynx Point-LP */
197}; 197};
198 198
199struct lpc_ich_info lpc_chipset_info[] __devinitdata = { 199struct lpc_ich_info lpc_chipset_info[] = {
200 [LPC_ICH] = { 200 [LPC_ICH] = {
201 .name = "ICH", 201 .name = "ICH",
202 .iTCO_version = 1, 202 .iTCO_version = 1,
@@ -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;
@@ -878,7 +878,7 @@ static int __devinit lpc_ich_probe(struct pci_dev *dev,
878 return 0; 878 return 0;
879} 879}
880 880
881static void __devexit lpc_ich_remove(struct pci_dev *dev) 881static void lpc_ich_remove(struct pci_dev *dev)
882{ 882{
883 mfd_remove_devices(&dev->dev); 883 mfd_remove_devices(&dev->dev);
884 lpc_ich_restore_config_space(dev); 884 lpc_ich_restore_config_space(dev);
@@ -888,7 +888,7 @@ static struct pci_driver lpc_ich_driver = {
888 .name = "lpc_ich", 888 .name = "lpc_ich",
889 .id_table = lpc_ich_ids, 889 .id_table = lpc_ich_ids,
890 .probe = lpc_ich_probe, 890 .probe = lpc_ich_probe,
891 .remove = __devexit_p(lpc_ich_remove), 891 .remove = lpc_ich_remove,
892}; 892};
893 893
894static int __init lpc_ich_init(void) 894static int __init lpc_ich_init(void)
diff --git a/drivers/mfd/lpc_sch.c b/drivers/mfd/lpc_sch.c
index f6b9c5c96b24..5624fcbba69b 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;
@@ -164,7 +164,7 @@ out_dev:
164 return ret; 164 return ret;
165} 165}
166 166
167static void __devexit lpc_sch_remove(struct pci_dev *dev) 167static void lpc_sch_remove(struct pci_dev *dev)
168{ 168{
169 mfd_remove_devices(&dev->dev); 169 mfd_remove_devices(&dev->dev);
170} 170}
@@ -173,7 +173,7 @@ static struct pci_driver lpc_sch_driver = {
173 .name = "lpc_sch", 173 .name = "lpc_sch",
174 .id_table = lpc_sch_ids, 174 .id_table = lpc_sch_ids,
175 .probe = lpc_sch_probe, 175 .probe = lpc_sch_probe,
176 .remove = __devexit_p(lpc_sch_remove), 176 .remove = lpc_sch_remove,
177}; 177};
178 178
179module_pci_driver(lpc_sch_driver); 179module_pci_driver(lpc_sch_driver);
diff --git a/drivers/mfd/max77686.c b/drivers/mfd/max77686.c
index d9e24c849a00..f6878f8db57d 100644
--- a/drivers/mfd/max77686.c
+++ b/drivers/mfd/max77686.c
@@ -45,7 +45,7 @@ static struct regmap_config max77686_regmap_config = {
45}; 45};
46 46
47#ifdef CONFIG_OF 47#ifdef CONFIG_OF
48static struct of_device_id __devinitdata max77686_pmic_dt_match[] = { 48static struct of_device_id max77686_pmic_dt_match[] = {
49 {.compatible = "maxim,max77686", .data = 0}, 49 {.compatible = "maxim,max77686", .data = 0},
50 {}, 50 {},
51}; 51};
diff --git a/drivers/mfd/max8907.c b/drivers/mfd/max8907.c
index 17f2593d82b8..e9b1c93a3ade 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;
@@ -288,7 +288,7 @@ err_alloc_drvdata:
288 return ret; 288 return ret;
289} 289}
290 290
291static __devexit int max8907_i2c_remove(struct i2c_client *i2c) 291static int max8907_i2c_remove(struct i2c_client *i2c)
292{ 292{
293 struct max8907 *max8907 = i2c_get_clientdata(i2c); 293 struct max8907 *max8907 = i2c_get_clientdata(i2c);
294 294
diff --git a/drivers/mfd/max8925-core.c b/drivers/mfd/max8925-core.c
index 9f54c04912f2..e32466e865b9 100644
--- a/drivers/mfd/max8925-core.c
+++ b/drivers/mfd/max8925-core.c
@@ -19,12 +19,12 @@
19#include <linux/mfd/core.h> 19#include <linux/mfd/core.h>
20#include <linux/mfd/max8925.h> 20#include <linux/mfd/max8925.h>
21 21
22static struct resource bk_resources[] __devinitdata = { 22static struct resource bk_resources[] = {
23 { 0x84, 0x84, "mode control", IORESOURCE_REG, }, 23 { 0x84, 0x84, "mode control", IORESOURCE_REG, },
24 { 0x85, 0x85, "control", IORESOURCE_REG, }, 24 { 0x85, 0x85, "control", IORESOURCE_REG, },
25}; 25};
26 26
27static struct mfd_cell bk_devs[] __devinitdata = { 27static struct mfd_cell bk_devs[] = {
28 { 28 {
29 .name = "max8925-backlight", 29 .name = "max8925-backlight",
30 .num_resources = ARRAY_SIZE(bk_resources), 30 .num_resources = ARRAY_SIZE(bk_resources),
@@ -110,99 +110,99 @@ static struct mfd_cell onkey_devs[] = {
110 }, 110 },
111}; 111};
112 112
113static struct resource sd1_resources[] __devinitdata = { 113static struct resource sd1_resources[] = {
114 {0x06, 0x06, "sdv", IORESOURCE_REG, }, 114 {0x06, 0x06, "sdv", IORESOURCE_REG, },
115}; 115};
116 116
117static struct resource sd2_resources[] __devinitdata = { 117static struct resource sd2_resources[] = {
118 {0x09, 0x09, "sdv", IORESOURCE_REG, }, 118 {0x09, 0x09, "sdv", IORESOURCE_REG, },
119}; 119};
120 120
121static struct resource sd3_resources[] __devinitdata = { 121static struct resource sd3_resources[] = {
122 {0x0c, 0x0c, "sdv", IORESOURCE_REG, }, 122 {0x0c, 0x0c, "sdv", IORESOURCE_REG, },
123}; 123};
124 124
125static struct resource ldo1_resources[] __devinitdata = { 125static struct resource ldo1_resources[] = {
126 {0x1a, 0x1a, "ldov", IORESOURCE_REG, }, 126 {0x1a, 0x1a, "ldov", IORESOURCE_REG, },
127}; 127};
128 128
129static struct resource ldo2_resources[] __devinitdata = { 129static struct resource ldo2_resources[] = {
130 {0x1e, 0x1e, "ldov", IORESOURCE_REG, }, 130 {0x1e, 0x1e, "ldov", IORESOURCE_REG, },
131}; 131};
132 132
133static struct resource ldo3_resources[] __devinitdata = { 133static struct resource ldo3_resources[] = {
134 {0x22, 0x22, "ldov", IORESOURCE_REG, }, 134 {0x22, 0x22, "ldov", IORESOURCE_REG, },
135}; 135};
136 136
137static struct resource ldo4_resources[] __devinitdata = { 137static struct resource ldo4_resources[] = {
138 {0x26, 0x26, "ldov", IORESOURCE_REG, }, 138 {0x26, 0x26, "ldov", IORESOURCE_REG, },
139}; 139};
140 140
141static struct resource ldo5_resources[] __devinitdata = { 141static struct resource ldo5_resources[] = {
142 {0x2a, 0x2a, "ldov", IORESOURCE_REG, }, 142 {0x2a, 0x2a, "ldov", IORESOURCE_REG, },
143}; 143};
144 144
145static struct resource ldo6_resources[] __devinitdata = { 145static struct resource ldo6_resources[] = {
146 {0x2e, 0x2e, "ldov", IORESOURCE_REG, }, 146 {0x2e, 0x2e, "ldov", IORESOURCE_REG, },
147}; 147};
148 148
149static struct resource ldo7_resources[] __devinitdata = { 149static struct resource ldo7_resources[] = {
150 {0x32, 0x32, "ldov", IORESOURCE_REG, }, 150 {0x32, 0x32, "ldov", IORESOURCE_REG, },
151}; 151};
152 152
153static struct resource ldo8_resources[] __devinitdata = { 153static struct resource ldo8_resources[] = {
154 {0x36, 0x36, "ldov", IORESOURCE_REG, }, 154 {0x36, 0x36, "ldov", IORESOURCE_REG, },
155}; 155};
156 156
157static struct resource ldo9_resources[] __devinitdata = { 157static struct resource ldo9_resources[] = {
158 {0x3a, 0x3a, "ldov", IORESOURCE_REG, }, 158 {0x3a, 0x3a, "ldov", IORESOURCE_REG, },
159}; 159};
160 160
161static struct resource ldo10_resources[] __devinitdata = { 161static struct resource ldo10_resources[] = {
162 {0x3e, 0x3e, "ldov", IORESOURCE_REG, }, 162 {0x3e, 0x3e, "ldov", IORESOURCE_REG, },
163}; 163};
164 164
165static struct resource ldo11_resources[] __devinitdata = { 165static struct resource ldo11_resources[] = {
166 {0x42, 0x42, "ldov", IORESOURCE_REG, }, 166 {0x42, 0x42, "ldov", IORESOURCE_REG, },
167}; 167};
168 168
169static struct resource ldo12_resources[] __devinitdata = { 169static struct resource ldo12_resources[] = {
170 {0x46, 0x46, "ldov", IORESOURCE_REG, }, 170 {0x46, 0x46, "ldov", IORESOURCE_REG, },
171}; 171};
172 172
173static struct resource ldo13_resources[] __devinitdata = { 173static struct resource ldo13_resources[] = {
174 {0x4a, 0x4a, "ldov", IORESOURCE_REG, }, 174 {0x4a, 0x4a, "ldov", IORESOURCE_REG, },
175}; 175};
176 176
177static struct resource ldo14_resources[] __devinitdata = { 177static struct resource ldo14_resources[] = {
178 {0x4e, 0x4e, "ldov", IORESOURCE_REG, }, 178 {0x4e, 0x4e, "ldov", IORESOURCE_REG, },
179}; 179};
180 180
181static struct resource ldo15_resources[] __devinitdata = { 181static struct resource ldo15_resources[] = {
182 {0x52, 0x52, "ldov", IORESOURCE_REG, }, 182 {0x52, 0x52, "ldov", IORESOURCE_REG, },
183}; 183};
184 184
185static struct resource ldo16_resources[] __devinitdata = { 185static struct resource ldo16_resources[] = {
186 {0x12, 0x12, "ldov", IORESOURCE_REG, }, 186 {0x12, 0x12, "ldov", IORESOURCE_REG, },
187}; 187};
188 188
189static struct resource ldo17_resources[] __devinitdata = { 189static struct resource ldo17_resources[] = {
190 {0x16, 0x16, "ldov", IORESOURCE_REG, }, 190 {0x16, 0x16, "ldov", IORESOURCE_REG, },
191}; 191};
192 192
193static struct resource ldo18_resources[] __devinitdata = { 193static struct resource ldo18_resources[] = {
194 {0x74, 0x74, "ldov", IORESOURCE_REG, }, 194 {0x74, 0x74, "ldov", IORESOURCE_REG, },
195}; 195};
196 196
197static struct resource ldo19_resources[] __devinitdata = { 197static struct resource ldo19_resources[] = {
198 {0x5e, 0x5e, "ldov", IORESOURCE_REG, }, 198 {0x5e, 0x5e, "ldov", IORESOURCE_REG, },
199}; 199};
200 200
201static struct resource ldo20_resources[] __devinitdata = { 201static struct resource ldo20_resources[] = {
202 {0x9e, 0x9e, "ldov", IORESOURCE_REG, }, 202 {0x9e, 0x9e, "ldov", IORESOURCE_REG, },
203}; 203};
204 204
205static struct mfd_cell reg_devs[] __devinitdata = { 205static struct mfd_cell reg_devs[] = {
206 { 206 {
207 .name = "max8925-regulator", 207 .name = "max8925-regulator",
208 .id = 0, 208 .id = 0,
@@ -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;
@@ -901,7 +901,7 @@ out:
901 return ret; 901 return ret;
902} 902}
903 903
904void __devexit max8925_device_exit(struct max8925_chip *chip) 904void max8925_device_exit(struct max8925_chip *chip)
905{ 905{
906 if (chip->core_irq) 906 if (chip->core_irq)
907 free_irq(chip->core_irq, chip); 907 free_irq(chip->core_irq, chip);
diff --git a/drivers/mfd/max8925-i2c.c b/drivers/mfd/max8925-i2c.c
index d9e4b36edee9..00b5b456063d 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;
@@ -168,7 +168,7 @@ static int __devinit max8925_probe(struct i2c_client *client,
168 return 0; 168 return 0;
169} 169}
170 170
171static int __devexit max8925_remove(struct i2c_client *client) 171static int max8925_remove(struct i2c_client *client)
172{ 172{
173 struct max8925_chip *chip = i2c_get_clientdata(client); 173 struct max8925_chip *chip = i2c_get_clientdata(client);
174 174
@@ -210,7 +210,7 @@ static struct i2c_driver max8925_driver = {
210 .pm = &max8925_pm_ops, 210 .pm = &max8925_pm_ops,
211 }, 211 },
212 .probe = max8925_probe, 212 .probe = max8925_probe,
213 .remove = __devexit_p(max8925_remove), 213 .remove = max8925_remove,
214 .id_table = max8925_id_table, 214 .id_table = max8925_id_table,
215}; 215};
216 216
diff --git a/drivers/mfd/mc13xxx-i2c.c b/drivers/mfd/mc13xxx-i2c.c
index 9d18dde3cd2a..7957999f30bb 100644
--- a/drivers/mfd/mc13xxx-i2c.c
+++ b/drivers/mfd/mc13xxx-i2c.c
@@ -85,7 +85,7 @@ static int mc13xxx_i2c_probe(struct i2c_client *client,
85 return ret; 85 return ret;
86} 86}
87 87
88static int __devexit mc13xxx_i2c_remove(struct i2c_client *client) 88static int mc13xxx_i2c_remove(struct i2c_client *client)
89{ 89{
90 struct mc13xxx *mc13xxx = dev_get_drvdata(&client->dev); 90 struct mc13xxx *mc13xxx = dev_get_drvdata(&client->dev);
91 91
@@ -102,7 +102,7 @@ static struct i2c_driver mc13xxx_i2c_driver = {
102 .of_match_table = mc13xxx_dt_ids, 102 .of_match_table = mc13xxx_dt_ids,
103 }, 103 },
104 .probe = mc13xxx_i2c_probe, 104 .probe = mc13xxx_i2c_probe,
105 .remove = __devexit_p(mc13xxx_i2c_remove), 105 .remove = mc13xxx_i2c_remove,
106}; 106};
107 107
108static int __init mc13xxx_i2c_init(void) 108static int __init mc13xxx_i2c_init(void)
diff --git a/drivers/mfd/mc13xxx-spi.c b/drivers/mfd/mc13xxx-spi.c
index 0bdb43a0aff0..cb32f69d80ba 100644
--- a/drivers/mfd/mc13xxx-spi.c
+++ b/drivers/mfd/mc13xxx-spi.c
@@ -159,7 +159,7 @@ static int mc13xxx_spi_probe(struct spi_device *spi)
159 return ret; 159 return ret;
160} 160}
161 161
162static int __devexit mc13xxx_spi_remove(struct spi_device *spi) 162static int mc13xxx_spi_remove(struct spi_device *spi)
163{ 163{
164 struct mc13xxx *mc13xxx = dev_get_drvdata(&spi->dev); 164 struct mc13xxx *mc13xxx = dev_get_drvdata(&spi->dev);
165 165
@@ -176,7 +176,7 @@ static struct spi_driver mc13xxx_spi_driver = {
176 .of_match_table = mc13xxx_dt_ids, 176 .of_match_table = mc13xxx_dt_ids,
177 }, 177 },
178 .probe = mc13xxx_spi_probe, 178 .probe = mc13xxx_spi_probe,
179 .remove = __devexit_p(mc13xxx_spi_remove), 179 .remove = mc13xxx_spi_remove,
180}; 180};
181 181
182static int __init mc13xxx_init(void) 182static int __init mc13xxx_init(void)
diff --git a/drivers/mfd/omap-usb-host.c b/drivers/mfd/omap-usb-host.c
index 23cec57c02ba..29b8ed21213e 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;
@@ -652,7 +652,7 @@ end_probe:
652 * 652 *
653 * Reverses the effect of usbhs_omap_probe(). 653 * Reverses the effect of usbhs_omap_probe().
654 */ 654 */
655static int __devexit usbhs_omap_remove(struct platform_device *pdev) 655static int usbhs_omap_remove(struct platform_device *pdev)
656{ 656{
657 struct usbhs_hcd_omap *omap = platform_get_drvdata(pdev); 657 struct usbhs_hcd_omap *omap = platform_get_drvdata(pdev);
658 658
diff --git a/drivers/mfd/omap-usb-tll.c b/drivers/mfd/omap-usb-tll.c
index 4b7757b84301..401b976e3aff 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;
@@ -348,7 +348,7 @@ end:
348 * 348 *
349 * Reverses the effect of usbtll_omap_probe(). 349 * Reverses the effect of usbtll_omap_probe().
350 */ 350 */
351static int __devexit usbtll_omap_remove(struct platform_device *pdev) 351static int usbtll_omap_remove(struct platform_device *pdev)
352{ 352{
353 struct usbtll_omap *tll = platform_get_drvdata(pdev); 353 struct usbtll_omap *tll = platform_get_drvdata(pdev);
354 354
@@ -424,7 +424,7 @@ static struct platform_driver usbtll_omap_driver = {
424 .pm = &usbtllomap_dev_pm_ops, 424 .pm = &usbtllomap_dev_pm_ops,
425 }, 425 },
426 .probe = usbtll_omap_probe, 426 .probe = usbtll_omap_probe,
427 .remove = __devexit_p(usbtll_omap_remove), 427 .remove = usbtll_omap_remove,
428}; 428};
429 429
430int omap_tll_enable(void) 430int omap_tll_enable(void)
diff --git a/drivers/mfd/palmas.c b/drivers/mfd/palmas.c
index 4f8d6e6b19aa..6ffd7a2affdc 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;
@@ -492,7 +492,7 @@ static const struct i2c_device_id palmas_i2c_id[] = {
492}; 492};
493MODULE_DEVICE_TABLE(i2c, palmas_i2c_id); 493MODULE_DEVICE_TABLE(i2c, palmas_i2c_id);
494 494
495static struct of_device_id __devinitdata of_palmas_match_tbl[] = { 495static struct of_device_id of_palmas_match_tbl[] = {
496 { .compatible = "ti,palmas", }, 496 { .compatible = "ti,palmas", },
497 { /* end */ } 497 { /* end */ }
498}; 498};
diff --git a/drivers/mfd/pcf50633-adc.c b/drivers/mfd/pcf50633-adc.c
index 3927c17e4175..18b53cb72fea 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
@@ -218,7 +218,7 @@ static int __devinit pcf50633_adc_probe(struct platform_device *pdev)
218 return 0; 218 return 0;
219} 219}
220 220
221static int __devexit pcf50633_adc_remove(struct platform_device *pdev) 221static int pcf50633_adc_remove(struct platform_device *pdev)
222{ 222{
223 struct pcf50633_adc *adc = platform_get_drvdata(pdev); 223 struct pcf50633_adc *adc = platform_get_drvdata(pdev);
224 int i, head; 224 int i, head;
@@ -246,7 +246,7 @@ static struct platform_driver pcf50633_adc_driver = {
246 .name = "pcf50633-adc", 246 .name = "pcf50633-adc",
247 }, 247 },
248 .probe = pcf50633_adc_probe, 248 .probe = pcf50633_adc_probe,
249 .remove = __devexit_p(pcf50633_adc_remove), 249 .remove = pcf50633_adc_remove,
250}; 250};
251 251
252module_platform_driver(pcf50633_adc_driver); 252module_platform_driver(pcf50633_adc_driver);
diff --git a/drivers/mfd/pcf50633-core.c b/drivers/mfd/pcf50633-core.c
index 45ce1fb5a549..64803f13bcec 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;
@@ -275,7 +275,7 @@ static int __devinit pcf50633_probe(struct i2c_client *client,
275 return 0; 275 return 0;
276} 276}
277 277
278static int __devexit pcf50633_remove(struct i2c_client *client) 278static int pcf50633_remove(struct i2c_client *client)
279{ 279{
280 struct pcf50633 *pcf = i2c_get_clientdata(client); 280 struct pcf50633 *pcf = i2c_get_clientdata(client);
281 int i; 281 int i;
@@ -308,7 +308,7 @@ static struct i2c_driver pcf50633_driver = {
308 }, 308 },
309 .id_table = pcf50633_id_table, 309 .id_table = pcf50633_id_table,
310 .probe = pcf50633_probe, 310 .probe = pcf50633_probe,
311 .remove = __devexit_p(pcf50633_remove), 311 .remove = pcf50633_remove,
312}; 312};
313 313
314static int __init pcf50633_init(void) 314static int __init pcf50633_init(void)
diff --git a/drivers/mfd/pm8921-core.c b/drivers/mfd/pm8921-core.c
index e873b15753d8..d4b297cbd801 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;
@@ -165,7 +165,7 @@ err_read_rev:
165 return rc; 165 return rc;
166} 166}
167 167
168static int __devexit pm8921_remove(struct platform_device *pdev) 168static int pm8921_remove(struct platform_device *pdev)
169{ 169{
170 struct pm8xxx_drvdata *drvdata; 170 struct pm8xxx_drvdata *drvdata;
171 struct pm8921 *pmic = NULL; 171 struct pm8921 *pmic = NULL;
@@ -187,7 +187,7 @@ static int __devexit pm8921_remove(struct platform_device *pdev)
187 187
188static struct platform_driver pm8921_driver = { 188static struct platform_driver pm8921_driver = {
189 .probe = pm8921_probe, 189 .probe = pm8921_probe,
190 .remove = __devexit_p(pm8921_remove), 190 .remove = pm8921_remove,
191 .driver = { 191 .driver = {
192 .name = "pm8921-core", 192 .name = "pm8921-core",
193 .owner = THIS_MODULE, 193 .owner = THIS_MODULE,
diff --git a/drivers/mfd/pm8xxx-irq.c b/drivers/mfd/pm8xxx-irq.c
index d452dd013081..1360e20adf11 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;
@@ -363,7 +363,7 @@ struct pm_irq_chip * __devinit pm8xxx_irq_init(struct device *dev,
363 return chip; 363 return chip;
364} 364}
365 365
366int __devexit pm8xxx_irq_exit(struct pm_irq_chip *chip) 366int pm8xxx_irq_exit(struct pm_irq_chip *chip)
367{ 367{
368 irq_set_chained_handler(chip->devirq, NULL); 368 irq_set_chained_handler(chip->devirq, NULL);
369 kfree(chip); 369 kfree(chip);
diff --git a/drivers/mfd/rc5t583.c b/drivers/mfd/rc5t583.c
index f1a024ecdb1e..14bdaccefbec 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;
@@ -303,7 +303,7 @@ err_add_devs:
303 return ret; 303 return ret;
304} 304}
305 305
306static int __devexit rc5t583_i2c_remove(struct i2c_client *i2c) 306static int rc5t583_i2c_remove(struct i2c_client *i2c)
307{ 307{
308 struct rc5t583 *rc5t583 = i2c_get_clientdata(i2c); 308 struct rc5t583 *rc5t583 = i2c_get_clientdata(i2c);
309 309
@@ -325,7 +325,7 @@ static struct i2c_driver rc5t583_i2c_driver = {
325 .owner = THIS_MODULE, 325 .owner = THIS_MODULE,
326 }, 326 },
327 .probe = rc5t583_i2c_probe, 327 .probe = rc5t583_i2c_probe,
328 .remove = __devexit_p(rc5t583_i2c_remove), 328 .remove = rc5t583_i2c_remove,
329 .id_table = rc5t583_i2c_id, 329 .id_table = rc5t583_i2c_id,
330}; 330};
331 331
diff --git a/drivers/mfd/rdc321x-southbridge.c b/drivers/mfd/rdc321x-southbridge.c
index fbabc3cbe350..21b7bef73507 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;
@@ -91,7 +91,7 @@ static int __devinit rdc321x_sb_probe(struct pci_dev *pdev,
91 NULL, 0, NULL); 91 NULL, 0, NULL);
92} 92}
93 93
94static void __devexit rdc321x_sb_remove(struct pci_dev *pdev) 94static void rdc321x_sb_remove(struct pci_dev *pdev)
95{ 95{
96 mfd_remove_devices(&pdev->dev); 96 mfd_remove_devices(&pdev->dev);
97} 97}
@@ -106,7 +106,7 @@ static struct pci_driver rdc321x_sb_driver = {
106 .name = "RDC321x Southbridge", 106 .name = "RDC321x Southbridge",
107 .id_table = rdc321x_sb_table, 107 .id_table = rdc321x_sb_table,
108 .probe = rdc321x_sb_probe, 108 .probe = rdc321x_sb_probe,
109 .remove = __devexit_p(rdc321x_sb_remove), 109 .remove = rdc321x_sb_remove,
110}; 110};
111 111
112module_pci_driver(rdc321x_sb_driver); 112module_pci_driver(rdc321x_sb_driver);
diff --git a/drivers/mfd/sm501.c b/drivers/mfd/sm501.c
index d927dd49acb3..9816c232e583 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;
@@ -1685,7 +1685,7 @@ static void sm501_dev_remove(struct sm501_devdata *sm)
1685 sm501_gpio_remove(sm); 1685 sm501_gpio_remove(sm);
1686} 1686}
1687 1687
1688static void __devexit sm501_pci_remove(struct pci_dev *dev) 1688static void sm501_pci_remove(struct pci_dev *dev)
1689{ 1689{
1690 struct sm501_devdata *sm = pci_get_drvdata(dev); 1690 struct sm501_devdata *sm = pci_get_drvdata(dev);
1691 1691
@@ -1723,12 +1723,12 @@ static struct pci_driver sm501_pci_driver = {
1723 .name = "sm501", 1723 .name = "sm501",
1724 .id_table = sm501_pci_tbl, 1724 .id_table = sm501_pci_tbl,
1725 .probe = sm501_pci_probe, 1725 .probe = sm501_pci_probe,
1726 .remove = __devexit_p(sm501_pci_remove), 1726 .remove = sm501_pci_remove,
1727}; 1727};
1728 1728
1729MODULE_ALIAS("platform:sm501"); 1729MODULE_ALIAS("platform:sm501");
1730 1730
1731static struct of_device_id __devinitdata of_sm501_match_tbl[] = { 1731static struct of_device_id of_sm501_match_tbl[] = {
1732 { .compatible = "smi,sm501", }, 1732 { .compatible = "smi,sm501", },
1733 { /* end */ } 1733 { /* end */ }
1734}; 1734};
diff --git a/drivers/mfd/sta2x11-mfd.c b/drivers/mfd/sta2x11-mfd.c
index d35da6820bea..d6284cacd27a 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;
@@ -89,7 +89,7 @@ static int __devinit sta2x11_mfd_add(struct pci_dev *pdev, gfp_t flags)
89 return 0; 89 return 0;
90} 90}
91 91
92static int __devexit mfd_remove(struct pci_dev *pdev) 92static int mfd_remove(struct pci_dev *pdev)
93{ 93{
94 struct sta2x11_mfd *mfd = sta2x11_mfd_find(pdev); 94 struct sta2x11_mfd *mfd = sta2x11_mfd_find(pdev);
95 95
@@ -305,7 +305,7 @@ enum bar1_cells {
305 .flags = IORESOURCE_MEM, \ 305 .flags = IORESOURCE_MEM, \
306 } 306 }
307 307
308static const __devinitconst struct resource gpio_resources[] = { 308static const struct resource gpio_resources[] = {
309 { 309 {
310 .name = "sta2x11_gpio", /* 4 consecutive cells, 1 driver */ 310 .name = "sta2x11_gpio", /* 4 consecutive cells, 1 driver */
311 .start = 0, 311 .start = 0,
@@ -313,31 +313,31 @@ static const __devinitconst struct resource gpio_resources[] = {
313 .flags = IORESOURCE_MEM, 313 .flags = IORESOURCE_MEM,
314 } 314 }
315}; 315};
316static const __devinitconst struct resource sctl_resources[] = { 316static const struct resource sctl_resources[] = {
317 CELL_4K("sta2x11-sctl", STA2X11_SCTL), 317 CELL_4K("sta2x11-sctl", STA2X11_SCTL),
318}; 318};
319static const __devinitconst struct resource scr_resources[] = { 319static const struct resource scr_resources[] = {
320 CELL_4K("sta2x11-scr", STA2X11_SCR), 320 CELL_4K("sta2x11-scr", STA2X11_SCR),
321}; 321};
322static const __devinitconst struct resource time_resources[] = { 322static const struct resource time_resources[] = {
323 CELL_4K("sta2x11-time", STA2X11_TIME), 323 CELL_4K("sta2x11-time", STA2X11_TIME),
324}; 324};
325 325
326static const __devinitconst struct resource apbreg_resources[] = { 326static const struct resource apbreg_resources[] = {
327 CELL_4K("sta2x11-apbreg", STA2X11_APBREG), 327 CELL_4K("sta2x11-apbreg", STA2X11_APBREG),
328}; 328};
329 329
330#define DEV(_name, _r) \ 330#define DEV(_name, _r) \
331 { .name = _name, .num_resources = ARRAY_SIZE(_r), .resources = _r, } 331 { .name = _name, .num_resources = ARRAY_SIZE(_r), .resources = _r, }
332 332
333static __devinitdata struct mfd_cell sta2x11_mfd_bar0[] = { 333static struct mfd_cell sta2x11_mfd_bar0[] = {
334 DEV("sta2x11-gpio", gpio_resources), /* offset 0: we add pdata later */ 334 DEV("sta2x11-gpio", gpio_resources), /* offset 0: we add pdata later */
335 DEV("sta2x11-sctl", sctl_resources), 335 DEV("sta2x11-sctl", sctl_resources),
336 DEV("sta2x11-scr", scr_resources), 336 DEV("sta2x11-scr", scr_resources),
337 DEV("sta2x11-time", time_resources), 337 DEV("sta2x11-time", time_resources),
338}; 338};
339 339
340static __devinitdata struct mfd_cell sta2x11_mfd_bar1[] = { 340static struct mfd_cell sta2x11_mfd_bar1[] = {
341 DEV("sta2x11-apbreg", apbreg_resources), 341 DEV("sta2x11-apbreg", apbreg_resources),
342}; 342};
343 343
@@ -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 947a06a1845f..36df18778029 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;
@@ -63,7 +63,7 @@ stmpe_i2c_probe(struct i2c_client *i2c, const struct i2c_device_id *id)
63 return stmpe_probe(&i2c_ci, id->driver_data); 63 return stmpe_probe(&i2c_ci, id->driver_data);
64} 64}
65 65
66static int __devexit stmpe_i2c_remove(struct i2c_client *i2c) 66static int stmpe_i2c_remove(struct i2c_client *i2c)
67{ 67{
68 struct stmpe *stmpe = dev_get_drvdata(&i2c->dev); 68 struct stmpe *stmpe = dev_get_drvdata(&i2c->dev);
69 69
@@ -88,7 +88,7 @@ static struct i2c_driver stmpe_i2c_driver = {
88 .driver.pm = &stmpe_dev_pm_ops, 88 .driver.pm = &stmpe_dev_pm_ops,
89#endif 89#endif
90 .probe = stmpe_i2c_probe, 90 .probe = stmpe_i2c_probe,
91 .remove = __devexit_p(stmpe_i2c_remove), 91 .remove = stmpe_i2c_remove,
92 .id_table = stmpe_i2c_id, 92 .id_table = stmpe_i2c_id,
93}; 93};
94 94
diff --git a/drivers/mfd/stmpe-spi.c b/drivers/mfd/stmpe-spi.c
index 9edfe864cc05..973659f8abd9 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);
@@ -101,7 +101,7 @@ stmpe_spi_probe(struct spi_device *spi)
101 return stmpe_probe(&spi_ci, id->driver_data); 101 return stmpe_probe(&spi_ci, id->driver_data);
102} 102}
103 103
104static int __devexit stmpe_spi_remove(struct spi_device *spi) 104static int stmpe_spi_remove(struct spi_device *spi)
105{ 105{
106 struct stmpe *stmpe = dev_get_drvdata(&spi->dev); 106 struct stmpe *stmpe = dev_get_drvdata(&spi->dev);
107 107
@@ -128,7 +128,7 @@ static struct spi_driver stmpe_spi_driver = {
128#endif 128#endif
129 }, 129 },
130 .probe = stmpe_spi_probe, 130 .probe = stmpe_spi_probe,
131 .remove = __devexit_p(stmpe_spi_remove), 131 .remove = stmpe_spi_remove,
132 .id_table = stmpe_spi_id, 132 .id_table = stmpe_spi_id,
133}; 133};
134 134
diff --git a/drivers/mfd/syscon.c b/drivers/mfd/syscon.c
index 65fe609026cc..3f10591ea94e 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;
@@ -138,7 +138,7 @@ static int __devinit syscon_probe(struct platform_device *pdev)
138 return 0; 138 return 0;
139} 139}
140 140
141static int __devexit syscon_remove(struct platform_device *pdev) 141static int syscon_remove(struct platform_device *pdev)
142{ 142{
143 struct syscon *syscon; 143 struct syscon *syscon;
144 144
@@ -156,7 +156,7 @@ static struct platform_driver syscon_driver = {
156 .of_match_table = of_syscon_match, 156 .of_match_table = of_syscon_match,
157 }, 157 },
158 .probe = syscon_probe, 158 .probe = syscon_probe,
159 .remove = __devexit_p(syscon_remove), 159 .remove = syscon_remove,
160}; 160};
161 161
162static int __init syscon_init(void) 162static int __init syscon_init(void)
diff --git a/drivers/mfd/tc3589x.c b/drivers/mfd/tc3589x.c
index 8f4c853ca116..a06d66b929b1 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;
@@ -402,7 +402,7 @@ out_free:
402 return ret; 402 return ret;
403} 403}
404 404
405static int __devexit tc3589x_remove(struct i2c_client *client) 405static int tc3589x_remove(struct i2c_client *client)
406{ 406{
407 struct tc3589x *tc3589x = i2c_get_clientdata(client); 407 struct tc3589x *tc3589x = i2c_get_clientdata(client);
408 408
@@ -458,7 +458,7 @@ static struct i2c_driver tc3589x_driver = {
458 .driver.owner = THIS_MODULE, 458 .driver.owner = THIS_MODULE,
459 .driver.pm = &tc3589x_dev_pm_ops, 459 .driver.pm = &tc3589x_dev_pm_ops,
460 .probe = tc3589x_probe, 460 .probe = tc3589x_probe,
461 .remove = __devexit_p(tc3589x_remove), 461 .remove = tc3589x_remove,
462 .id_table = tc3589x_id, 462 .id_table = tc3589x_id,
463}; 463};
464 464
diff --git a/drivers/mfd/tc6387xb.c b/drivers/mfd/tc6387xb.c
index 413c891102f8..366f7b906278 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;
@@ -208,7 +208,7 @@ err_no_irq:
208 return ret; 208 return ret;
209} 209}
210 210
211static int __devexit tc6387xb_remove(struct platform_device *dev) 211static int tc6387xb_remove(struct platform_device *dev)
212{ 212{
213 struct tc6387xb *tc6387xb = platform_get_drvdata(dev); 213 struct tc6387xb *tc6387xb = platform_get_drvdata(dev);
214 214
@@ -229,7 +229,7 @@ static struct platform_driver tc6387xb_platform_driver = {
229 .name = "tc6387xb", 229 .name = "tc6387xb",
230 }, 230 },
231 .probe = tc6387xb_probe, 231 .probe = tc6387xb_probe,
232 .remove = __devexit_p(tc6387xb_remove), 232 .remove = tc6387xb_remove,
233 .suspend = tc6387xb_suspend, 233 .suspend = tc6387xb_suspend,
234 .resume = tc6387xb_resume, 234 .resume = tc6387xb_resume,
235}; 235};
diff --git a/drivers/mfd/tc6393xb.c b/drivers/mfd/tc6393xb.c
index dcab026fcbb2..15e1463e5e13 100644
--- a/drivers/mfd/tc6393xb.c
+++ b/drivers/mfd/tc6393xb.c
@@ -137,7 +137,7 @@ static int tc6393xb_nand_enable(struct platform_device *nand)
137 return 0; 137 return 0;
138} 138}
139 139
140static struct resource __devinitdata tc6393xb_nand_resources[] = { 140static struct resource tc6393xb_nand_resources[] = {
141 { 141 {
142 .start = 0x1000, 142 .start = 0x1000,
143 .end = 0x1007, 143 .end = 0x1007,
@@ -196,7 +196,7 @@ static const struct resource tc6393xb_ohci_resources[] = {
196 }, 196 },
197}; 197};
198 198
199static struct resource __devinitdata tc6393xb_fb_resources[] = { 199static struct resource tc6393xb_fb_resources[] = {
200 { 200 {
201 .start = 0x5000, 201 .start = 0x5000,
202 .end = 0x51ff, 202 .end = 0x51ff,
@@ -382,7 +382,7 @@ static struct tmio_mmc_data tc6393xb_mmc_data = {
382 .set_clk_div = tc6393xb_mmc_clk_div, 382 .set_clk_div = tc6393xb_mmc_clk_div,
383}; 383};
384 384
385static struct mfd_cell __devinitdata tc6393xb_cells[] = { 385static struct mfd_cell tc6393xb_cells[] = {
386 [TC6393XB_CELL_NAND] = { 386 [TC6393XB_CELL_NAND] = {
387 .name = "tmio-nand", 387 .name = "tmio-nand",
388 .enable = tc6393xb_nand_enable, 388 .enable = tc6393xb_nand_enable,
@@ -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;
@@ -731,7 +731,7 @@ err_kzalloc:
731 return ret; 731 return ret;
732} 732}
733 733
734static int __devexit tc6393xb_remove(struct platform_device *dev) 734static int tc6393xb_remove(struct platform_device *dev)
735{ 735{
736 struct tc6393xb_platform_data *tcpd = dev->dev.platform_data; 736 struct tc6393xb_platform_data *tcpd = dev->dev.platform_data;
737 struct tc6393xb *tc6393xb = platform_get_drvdata(dev); 737 struct tc6393xb *tc6393xb = platform_get_drvdata(dev);
@@ -831,7 +831,7 @@ static int tc6393xb_resume(struct platform_device *dev)
831 831
832static struct platform_driver tc6393xb_driver = { 832static struct platform_driver tc6393xb_driver = {
833 .probe = tc6393xb_probe, 833 .probe = tc6393xb_probe,
834 .remove = __devexit_p(tc6393xb_remove), 834 .remove = tc6393xb_remove,
835 .suspend = tc6393xb_suspend, 835 .suspend = tc6393xb_suspend,
836 .resume = tc6393xb_resume, 836 .resume = tc6393xb_resume,
837 837
diff --git a/drivers/mfd/ti-ssp.c b/drivers/mfd/ti-ssp.c
index 7c3675a74f93..09a14cec351b 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;
@@ -433,7 +433,7 @@ error_res:
433 return error; 433 return error;
434} 434}
435 435
436static int __devexit ti_ssp_remove(struct platform_device *pdev) 436static int ti_ssp_remove(struct platform_device *pdev)
437{ 437{
438 struct device *dev = &pdev->dev; 438 struct device *dev = &pdev->dev;
439 struct ti_ssp *ssp = dev_get_drvdata(dev); 439 struct ti_ssp *ssp = dev_get_drvdata(dev);
@@ -451,7 +451,7 @@ static int __devexit ti_ssp_remove(struct platform_device *pdev)
451 451
452static struct platform_driver ti_ssp_driver = { 452static struct platform_driver ti_ssp_driver = {
453 .probe = ti_ssp_probe, 453 .probe = ti_ssp_probe,
454 .remove = __devexit_p(ti_ssp_remove), 454 .remove = ti_ssp_remove,
455 .driver = { 455 .driver = {
456 .name = "ti-ssp", 456 .name = "ti-ssp",
457 .owner = THIS_MODULE, 457 .owner = THIS_MODULE,
diff --git a/drivers/mfd/timberdale.c b/drivers/mfd/timberdale.c
index cccc626c83c8..59e0ee247e86 100644
--- a/drivers/mfd/timberdale.c
+++ b/drivers/mfd/timberdale.c
@@ -75,13 +75,13 @@ static struct i2c_board_info timberdale_i2c_board_info[] = {
75 }, 75 },
76}; 76};
77 77
78static __devinitdata struct xiic_i2c_platform_data 78static struct xiic_i2c_platform_data
79timberdale_xiic_platform_data = { 79timberdale_xiic_platform_data = {
80 .devices = timberdale_i2c_board_info, 80 .devices = timberdale_i2c_board_info,
81 .num_devices = ARRAY_SIZE(timberdale_i2c_board_info) 81 .num_devices = ARRAY_SIZE(timberdale_i2c_board_info)
82}; 82};
83 83
84static __devinitdata struct ocores_i2c_platform_data 84static struct ocores_i2c_platform_data
85timberdale_ocores_platform_data = { 85timberdale_ocores_platform_data = {
86 .reg_shift = 2, 86 .reg_shift = 2,
87 .clock_khz = 62500, 87 .clock_khz = 62500,
@@ -89,7 +89,7 @@ timberdale_ocores_platform_data = {
89 .num_devices = ARRAY_SIZE(timberdale_i2c_board_info) 89 .num_devices = ARRAY_SIZE(timberdale_i2c_board_info)
90}; 90};
91 91
92static const __devinitconst struct resource timberdale_xiic_resources[] = { 92static const struct resource timberdale_xiic_resources[] = {
93 { 93 {
94 .start = XIICOFFSET, 94 .start = XIICOFFSET,
95 .end = XIICEND, 95 .end = XIICEND,
@@ -102,7 +102,7 @@ static const __devinitconst struct resource timberdale_xiic_resources[] = {
102 }, 102 },
103}; 103};
104 104
105static const __devinitconst struct resource timberdale_ocores_resources[] = { 105static const struct resource timberdale_ocores_resources[] = {
106 { 106 {
107 .start = OCORESOFFSET, 107 .start = OCORESOFFSET,
108 .end = OCORESEND, 108 .end = OCORESEND,
@@ -143,7 +143,7 @@ static struct spi_board_info timberdale_spi_8bit_board_info[] = {
143 }, 143 },
144}; 144};
145 145
146static __devinitdata struct xspi_platform_data timberdale_xspi_platform_data = { 146static struct xspi_platform_data timberdale_xspi_platform_data = {
147 .num_chipselect = 3, 147 .num_chipselect = 3,
148 .little_endian = true, 148 .little_endian = true,
149 /* bits per word and devices will be filled in runtime depending 149 /* bits per word and devices will be filled in runtime depending
@@ -151,7 +151,7 @@ static __devinitdata struct xspi_platform_data timberdale_xspi_platform_data = {
151 */ 151 */
152}; 152};
153 153
154static const __devinitconst struct resource timberdale_spi_resources[] = { 154static const struct resource timberdale_spi_resources[] = {
155 { 155 {
156 .start = SPIOFFSET, 156 .start = SPIOFFSET,
157 .end = SPIEND, 157 .end = SPIEND,
@@ -164,13 +164,13 @@ static const __devinitconst struct resource timberdale_spi_resources[] = {
164 }, 164 },
165}; 165};
166 166
167static __devinitdata struct ks8842_platform_data 167static struct ks8842_platform_data
168 timberdale_ks8842_platform_data = { 168 timberdale_ks8842_platform_data = {
169 .rx_dma_channel = DMA_ETH_RX, 169 .rx_dma_channel = DMA_ETH_RX,
170 .tx_dma_channel = DMA_ETH_TX 170 .tx_dma_channel = DMA_ETH_TX
171}; 171};
172 172
173static const __devinitconst struct resource timberdale_eth_resources[] = { 173static const struct resource timberdale_eth_resources[] = {
174 { 174 {
175 .start = ETHOFFSET, 175 .start = ETHOFFSET,
176 .end = ETHEND, 176 .end = ETHEND,
@@ -183,14 +183,14 @@ static const __devinitconst struct resource timberdale_eth_resources[] = {
183 }, 183 },
184}; 184};
185 185
186static __devinitdata struct timbgpio_platform_data 186static struct timbgpio_platform_data
187 timberdale_gpio_platform_data = { 187 timberdale_gpio_platform_data = {
188 .gpio_base = 0, 188 .gpio_base = 0,
189 .nr_pins = GPIO_NR_PINS, 189 .nr_pins = GPIO_NR_PINS,
190 .irq_base = 200, 190 .irq_base = 200,
191}; 191};
192 192
193static const __devinitconst struct resource timberdale_gpio_resources[] = { 193static const struct resource timberdale_gpio_resources[] = {
194 { 194 {
195 .start = GPIOOFFSET, 195 .start = GPIOOFFSET,
196 .end = GPIOEND, 196 .end = GPIOEND,
@@ -203,7 +203,7 @@ static const __devinitconst struct resource timberdale_gpio_resources[] = {
203 }, 203 },
204}; 204};
205 205
206static const __devinitconst struct resource timberdale_mlogicore_resources[] = { 206static const struct resource timberdale_mlogicore_resources[] = {
207 { 207 {
208 .start = MLCOREOFFSET, 208 .start = MLCOREOFFSET,
209 .end = MLCOREEND, 209 .end = MLCOREEND,
@@ -221,7 +221,7 @@ static const __devinitconst struct resource timberdale_mlogicore_resources[] = {
221 }, 221 },
222}; 222};
223 223
224static const __devinitconst struct resource timberdale_uart_resources[] = { 224static const struct resource timberdale_uart_resources[] = {
225 { 225 {
226 .start = UARTOFFSET, 226 .start = UARTOFFSET,
227 .end = UARTEND, 227 .end = UARTEND,
@@ -234,7 +234,7 @@ static const __devinitconst struct resource timberdale_uart_resources[] = {
234 }, 234 },
235}; 235};
236 236
237static const __devinitconst struct resource timberdale_uartlite_resources[] = { 237static const struct resource timberdale_uartlite_resources[] = {
238 { 238 {
239 .start = UARTLITEOFFSET, 239 .start = UARTLITEOFFSET,
240 .end = UARTLITEEND, 240 .end = UARTLITEEND,
@@ -247,13 +247,13 @@ static const __devinitconst struct resource timberdale_uartlite_resources[] = {
247 }, 247 },
248}; 248};
249 249
250static __devinitdata struct i2c_board_info timberdale_adv7180_i2c_board_info = { 250static struct i2c_board_info timberdale_adv7180_i2c_board_info = {
251 /* Requires jumper JP9 to be off */ 251 /* Requires jumper JP9 to be off */
252 I2C_BOARD_INFO("adv7180", 0x42 >> 1), 252 I2C_BOARD_INFO("adv7180", 0x42 >> 1),
253 .irq = IRQ_TIMBERDALE_ADV7180 253 .irq = IRQ_TIMBERDALE_ADV7180
254}; 254};
255 255
256static __devinitdata struct timb_video_platform_data 256static struct timb_video_platform_data
257 timberdale_video_platform_data = { 257 timberdale_video_platform_data = {
258 .dma_channel = DMA_VIDEO_RX, 258 .dma_channel = DMA_VIDEO_RX,
259 .i2c_adapter = 0, 259 .i2c_adapter = 0,
@@ -262,7 +262,7 @@ static __devinitdata struct timb_video_platform_data
262 } 262 }
263}; 263};
264 264
265static const __devinitconst struct resource 265static const struct resource
266timberdale_radio_resources[] = { 266timberdale_radio_resources[] = {
267 { 267 {
268 .start = RDSOFFSET, 268 .start = RDSOFFSET,
@@ -276,22 +276,22 @@ timberdale_radio_resources[] = {
276 }, 276 },
277}; 277};
278 278
279static __devinitdata struct i2c_board_info timberdale_tef6868_i2c_board_info = { 279static struct i2c_board_info timberdale_tef6868_i2c_board_info = {
280 I2C_BOARD_INFO("tef6862", 0x60) 280 I2C_BOARD_INFO("tef6862", 0x60)
281}; 281};
282 282
283static __devinitdata struct i2c_board_info timberdale_saa7706_i2c_board_info = { 283static struct i2c_board_info timberdale_saa7706_i2c_board_info = {
284 I2C_BOARD_INFO("saa7706h", 0x1C) 284 I2C_BOARD_INFO("saa7706h", 0x1C)
285}; 285};
286 286
287static __devinitdata struct timb_radio_platform_data 287static struct timb_radio_platform_data
288 timberdale_radio_platform_data = { 288 timberdale_radio_platform_data = {
289 .i2c_adapter = 0, 289 .i2c_adapter = 0,
290 .tuner = &timberdale_tef6868_i2c_board_info, 290 .tuner = &timberdale_tef6868_i2c_board_info,
291 .dsp = &timberdale_saa7706_i2c_board_info 291 .dsp = &timberdale_saa7706_i2c_board_info
292}; 292};
293 293
294static const __devinitconst struct resource timberdale_video_resources[] = { 294static const struct resource timberdale_video_resources[] = {
295 { 295 {
296 .start = LOGIWOFFSET, 296 .start = LOGIWOFFSET,
297 .end = LOGIWEND, 297 .end = LOGIWEND,
@@ -303,7 +303,7 @@ static const __devinitconst struct resource timberdale_video_resources[] = {
303 */ 303 */
304}; 304};
305 305
306static __devinitdata struct timb_dma_platform_data timb_dma_platform_data = { 306static struct timb_dma_platform_data timb_dma_platform_data = {
307 .nr_channels = 10, 307 .nr_channels = 10,
308 .channels = { 308 .channels = {
309 { 309 {
@@ -362,7 +362,7 @@ static __devinitdata struct timb_dma_platform_data timb_dma_platform_data = {
362 } 362 }
363}; 363};
364 364
365static const __devinitconst struct resource timberdale_dma_resources[] = { 365static const struct resource timberdale_dma_resources[] = {
366 { 366 {
367 .start = DMAOFFSET, 367 .start = DMAOFFSET,
368 .end = DMAEND, 368 .end = DMAEND,
@@ -375,7 +375,7 @@ static const __devinitconst struct resource timberdale_dma_resources[] = {
375 }, 375 },
376}; 376};
377 377
378static __devinitdata struct mfd_cell timberdale_cells_bar0_cfg0[] = { 378static struct mfd_cell timberdale_cells_bar0_cfg0[] = {
379 { 379 {
380 .name = "timb-dma", 380 .name = "timb-dma",
381 .num_resources = ARRAY_SIZE(timberdale_dma_resources), 381 .num_resources = ARRAY_SIZE(timberdale_dma_resources),
@@ -432,7 +432,7 @@ static __devinitdata struct mfd_cell timberdale_cells_bar0_cfg0[] = {
432 }, 432 },
433}; 433};
434 434
435static __devinitdata struct mfd_cell timberdale_cells_bar0_cfg1[] = { 435static struct mfd_cell timberdale_cells_bar0_cfg1[] = {
436 { 436 {
437 .name = "timb-dma", 437 .name = "timb-dma",
438 .num_resources = ARRAY_SIZE(timberdale_dma_resources), 438 .num_resources = ARRAY_SIZE(timberdale_dma_resources),
@@ -499,7 +499,7 @@ static __devinitdata struct mfd_cell timberdale_cells_bar0_cfg1[] = {
499 }, 499 },
500}; 500};
501 501
502static __devinitdata struct mfd_cell timberdale_cells_bar0_cfg2[] = { 502static struct mfd_cell timberdale_cells_bar0_cfg2[] = {
503 { 503 {
504 .name = "timb-dma", 504 .name = "timb-dma",
505 .num_resources = ARRAY_SIZE(timberdale_dma_resources), 505 .num_resources = ARRAY_SIZE(timberdale_dma_resources),
@@ -549,7 +549,7 @@ static __devinitdata struct mfd_cell timberdale_cells_bar0_cfg2[] = {
549 }, 549 },
550}; 550};
551 551
552static __devinitdata struct mfd_cell timberdale_cells_bar0_cfg3[] = { 552static struct mfd_cell timberdale_cells_bar0_cfg3[] = {
553 { 553 {
554 .name = "timb-dma", 554 .name = "timb-dma",
555 .num_resources = ARRAY_SIZE(timberdale_dma_resources), 555 .num_resources = ARRAY_SIZE(timberdale_dma_resources),
@@ -606,7 +606,7 @@ static __devinitdata struct mfd_cell timberdale_cells_bar0_cfg3[] = {
606 }, 606 },
607}; 607};
608 608
609static const __devinitconst struct resource timberdale_sdhc_resources[] = { 609static const struct resource timberdale_sdhc_resources[] = {
610 /* located in bar 1 and bar 2 */ 610 /* located in bar 1 and bar 2 */
611 { 611 {
612 .start = SDHC0OFFSET, 612 .start = SDHC0OFFSET,
@@ -620,7 +620,7 @@ static const __devinitconst struct resource timberdale_sdhc_resources[] = {
620 }, 620 },
621}; 621};
622 622
623static __devinitdata struct mfd_cell timberdale_cells_bar1[] = { 623static struct mfd_cell timberdale_cells_bar1[] = {
624 { 624 {
625 .name = "sdhci", 625 .name = "sdhci",
626 .num_resources = ARRAY_SIZE(timberdale_sdhc_resources), 626 .num_resources = ARRAY_SIZE(timberdale_sdhc_resources),
@@ -628,7 +628,7 @@ static __devinitdata struct mfd_cell timberdale_cells_bar1[] = {
628 }, 628 },
629}; 629};
630 630
631static __devinitdata struct mfd_cell timberdale_cells_bar2[] = { 631static struct mfd_cell timberdale_cells_bar2[] = {
632 { 632 {
633 .name = "sdhci", 633 .name = "sdhci",
634 .num_resources = ARRAY_SIZE(timberdale_sdhc_resources), 634 .num_resources = ARRAY_SIZE(timberdale_sdhc_resources),
@@ -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;
@@ -840,7 +840,7 @@ err_enable:
840 return -ENODEV; 840 return -ENODEV;
841} 841}
842 842
843static void __devexit timb_remove(struct pci_dev *dev) 843static void timb_remove(struct pci_dev *dev)
844{ 844{
845 struct timberdale_device *priv = pci_get_drvdata(dev); 845 struct timberdale_device *priv = pci_get_drvdata(dev);
846 846
@@ -867,7 +867,7 @@ static struct pci_driver timberdale_pci_driver = {
867 .name = DRIVER_NAME, 867 .name = DRIVER_NAME,
868 .id_table = timberdale_pci_tbl, 868 .id_table = timberdale_pci_tbl,
869 .probe = timb_probe, 869 .probe = timb_probe,
870 .remove = __devexit_p(timb_remove), 870 .remove = timb_remove,
871}; 871};
872 872
873static int __init timberdale_init(void) 873static int __init timberdale_init(void)
diff --git a/drivers/mfd/tps6105x.c b/drivers/mfd/tps6105x.c
index 14051bdc714b..1d302f583adf 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;
@@ -199,7 +199,7 @@ fail:
199 return ret; 199 return ret;
200} 200}
201 201
202static int __devexit tps6105x_remove(struct i2c_client *client) 202static int tps6105x_remove(struct i2c_client *client)
203{ 203{
204 struct tps6105x *tps6105x = i2c_get_clientdata(client); 204 struct tps6105x *tps6105x = i2c_get_clientdata(client);
205 205
@@ -226,7 +226,7 @@ static struct i2c_driver tps6105x_driver = {
226 .name = "tps6105x", 226 .name = "tps6105x",
227 }, 227 },
228 .probe = tps6105x_probe, 228 .probe = tps6105x_probe,
229 .remove = __devexit_p(tps6105x_remove), 229 .remove = tps6105x_remove,
230 .id_table = tps6105x_id, 230 .id_table = tps6105x_id,
231}; 231};
232 232
diff --git a/drivers/mfd/tps65090.c b/drivers/mfd/tps65090.c
index 074ae32b0d2a..382a857b0dde 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;
@@ -308,7 +308,7 @@ err_exit:
308 return ret; 308 return ret;
309} 309}
310 310
311static int __devexit tps65090_i2c_remove(struct i2c_client *client) 311static int tps65090_i2c_remove(struct i2c_client *client)
312{ 312{
313 struct tps65090 *tps65090 = i2c_get_clientdata(client); 313 struct tps65090 *tps65090 = i2c_get_clientdata(client);
314 314
@@ -354,7 +354,7 @@ static struct i2c_driver tps65090_driver = {
354 .pm = &tps65090_pm_ops, 354 .pm = &tps65090_pm_ops,
355 }, 355 },
356 .probe = tps65090_i2c_probe, 356 .probe = tps65090_i2c_probe,
357 .remove = __devexit_p(tps65090_i2c_remove), 357 .remove = tps65090_i2c_remove,
358 .id_table = tps65090_id_table, 358 .id_table = tps65090_id_table,
359}; 359};
360 360
diff --git a/drivers/mfd/tps65217.c b/drivers/mfd/tps65217.c
index 3fb32e655254..e14e252e3473 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;
@@ -214,7 +214,7 @@ static int __devinit tps65217_probe(struct i2c_client *client,
214 return 0; 214 return 0;
215} 215}
216 216
217static int __devexit tps65217_remove(struct i2c_client *client) 217static int tps65217_remove(struct i2c_client *client)
218{ 218{
219 struct tps65217 *tps = i2c_get_clientdata(client); 219 struct tps65217 *tps = i2c_get_clientdata(client);
220 220
@@ -237,7 +237,7 @@ static struct i2c_driver tps65217_driver = {
237 }, 237 },
238 .id_table = tps65217_id_table, 238 .id_table = tps65217_id_table,
239 .probe = tps65217_probe, 239 .probe = tps65217_probe,
240 .remove = __devexit_p(tps65217_remove), 240 .remove = tps65217_remove,
241}; 241};
242 242
243static int __init tps65217_init(void) 243static int __init tps65217_init(void)
diff --git a/drivers/mfd/tps6586x.c b/drivers/mfd/tps6586x.c
index 467464368773..9f92c3b22093 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;
@@ -548,7 +548,7 @@ err_mfd_add:
548 return ret; 548 return ret;
549} 549}
550 550
551static int __devexit tps6586x_i2c_remove(struct i2c_client *client) 551static int tps6586x_i2c_remove(struct i2c_client *client)
552{ 552{
553 struct tps6586x *tps6586x = i2c_get_clientdata(client); 553 struct tps6586x *tps6586x = i2c_get_clientdata(client);
554 554
@@ -572,7 +572,7 @@ static struct i2c_driver tps6586x_driver = {
572 .of_match_table = of_match_ptr(tps6586x_of_match), 572 .of_match_table = of_match_ptr(tps6586x_of_match),
573 }, 573 },
574 .probe = tps6586x_i2c_probe, 574 .probe = tps6586x_i2c_probe,
575 .remove = __devexit_p(tps6586x_i2c_remove), 575 .remove = tps6586x_i2c_remove,
576 .id_table = tps6586x_id_table, 576 .id_table = tps6586x_id_table,
577}; 577};
578 578
diff --git a/drivers/mfd/tps65910.c b/drivers/mfd/tps65910.c
index 0d79ce2b5014..ce054654f5bb 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;
@@ -302,7 +302,7 @@ static __devinit int tps65910_i2c_probe(struct i2c_client *i2c,
302 return ret; 302 return ret;
303} 303}
304 304
305static __devexit int tps65910_i2c_remove(struct i2c_client *i2c) 305static int tps65910_i2c_remove(struct i2c_client *i2c)
306{ 306{
307 struct tps65910 *tps65910 = i2c_get_clientdata(i2c); 307 struct tps65910 *tps65910 = i2c_get_clientdata(i2c);
308 308
@@ -327,7 +327,7 @@ static struct i2c_driver tps65910_i2c_driver = {
327 .of_match_table = of_match_ptr(tps65910_of_match), 327 .of_match_table = of_match_ptr(tps65910_of_match),
328 }, 328 },
329 .probe = tps65910_i2c_probe, 329 .probe = tps65910_i2c_probe,
330 .remove = __devexit_p(tps65910_i2c_remove), 330 .remove = tps65910_i2c_remove,
331 .id_table = tps65910_i2c_id, 331 .id_table = tps65910_i2c_id,
332}; 332};
333 333
diff --git a/drivers/mfd/tps65911-comparator.c b/drivers/mfd/tps65911-comparator.c
index 0b6e361432c4..c0816ebd9d7e 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);
@@ -152,7 +152,7 @@ static __devinit int tps65911_comparator_probe(struct platform_device *pdev)
152 return ret; 152 return ret;
153} 153}
154 154
155static __devexit int tps65911_comparator_remove(struct platform_device *pdev) 155static int tps65911_comparator_remove(struct platform_device *pdev)
156{ 156{
157 struct tps65910 *tps65910; 157 struct tps65910 *tps65910;
158 158
@@ -169,7 +169,7 @@ static struct platform_driver tps65911_comparator_driver = {
169 .owner = THIS_MODULE, 169 .owner = THIS_MODULE,
170 }, 170 },
171 .probe = tps65911_comparator_probe, 171 .probe = tps65911_comparator_probe,
172 .remove = __devexit_p(tps65911_comparator_remove), 172 .remove = tps65911_comparator_remove,
173}; 173};
174 174
175static int __init tps65911_comparator_init(void) 175static int __init tps65911_comparator_init(void)
diff --git a/drivers/mfd/tps65912-spi.c b/drivers/mfd/tps65912-spi.c
index 27d3302d56b8..b45f460d299f 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
@@ -99,7 +99,7 @@ static int __devinit tps65912_spi_probe(struct spi_device *spi)
99 return tps65912_device_init(tps65912); 99 return tps65912_device_init(tps65912);
100} 100}
101 101
102static int __devexit tps65912_spi_remove(struct spi_device *spi) 102static int tps65912_spi_remove(struct spi_device *spi)
103{ 103{
104 struct tps65912 *tps65912 = spi_get_drvdata(spi); 104 struct tps65912 *tps65912 = spi_get_drvdata(spi);
105 105
@@ -114,7 +114,7 @@ static struct spi_driver tps65912_spi_driver = {
114 .owner = THIS_MODULE, 114 .owner = THIS_MODULE,
115 }, 115 },
116 .probe = tps65912_spi_probe, 116 .probe = tps65912_spi_probe,
117 .remove = __devexit_p(tps65912_spi_remove), 117 .remove = tps65912_spi_remove,
118}; 118};
119 119
120static int __init tps65912_spi_init(void) 120static int __init tps65912_spi_init(void)
diff --git a/drivers/mfd/twl-core.c b/drivers/mfd/twl-core.c
index a071a8643a47..11b76c0109f5 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 5c11acf9e0fd..e16edca92670 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;
@@ -269,7 +269,7 @@ static int __devinit twl4030_audio_probe(struct platform_device *pdev)
269 return ret; 269 return ret;
270} 270}
271 271
272static int __devexit twl4030_audio_remove(struct platform_device *pdev) 272static int twl4030_audio_remove(struct platform_device *pdev)
273{ 273{
274 mfd_remove_devices(&pdev->dev); 274 mfd_remove_devices(&pdev->dev);
275 platform_set_drvdata(pdev, NULL); 275 platform_set_drvdata(pdev, NULL);
@@ -291,7 +291,7 @@ static struct platform_driver twl4030_audio_driver = {
291 .of_match_table = twl4030_audio_of_match, 291 .of_match_table = twl4030_audio_of_match,
292 }, 292 },
293 .probe = twl4030_audio_probe, 293 .probe = twl4030_audio_probe,
294 .remove = __devexit_p(twl4030_audio_remove), 294 .remove = twl4030_audio_remove,
295}; 295};
296 296
297module_platform_driver(twl4030_audio_driver); 297module_platform_driver(twl4030_audio_driver);
diff --git a/drivers/mfd/twl4030-madc.c b/drivers/mfd/twl4030-madc.c
index 456ecb5ac4fe..a39dcf3e2133 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;
@@ -785,7 +785,7 @@ err_power:
785 return ret; 785 return ret;
786} 786}
787 787
788static int __devexit twl4030_madc_remove(struct platform_device *pdev) 788static int twl4030_madc_remove(struct platform_device *pdev)
789{ 789{
790 struct twl4030_madc_data *madc = platform_get_drvdata(pdev); 790 struct twl4030_madc_data *madc = platform_get_drvdata(pdev);
791 791
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 b9a636d44c7f..757ecc63338c 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;
@@ -112,7 +112,7 @@ out:
112 return ret; 112 return ret;
113} 113}
114 114
115static void __devexit vx855_remove(struct pci_dev *pdev) 115static void vx855_remove(struct pci_dev *pdev)
116{ 116{
117 mfd_remove_devices(&pdev->dev); 117 mfd_remove_devices(&pdev->dev);
118 pci_disable_device(pdev); 118 pci_disable_device(pdev);
@@ -128,7 +128,7 @@ static struct pci_driver vx855_pci_driver = {
128 .name = "vx855", 128 .name = "vx855",
129 .id_table = vx855_pci_tbl, 129 .id_table = vx855_pci_tbl,
130 .probe = vx855_probe, 130 .probe = vx855_probe,
131 .remove = __devexit_p(vx855_remove), 131 .remove = vx855_remove,
132}; 132};
133 133
134module_pci_driver(vx855_pci_driver); 134module_pci_driver(vx855_pci_driver);
diff --git a/drivers/mfd/wl1273-core.c b/drivers/mfd/wl1273-core.c
index 86e0e4309fc2..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;
@@ -262,7 +262,7 @@ static struct i2c_driver wl1273_core_driver = {
262 }, 262 },
263 .probe = wl1273_core_probe, 263 .probe = wl1273_core_probe,
264 .id_table = wl1273_driver_id_table, 264 .id_table = wl1273_driver_id_table,
265 .remove = __devexit_p(wl1273_core_remove), 265 .remove = wl1273_core_remove,
266}; 266};
267 267
268static int __init wl1273_core_init(void) 268static int __init wl1273_core_init(void)
diff --git a/drivers/mfd/wm831x-spi.c b/drivers/mfd/wm831x-spi.c
index 4bceee98f0a4..4e70e157a909 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;
@@ -51,7 +51,7 @@ static int __devinit wm831x_spi_probe(struct spi_device *spi)
51 return wm831x_device_init(wm831x, type, spi->irq); 51 return wm831x_device_init(wm831x, type, spi->irq);
52} 52}
53 53
54static int __devexit wm831x_spi_remove(struct spi_device *spi) 54static int wm831x_spi_remove(struct spi_device *spi)
55{ 55{
56 struct wm831x *wm831x = dev_get_drvdata(&spi->dev); 56 struct wm831x *wm831x = dev_get_drvdata(&spi->dev);
57 57
@@ -99,7 +99,7 @@ static struct spi_driver wm831x_spi_driver = {
99 }, 99 },
100 .id_table = wm831x_spi_ids, 100 .id_table = wm831x_spi_ids,
101 .probe = wm831x_spi_probe, 101 .probe = wm831x_spi_probe,
102 .remove = __devexit_p(wm831x_spi_remove), 102 .remove = wm831x_spi_remove,
103 .shutdown = wm831x_spi_shutdown, 103 .shutdown = wm831x_spi_shutdown,
104}; 104};
105 105
diff --git a/drivers/mfd/wm8994-core.c b/drivers/mfd/wm8994-core.c
index 8fefc961ec06..c7f62ac544ad 100644
--- a/drivers/mfd/wm8994-core.c
+++ b/drivers/mfd/wm8994-core.c
@@ -374,21 +374,21 @@ static int wm8994_ldo_in_use(struct wm8994_pdata *pdata, int ldo)
374} 374}
375#endif 375#endif
376 376
377static const __devinitconst struct reg_default wm8994_revc_patch[] = { 377static const struct reg_default wm8994_revc_patch[] = {
378 { 0x102, 0x3 }, 378 { 0x102, 0x3 },
379 { 0x56, 0x3 }, 379 { 0x56, 0x3 },
380 { 0x817, 0x0 }, 380 { 0x817, 0x0 },
381 { 0x102, 0x0 }, 381 { 0x102, 0x0 },
382}; 382};
383 383
384static const __devinitconst struct reg_default wm8958_reva_patch[] = { 384static const struct reg_default wm8958_reva_patch[] = {
385 { 0x102, 0x3 }, 385 { 0x102, 0x3 },
386 { 0xcb, 0x81 }, 386 { 0xcb, 0x81 },
387 { 0x817, 0x0 }, 387 { 0x817, 0x0 },
388 { 0x102, 0x0 }, 388 { 0x102, 0x0 },
389}; 389};
390 390
391static const __devinitconst struct reg_default wm1811_reva_patch[] = { 391static const struct reg_default wm1811_reva_patch[] = {
392 { 0x102, 0x3 }, 392 { 0x102, 0x3 },
393 { 0x56, 0xc07 }, 393 { 0x56, 0xc07 },
394 { 0x5d, 0x7e }, 394 { 0x5d, 0x7e },
@@ -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;
@@ -671,7 +671,7 @@ err:
671 return ret; 671 return ret;
672} 672}
673 673
674static __devexit void wm8994_device_exit(struct wm8994 *wm8994) 674static void wm8994_device_exit(struct wm8994 *wm8994)
675{ 675{
676 pm_runtime_disable(wm8994->dev); 676 pm_runtime_disable(wm8994->dev);
677 mfd_remove_devices(wm8994->dev); 677 mfd_remove_devices(wm8994->dev);
@@ -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;
@@ -715,7 +715,7 @@ static __devinit int wm8994_i2c_probe(struct i2c_client *i2c,
715 return wm8994_device_init(wm8994, i2c->irq); 715 return wm8994_device_init(wm8994, i2c->irq);
716} 716}
717 717
718static __devexit int wm8994_i2c_remove(struct i2c_client *i2c) 718static int wm8994_i2c_remove(struct i2c_client *i2c)
719{ 719{
720 struct wm8994 *wm8994 = i2c_get_clientdata(i2c); 720 struct wm8994 *wm8994 = i2c_get_clientdata(i2c);
721 721
@@ -744,7 +744,7 @@ static struct i2c_driver wm8994_i2c_driver = {
744 .of_match_table = wm8994_of_match, 744 .of_match_table = wm8994_of_match,
745 }, 745 },
746 .probe = wm8994_i2c_probe, 746 .probe = wm8994_i2c_probe,
747 .remove = __devexit_p(wm8994_i2c_remove), 747 .remove = wm8994_i2c_remove,
748 .id_table = wm8994_i2c_id, 748 .id_table = wm8994_i2c_id,
749}; 749};
750 750
generated by cgit v1.2.2 (git 2.25.0) at 2025-02-25 18:06:31 -0500