aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpio
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/gpio
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/gpio')
-rw-r--r--drivers/gpio/gpio-74x164.c6
-rw-r--r--drivers/gpio/gpio-ab8500.c6
-rw-r--r--drivers/gpio/gpio-adnp.c10
-rw-r--r--drivers/gpio/gpio-adp5520.c6
-rw-r--r--drivers/gpio/gpio-adp5588.c6
-rw-r--r--drivers/gpio/gpio-arizona.c6
-rw-r--r--drivers/gpio/gpio-cs5535.c6
-rw-r--r--drivers/gpio/gpio-da9052.c8
-rw-r--r--drivers/gpio/gpio-em.c6
-rw-r--r--drivers/gpio/gpio-ep93xx.c2
-rw-r--r--drivers/gpio/gpio-generic.c6
-rw-r--r--drivers/gpio/gpio-ich.c10
-rw-r--r--drivers/gpio/gpio-janz-ttl.c10
-rw-r--r--drivers/gpio/gpio-langwell.c8
-rw-r--r--drivers/gpio/gpio-lpc32xx.c4
-rw-r--r--drivers/gpio/gpio-max7300.c6
-rw-r--r--drivers/gpio/gpio-max7301.c6
-rw-r--r--drivers/gpio/gpio-max730x.c4
-rw-r--r--drivers/gpio/gpio-max732x.c8
-rw-r--r--drivers/gpio/gpio-mc33880.c6
-rw-r--r--drivers/gpio/gpio-mcp23s08.c6
-rw-r--r--drivers/gpio/gpio-ml-ioh.c8
-rw-r--r--drivers/gpio/gpio-mpc5200.c4
-rw-r--r--drivers/gpio/gpio-msic.c2
-rw-r--r--drivers/gpio/gpio-msm-v2.c6
-rw-r--r--drivers/gpio/gpio-mvebu.c4
-rw-r--r--drivers/gpio/gpio-mxc.c4
-rw-r--r--drivers/gpio/gpio-mxs.c2
-rw-r--r--drivers/gpio/gpio-omap.c6
-rw-r--r--drivers/gpio/gpio-pca953x.c6
-rw-r--r--drivers/gpio/gpio-pch.c8
-rw-r--r--drivers/gpio/gpio-pxa.c6
-rw-r--r--drivers/gpio/gpio-rc5t583.c6
-rw-r--r--drivers/gpio/gpio-rdc321x.c6
-rw-r--r--drivers/gpio/gpio-sch.c6
-rw-r--r--drivers/gpio/gpio-sodaville.c4
-rw-r--r--drivers/gpio/gpio-sta2x11.c4
-rw-r--r--drivers/gpio/gpio-stmpe.c8
-rw-r--r--drivers/gpio/gpio-stp-xway.c2
-rw-r--r--drivers/gpio/gpio-sx150x.c6
-rw-r--r--drivers/gpio/gpio-tc3589x.c6
-rw-r--r--drivers/gpio/gpio-tegra.c4
-rw-r--r--drivers/gpio/gpio-timberdale.c4
-rw-r--r--drivers/gpio/gpio-tps6586x.c6
-rw-r--r--drivers/gpio/gpio-tps65910.c6
-rw-r--r--drivers/gpio/gpio-tps65912.c6
-rw-r--r--drivers/gpio/gpio-twl4030.c8
-rw-r--r--drivers/gpio/gpio-twl6040.c4
-rw-r--r--drivers/gpio/gpio-vr41xx.c6
-rw-r--r--drivers/gpio/gpio-vt8500.c2
-rw-r--r--drivers/gpio/gpio-vx855.c6
-rw-r--r--drivers/gpio/gpio-wm831x.c6
-rw-r--r--drivers/gpio/gpio-wm8350.c6
-rw-r--r--drivers/gpio/gpio-wm8994.c6
-rw-r--r--drivers/gpio/gpio-xilinx.c4
55 files changed, 157 insertions, 157 deletions
diff --git a/drivers/gpio/gpio-74x164.c b/drivers/gpio/gpio-74x164.c
index f05e54258ffb..464be961f605 100644
--- a/drivers/gpio/gpio-74x164.c
+++ b/drivers/gpio/gpio-74x164.c
@@ -105,7 +105,7 @@ static int gen_74x164_direction_output(struct gpio_chip *gc,
105 return 0; 105 return 0;
106} 106}
107 107
108static int __devinit gen_74x164_probe(struct spi_device *spi) 108static int gen_74x164_probe(struct spi_device *spi)
109{ 109{
110 struct gen_74x164_chip *chip; 110 struct gen_74x164_chip *chip;
111 struct gen_74x164_chip_platform_data *pdata; 111 struct gen_74x164_chip_platform_data *pdata;
@@ -181,7 +181,7 @@ exit_destroy:
181 return ret; 181 return ret;
182} 182}
183 183
184static int __devexit gen_74x164_remove(struct spi_device *spi) 184static int gen_74x164_remove(struct spi_device *spi)
185{ 185{
186 struct gen_74x164_chip *chip; 186 struct gen_74x164_chip *chip;
187 int ret; 187 int ret;
@@ -215,7 +215,7 @@ static struct spi_driver gen_74x164_driver = {
215 .of_match_table = of_match_ptr(gen_74x164_dt_ids), 215 .of_match_table = of_match_ptr(gen_74x164_dt_ids),
216 }, 216 },
217 .probe = gen_74x164_probe, 217 .probe = gen_74x164_probe,
218 .remove = __devexit_p(gen_74x164_remove), 218 .remove = gen_74x164_remove,
219}; 219};
220module_spi_driver(gen_74x164_driver); 220module_spi_driver(gen_74x164_driver);
221 221
diff --git a/drivers/gpio/gpio-ab8500.c b/drivers/gpio/gpio-ab8500.c
index 050c05d91896..983ad425f0ac 100644
--- a/drivers/gpio/gpio-ab8500.c
+++ b/drivers/gpio/gpio-ab8500.c
@@ -402,7 +402,7 @@ static void ab8500_gpio_irq_remove(struct ab8500_gpio *ab8500_gpio)
402 } 402 }
403} 403}
404 404
405static int __devinit ab8500_gpio_probe(struct platform_device *pdev) 405static int ab8500_gpio_probe(struct platform_device *pdev)
406{ 406{
407 struct ab8500_platform_data *ab8500_pdata = 407 struct ab8500_platform_data *ab8500_pdata =
408 dev_get_platdata(pdev->dev.parent); 408 dev_get_platdata(pdev->dev.parent);
@@ -474,7 +474,7 @@ out_free:
474 * ab8500_gpio_remove() - remove Ab8500-gpio driver 474 * ab8500_gpio_remove() - remove Ab8500-gpio driver
475 * @pdev : Platform device registered 475 * @pdev : Platform device registered
476 */ 476 */
477static int __devexit ab8500_gpio_remove(struct platform_device *pdev) 477static int ab8500_gpio_remove(struct platform_device *pdev)
478{ 478{
479 struct ab8500_gpio *ab8500_gpio = platform_get_drvdata(pdev); 479 struct ab8500_gpio *ab8500_gpio = platform_get_drvdata(pdev);
480 int ret; 480 int ret;
@@ -499,7 +499,7 @@ static struct platform_driver ab8500_gpio_driver = {
499 .owner = THIS_MODULE, 499 .owner = THIS_MODULE,
500 }, 500 },
501 .probe = ab8500_gpio_probe, 501 .probe = ab8500_gpio_probe,
502 .remove = __devexit_p(ab8500_gpio_remove), 502 .remove = ab8500_gpio_remove,
503}; 503};
504 504
505static int __init ab8500_gpio_init(void) 505static int __init ab8500_gpio_init(void)
diff --git a/drivers/gpio/gpio-adnp.c b/drivers/gpio/gpio-adnp.c
index 3df88336415e..e60567fc5073 100644
--- a/drivers/gpio/gpio-adnp.c
+++ b/drivers/gpio/gpio-adnp.c
@@ -516,7 +516,7 @@ static void adnp_irq_teardown(struct adnp *adnp)
516 irq_domain_remove(adnp->domain); 516 irq_domain_remove(adnp->domain);
517} 517}
518 518
519static __devinit int adnp_i2c_probe(struct i2c_client *client, 519static int adnp_i2c_probe(struct i2c_client *client,
520 const struct i2c_device_id *id) 520 const struct i2c_device_id *id)
521{ 521{
522 struct device_node *np = client->dev.of_node; 522 struct device_node *np = client->dev.of_node;
@@ -563,7 +563,7 @@ teardown:
563 return err; 563 return err;
564} 564}
565 565
566static __devexit int adnp_i2c_remove(struct i2c_client *client) 566static int adnp_i2c_remove(struct i2c_client *client)
567{ 567{
568 struct adnp *adnp = i2c_get_clientdata(client); 568 struct adnp *adnp = i2c_get_clientdata(client);
569 struct device_node *np = client->dev.of_node; 569 struct device_node *np = client->dev.of_node;
@@ -582,13 +582,13 @@ static __devexit int adnp_i2c_remove(struct i2c_client *client)
582 return 0; 582 return 0;
583} 583}
584 584
585static const struct i2c_device_id adnp_i2c_id[] __devinitconst = { 585static const struct i2c_device_id adnp_i2c_id[] = {
586 { "gpio-adnp" }, 586 { "gpio-adnp" },
587 { }, 587 { },
588}; 588};
589MODULE_DEVICE_TABLE(i2c, adnp_i2c_id); 589MODULE_DEVICE_TABLE(i2c, adnp_i2c_id);
590 590
591static const struct of_device_id adnp_of_match[] __devinitconst = { 591static const struct of_device_id adnp_of_match[] = {
592 { .compatible = "ad,gpio-adnp", }, 592 { .compatible = "ad,gpio-adnp", },
593 { }, 593 { },
594}; 594};
@@ -601,7 +601,7 @@ static struct i2c_driver adnp_i2c_driver = {
601 .of_match_table = of_match_ptr(adnp_of_match), 601 .of_match_table = of_match_ptr(adnp_of_match),
602 }, 602 },
603 .probe = adnp_i2c_probe, 603 .probe = adnp_i2c_probe,
604 .remove = __devexit_p(adnp_i2c_remove), 604 .remove = adnp_i2c_remove,
605 .id_table = adnp_i2c_id, 605 .id_table = adnp_i2c_id,
606}; 606};
607module_i2c_driver(adnp_i2c_driver); 607module_i2c_driver(adnp_i2c_driver);
diff --git a/drivers/gpio/gpio-adp5520.c b/drivers/gpio/gpio-adp5520.c
index 2f263cc32561..8afa95f831b1 100644
--- a/drivers/gpio/gpio-adp5520.c
+++ b/drivers/gpio/gpio-adp5520.c
@@ -87,7 +87,7 @@ static int adp5520_gpio_direction_output(struct gpio_chip *chip,
87 return ret; 87 return ret;
88} 88}
89 89
90static int __devinit adp5520_gpio_probe(struct platform_device *pdev) 90static int adp5520_gpio_probe(struct platform_device *pdev)
91{ 91{
92 struct adp5520_gpio_platform_data *pdata = pdev->dev.platform_data; 92 struct adp5520_gpio_platform_data *pdata = pdev->dev.platform_data;
93 struct adp5520_gpio *dev; 93 struct adp5520_gpio *dev;
@@ -167,7 +167,7 @@ err:
167 return ret; 167 return ret;
168} 168}
169 169
170static int __devexit adp5520_gpio_remove(struct platform_device *pdev) 170static int adp5520_gpio_remove(struct platform_device *pdev)
171{ 171{
172 struct adp5520_gpio *dev; 172 struct adp5520_gpio *dev;
173 int ret; 173 int ret;
@@ -190,7 +190,7 @@ static struct platform_driver adp5520_gpio_driver = {
190 .owner = THIS_MODULE, 190 .owner = THIS_MODULE,
191 }, 191 },
192 .probe = adp5520_gpio_probe, 192 .probe = adp5520_gpio_probe,
193 .remove = __devexit_p(adp5520_gpio_remove), 193 .remove = adp5520_gpio_remove,
194}; 194};
195 195
196module_platform_driver(adp5520_gpio_driver); 196module_platform_driver(adp5520_gpio_driver);
diff --git a/drivers/gpio/gpio-adp5588.c b/drivers/gpio/gpio-adp5588.c
index eeedad42913e..2ba56987db04 100644
--- a/drivers/gpio/gpio-adp5588.c
+++ b/drivers/gpio/gpio-adp5588.c
@@ -346,7 +346,7 @@ static void adp5588_irq_teardown(struct adp5588_gpio *dev)
346} 346}
347#endif /* CONFIG_GPIO_ADP5588_IRQ */ 347#endif /* CONFIG_GPIO_ADP5588_IRQ */
348 348
349static int __devinit adp5588_gpio_probe(struct i2c_client *client, 349static int adp5588_gpio_probe(struct i2c_client *client,
350 const struct i2c_device_id *id) 350 const struct i2c_device_id *id)
351{ 351{
352 struct adp5588_gpio_platform_data *pdata = client->dev.platform_data; 352 struct adp5588_gpio_platform_data *pdata = client->dev.platform_data;
@@ -438,7 +438,7 @@ err:
438 return ret; 438 return ret;
439} 439}
440 440
441static int __devexit adp5588_gpio_remove(struct i2c_client *client) 441static int adp5588_gpio_remove(struct i2c_client *client)
442{ 442{
443 struct adp5588_gpio_platform_data *pdata = client->dev.platform_data; 443 struct adp5588_gpio_platform_data *pdata = client->dev.platform_data;
444 struct adp5588_gpio *dev = i2c_get_clientdata(client); 444 struct adp5588_gpio *dev = i2c_get_clientdata(client);
@@ -479,7 +479,7 @@ static struct i2c_driver adp5588_gpio_driver = {
479 .name = DRV_NAME, 479 .name = DRV_NAME,
480 }, 480 },
481 .probe = adp5588_gpio_probe, 481 .probe = adp5588_gpio_probe,
482 .remove = __devexit_p(adp5588_gpio_remove), 482 .remove = adp5588_gpio_remove,
483 .id_table = adp5588_gpio_id, 483 .id_table = adp5588_gpio_id,
484}; 484};
485 485
diff --git a/drivers/gpio/gpio-arizona.c b/drivers/gpio/gpio-arizona.c
index 8740d2eb06f8..0ea853f68db2 100644
--- a/drivers/gpio/gpio-arizona.c
+++ b/drivers/gpio/gpio-arizona.c
@@ -94,7 +94,7 @@ static struct gpio_chip template_chip = {
94 .can_sleep = 1, 94 .can_sleep = 1,
95}; 95};
96 96
97static int __devinit arizona_gpio_probe(struct platform_device *pdev) 97static int arizona_gpio_probe(struct platform_device *pdev)
98{ 98{
99 struct arizona *arizona = dev_get_drvdata(pdev->dev.parent); 99 struct arizona *arizona = dev_get_drvdata(pdev->dev.parent);
100 struct arizona_pdata *pdata = arizona->dev->platform_data; 100 struct arizona_pdata *pdata = arizona->dev->platform_data;
@@ -141,7 +141,7 @@ err:
141 return ret; 141 return ret;
142} 142}
143 143
144static int __devexit arizona_gpio_remove(struct platform_device *pdev) 144static int arizona_gpio_remove(struct platform_device *pdev)
145{ 145{
146 struct arizona_gpio *arizona_gpio = platform_get_drvdata(pdev); 146 struct arizona_gpio *arizona_gpio = platform_get_drvdata(pdev);
147 147
@@ -152,7 +152,7 @@ static struct platform_driver arizona_gpio_driver = {
152 .driver.name = "arizona-gpio", 152 .driver.name = "arizona-gpio",
153 .driver.owner = THIS_MODULE, 153 .driver.owner = THIS_MODULE,
154 .probe = arizona_gpio_probe, 154 .probe = arizona_gpio_probe,
155 .remove = __devexit_p(arizona_gpio_remove), 155 .remove = arizona_gpio_remove,
156}; 156};
157 157
158module_platform_driver(arizona_gpio_driver); 158module_platform_driver(arizona_gpio_driver);
diff --git a/drivers/gpio/gpio-cs5535.c b/drivers/gpio/gpio-cs5535.c
index 19eda1bbe343..c0a3aeba6f21 100644
--- a/drivers/gpio/gpio-cs5535.c
+++ b/drivers/gpio/gpio-cs5535.c
@@ -300,7 +300,7 @@ static struct cs5535_gpio_chip cs5535_gpio_chip = {
300 }, 300 },
301}; 301};
302 302
303static int __devinit cs5535_gpio_probe(struct platform_device *pdev) 303static int cs5535_gpio_probe(struct platform_device *pdev)
304{ 304{
305 struct resource *res; 305 struct resource *res;
306 int err = -EIO; 306 int err = -EIO;
@@ -355,7 +355,7 @@ done:
355 return err; 355 return err;
356} 356}
357 357
358static int __devexit cs5535_gpio_remove(struct platform_device *pdev) 358static int cs5535_gpio_remove(struct platform_device *pdev)
359{ 359{
360 struct resource *r; 360 struct resource *r;
361 int err; 361 int err;
@@ -378,7 +378,7 @@ static struct platform_driver cs5535_gpio_driver = {
378 .owner = THIS_MODULE, 378 .owner = THIS_MODULE,
379 }, 379 },
380 .probe = cs5535_gpio_probe, 380 .probe = cs5535_gpio_probe,
381 .remove = __devexit_p(cs5535_gpio_remove), 381 .remove = cs5535_gpio_remove,
382}; 382};
383 383
384module_platform_driver(cs5535_gpio_driver); 384module_platform_driver(cs5535_gpio_driver);
diff --git a/drivers/gpio/gpio-da9052.c b/drivers/gpio/gpio-da9052.c
index 24b8c2974047..a05aacd2777a 100644
--- a/drivers/gpio/gpio-da9052.c
+++ b/drivers/gpio/gpio-da9052.c
@@ -188,7 +188,7 @@ static int da9052_gpio_to_irq(struct gpio_chip *gc, u32 offset)
188 return da9052->irq_base + DA9052_IRQ_GPI0 + offset; 188 return da9052->irq_base + DA9052_IRQ_GPI0 + offset;
189} 189}
190 190
191static struct gpio_chip reference_gp __devinitdata = { 191static struct gpio_chip reference_gp = {
192 .label = "da9052-gpio", 192 .label = "da9052-gpio",
193 .owner = THIS_MODULE, 193 .owner = THIS_MODULE,
194 .get = da9052_gpio_get, 194 .get = da9052_gpio_get,
@@ -201,7 +201,7 @@ static struct gpio_chip reference_gp __devinitdata = {
201 .base = -1, 201 .base = -1,
202}; 202};
203 203
204static int __devinit da9052_gpio_probe(struct platform_device *pdev) 204static int da9052_gpio_probe(struct platform_device *pdev)
205{ 205{
206 struct da9052_gpio *gpio; 206 struct da9052_gpio *gpio;
207 struct da9052_pdata *pdata; 207 struct da9052_pdata *pdata;
@@ -229,7 +229,7 @@ static int __devinit da9052_gpio_probe(struct platform_device *pdev)
229 return 0; 229 return 0;
230} 230}
231 231
232static int __devexit da9052_gpio_remove(struct platform_device *pdev) 232static int da9052_gpio_remove(struct platform_device *pdev)
233{ 233{
234 struct da9052_gpio *gpio = platform_get_drvdata(pdev); 234 struct da9052_gpio *gpio = platform_get_drvdata(pdev);
235 235
@@ -238,7 +238,7 @@ static int __devexit da9052_gpio_remove(struct platform_device *pdev)
238 238
239static struct platform_driver da9052_gpio_driver = { 239static struct platform_driver da9052_gpio_driver = {
240 .probe = da9052_gpio_probe, 240 .probe = da9052_gpio_probe,
241 .remove = __devexit_p(da9052_gpio_remove), 241 .remove = da9052_gpio_remove,
242 .driver = { 242 .driver = {
243 .name = "da9052-gpio", 243 .name = "da9052-gpio",
244 .owner = THIS_MODULE, 244 .owner = THIS_MODULE,
diff --git a/drivers/gpio/gpio-em.c b/drivers/gpio/gpio-em.c
index b00706329d26..bdc8302e711a 100644
--- a/drivers/gpio/gpio-em.c
+++ b/drivers/gpio/gpio-em.c
@@ -233,7 +233,7 @@ static struct irq_domain_ops em_gio_irq_domain_ops = {
233 .map = em_gio_irq_domain_map, 233 .map = em_gio_irq_domain_map,
234}; 234};
235 235
236static int __devinit em_gio_probe(struct platform_device *pdev) 236static int em_gio_probe(struct platform_device *pdev)
237{ 237{
238 struct gpio_em_config *pdata = pdev->dev.platform_data; 238 struct gpio_em_config *pdata = pdev->dev.platform_data;
239 struct em_gio_priv *p; 239 struct em_gio_priv *p;
@@ -343,7 +343,7 @@ err0:
343 return ret; 343 return ret;
344} 344}
345 345
346static int __devexit em_gio_remove(struct platform_device *pdev) 346static int em_gio_remove(struct platform_device *pdev)
347{ 347{
348 struct em_gio_priv *p = platform_get_drvdata(pdev); 348 struct em_gio_priv *p = platform_get_drvdata(pdev);
349 struct resource *irq[2]; 349 struct resource *irq[2];
@@ -367,7 +367,7 @@ static int __devexit em_gio_remove(struct platform_device *pdev)
367 367
368static struct platform_driver em_gio_device_driver = { 368static struct platform_driver em_gio_device_driver = {
369 .probe = em_gio_probe, 369 .probe = em_gio_probe,
370 .remove = __devexit_p(em_gio_remove), 370 .remove = em_gio_remove,
371 .driver = { 371 .driver = {
372 .name = "em_gio", 372 .name = "em_gio",
373 } 373 }
diff --git a/drivers/gpio/gpio-ep93xx.c b/drivers/gpio/gpio-ep93xx.c
index 9fe5b8fe9be8..56b98eebe1fc 100644
--- a/drivers/gpio/gpio-ep93xx.c
+++ b/drivers/gpio/gpio-ep93xx.c
@@ -340,7 +340,7 @@ static int ep93xx_gpio_add_bank(struct bgpio_chip *bgc, struct device *dev,
340 return gpiochip_add(&bgc->gc); 340 return gpiochip_add(&bgc->gc);
341} 341}
342 342
343static int __devinit ep93xx_gpio_probe(struct platform_device *pdev) 343static int ep93xx_gpio_probe(struct platform_device *pdev)
344{ 344{
345 struct ep93xx_gpio *ep93xx_gpio; 345 struct ep93xx_gpio *ep93xx_gpio;
346 struct resource *res; 346 struct resource *res;
diff --git a/drivers/gpio/gpio-generic.c b/drivers/gpio/gpio-generic.c
index 82e2e4fe599e..05fcc0f247ca 100644
--- a/drivers/gpio/gpio-generic.c
+++ b/drivers/gpio/gpio-generic.c
@@ -444,7 +444,7 @@ static void __iomem *bgpio_map(struct platform_device *pdev,
444 return ret; 444 return ret;
445} 445}
446 446
447static int __devinit bgpio_pdev_probe(struct platform_device *pdev) 447static int bgpio_pdev_probe(struct platform_device *pdev)
448{ 448{
449 struct device *dev = &pdev->dev; 449 struct device *dev = &pdev->dev;
450 struct resource *r; 450 struct resource *r;
@@ -507,7 +507,7 @@ static int __devinit bgpio_pdev_probe(struct platform_device *pdev)
507 return gpiochip_add(&bgc->gc); 507 return gpiochip_add(&bgc->gc);
508} 508}
509 509
510static int __devexit bgpio_pdev_remove(struct platform_device *pdev) 510static int bgpio_pdev_remove(struct platform_device *pdev)
511{ 511{
512 struct bgpio_chip *bgc = platform_get_drvdata(pdev); 512 struct bgpio_chip *bgc = platform_get_drvdata(pdev);
513 513
@@ -527,7 +527,7 @@ static struct platform_driver bgpio_driver = {
527 }, 527 },
528 .id_table = bgpio_id_table, 528 .id_table = bgpio_id_table,
529 .probe = bgpio_pdev_probe, 529 .probe = bgpio_pdev_probe,
530 .remove = __devexit_p(bgpio_pdev_remove), 530 .remove = bgpio_pdev_remove,
531}; 531};
532 532
533module_platform_driver(bgpio_driver); 533module_platform_driver(bgpio_driver);
diff --git a/drivers/gpio/gpio-ich.c b/drivers/gpio/gpio-ich.c
index d4d617966696..6cc87ac8e019 100644
--- a/drivers/gpio/gpio-ich.c
+++ b/drivers/gpio/gpio-ich.c
@@ -238,7 +238,7 @@ static void ichx_gpio_set(struct gpio_chip *chip, unsigned nr, int val)
238 ichx_write_bit(GPIO_LVL, nr, val, 0); 238 ichx_write_bit(GPIO_LVL, nr, val, 0);
239} 239}
240 240
241static void __devinit ichx_gpiolib_setup(struct gpio_chip *chip) 241static void ichx_gpiolib_setup(struct gpio_chip *chip)
242{ 242{
243 chip->owner = THIS_MODULE; 243 chip->owner = THIS_MODULE;
244 chip->label = DRV_NAME; 244 chip->label = DRV_NAME;
@@ -313,7 +313,7 @@ static struct ichx_desc intel5_desc = {
313 .ngpio = 76, 313 .ngpio = 76,
314}; 314};
315 315
316static int __devinit ichx_gpio_request_regions(struct resource *res_base, 316static int ichx_gpio_request_regions(struct resource *res_base,
317 const char *name, u8 use_gpio) 317 const char *name, u8 use_gpio)
318{ 318{
319 int i; 319 int i;
@@ -353,7 +353,7 @@ static void ichx_gpio_release_regions(struct resource *res_base, u8 use_gpio)
353 } 353 }
354} 354}
355 355
356static int __devinit ichx_gpio_probe(struct platform_device *pdev) 356static int ichx_gpio_probe(struct platform_device *pdev)
357{ 357{
358 struct resource *res_base, *res_pm; 358 struct resource *res_base, *res_pm;
359 int err; 359 int err;
@@ -442,7 +442,7 @@ add_err:
442 return err; 442 return err;
443} 443}
444 444
445static int __devexit ichx_gpio_remove(struct platform_device *pdev) 445static int ichx_gpio_remove(struct platform_device *pdev)
446{ 446{
447 int err; 447 int err;
448 448
@@ -467,7 +467,7 @@ static struct platform_driver ichx_gpio_driver = {
467 .name = DRV_NAME, 467 .name = DRV_NAME,
468 }, 468 },
469 .probe = ichx_gpio_probe, 469 .probe = ichx_gpio_probe,
470 .remove = __devexit_p(ichx_gpio_remove), 470 .remove = ichx_gpio_remove,
471}; 471};
472 472
473module_platform_driver(ichx_gpio_driver); 473module_platform_driver(ichx_gpio_driver);
diff --git a/drivers/gpio/gpio-janz-ttl.c b/drivers/gpio/gpio-janz-ttl.c
index f2f000dd70b3..7d0a04169a35 100644
--- a/drivers/gpio/gpio-janz-ttl.c
+++ b/drivers/gpio/gpio-janz-ttl.c
@@ -108,13 +108,13 @@ static void ttl_set_value(struct gpio_chip *gpio, unsigned offset, int value)
108 spin_unlock(&mod->lock); 108 spin_unlock(&mod->lock);
109} 109}
110 110
111static void __devinit ttl_write_reg(struct ttl_module *mod, u8 reg, u16 val) 111static void ttl_write_reg(struct ttl_module *mod, u8 reg, u16 val)
112{ 112{
113 iowrite16be(reg, &mod->regs->control); 113 iowrite16be(reg, &mod->regs->control);
114 iowrite16be(val, &mod->regs->control); 114 iowrite16be(val, &mod->regs->control);
115} 115}
116 116
117static void __devinit ttl_setup_device(struct ttl_module *mod) 117static void ttl_setup_device(struct ttl_module *mod)
118{ 118{
119 /* reset the device to a known state */ 119 /* reset the device to a known state */
120 iowrite16be(0x0000, &mod->regs->control); 120 iowrite16be(0x0000, &mod->regs->control);
@@ -140,7 +140,7 @@ static void __devinit ttl_setup_device(struct ttl_module *mod)
140 ttl_write_reg(mod, MASTER_CONF_CTL, CONF_PAE | CONF_PBE | CONF_PCE); 140 ttl_write_reg(mod, MASTER_CONF_CTL, CONF_PAE | CONF_PBE | CONF_PCE);
141} 141}
142 142
143static int __devinit ttl_probe(struct platform_device *pdev) 143static int ttl_probe(struct platform_device *pdev)
144{ 144{
145 struct janz_platform_data *pdata; 145 struct janz_platform_data *pdata;
146 struct device *dev = &pdev->dev; 146 struct device *dev = &pdev->dev;
@@ -211,7 +211,7 @@ out_return:
211 return ret; 211 return ret;
212} 212}
213 213
214static int __devexit ttl_remove(struct platform_device *pdev) 214static int ttl_remove(struct platform_device *pdev)
215{ 215{
216 struct ttl_module *mod = platform_get_drvdata(pdev); 216 struct ttl_module *mod = platform_get_drvdata(pdev);
217 struct device *dev = &pdev->dev; 217 struct device *dev = &pdev->dev;
@@ -234,7 +234,7 @@ static struct platform_driver ttl_driver = {
234 .owner = THIS_MODULE, 234 .owner = THIS_MODULE,
235 }, 235 },
236 .probe = ttl_probe, 236 .probe = ttl_probe,
237 .remove = __devexit_p(ttl_remove), 237 .remove = ttl_remove,
238}; 238};
239 239
240module_platform_driver(ttl_driver); 240module_platform_driver(ttl_driver);
diff --git a/drivers/gpio/gpio-langwell.c b/drivers/gpio/gpio-langwell.c
index 202a99207b7d..e77b2b3e94af 100644
--- a/drivers/gpio/gpio-langwell.c
+++ b/drivers/gpio/gpio-langwell.c
@@ -332,7 +332,7 @@ static const struct dev_pm_ops lnw_gpio_pm_ops = {
332 .runtime_idle = lnw_gpio_runtime_idle, 332 .runtime_idle = lnw_gpio_runtime_idle,
333}; 333};
334 334
335static int __devinit lnw_gpio_probe(struct pci_dev *pdev, 335static int lnw_gpio_probe(struct pci_dev *pdev,
336 const struct pci_device_id *id) 336 const struct pci_device_id *id)
337{ 337{
338 void *base; 338 void *base;
@@ -435,7 +435,7 @@ static struct pci_driver lnw_gpio_driver = {
435}; 435};
436 436
437 437
438static int __devinit wp_gpio_probe(struct platform_device *pdev) 438static int wp_gpio_probe(struct platform_device *pdev)
439{ 439{
440 struct lnw_gpio *lnw; 440 struct lnw_gpio *lnw;
441 struct gpio_chip *gc; 441 struct gpio_chip *gc;
@@ -484,7 +484,7 @@ err_kmalloc:
484 return retval; 484 return retval;
485} 485}
486 486
487static int __devexit wp_gpio_remove(struct platform_device *pdev) 487static int wp_gpio_remove(struct platform_device *pdev)
488{ 488{
489 struct lnw_gpio *lnw = platform_get_drvdata(pdev); 489 struct lnw_gpio *lnw = platform_get_drvdata(pdev);
490 int err; 490 int err;
@@ -499,7 +499,7 @@ static int __devexit wp_gpio_remove(struct platform_device *pdev)
499 499
500static struct platform_driver wp_gpio_driver = { 500static struct platform_driver wp_gpio_driver = {
501 .probe = wp_gpio_probe, 501 .probe = wp_gpio_probe,
502 .remove = __devexit_p(wp_gpio_remove), 502 .remove = wp_gpio_remove,
503 .driver = { 503 .driver = {
504 .name = "wp_gpio", 504 .name = "wp_gpio",
505 .owner = THIS_MODULE, 505 .owner = THIS_MODULE,
diff --git a/drivers/gpio/gpio-lpc32xx.c b/drivers/gpio/gpio-lpc32xx.c
index 3644e0dcb3dd..36d7dee07b28 100644
--- a/drivers/gpio/gpio-lpc32xx.c
+++ b/drivers/gpio/gpio-lpc32xx.c
@@ -542,7 +542,7 @@ static int lpc32xx_of_xlate(struct gpio_chip *gc,
542 return gpiospec->args[1]; 542 return gpiospec->args[1];
543} 543}
544 544
545static int __devinit lpc32xx_gpio_probe(struct platform_device *pdev) 545static int lpc32xx_gpio_probe(struct platform_device *pdev)
546{ 546{
547 int i; 547 int i;
548 548
@@ -559,7 +559,7 @@ static int __devinit lpc32xx_gpio_probe(struct platform_device *pdev)
559} 559}
560 560
561#ifdef CONFIG_OF 561#ifdef CONFIG_OF
562static struct of_device_id lpc32xx_gpio_of_match[] __devinitdata = { 562static struct of_device_id lpc32xx_gpio_of_match[] = {
563 { .compatible = "nxp,lpc3220-gpio", }, 563 { .compatible = "nxp,lpc3220-gpio", },
564 { }, 564 { },
565}; 565};
diff --git a/drivers/gpio/gpio-max7300.c b/drivers/gpio/gpio-max7300.c
index a5ca0ab1b372..4b6b9a04e326 100644
--- a/drivers/gpio/gpio-max7300.c
+++ b/drivers/gpio/gpio-max7300.c
@@ -31,7 +31,7 @@ static int max7300_i2c_read(struct device *dev, unsigned int reg)
31 return i2c_smbus_read_byte_data(client, reg); 31 return i2c_smbus_read_byte_data(client, reg);
32} 32}
33 33
34static int __devinit max7300_probe(struct i2c_client *client, 34static int max7300_probe(struct i2c_client *client,
35 const struct i2c_device_id *id) 35 const struct i2c_device_id *id)
36{ 36{
37 struct max7301 *ts; 37 struct max7301 *ts;
@@ -55,7 +55,7 @@ static int __devinit max7300_probe(struct i2c_client *client,
55 return ret; 55 return ret;
56} 56}
57 57
58static int __devexit max7300_remove(struct i2c_client *client) 58static int max7300_remove(struct i2c_client *client)
59{ 59{
60 return __max730x_remove(&client->dev); 60 return __max730x_remove(&client->dev);
61} 61}
@@ -72,7 +72,7 @@ static struct i2c_driver max7300_driver = {
72 .owner = THIS_MODULE, 72 .owner = THIS_MODULE,
73 }, 73 },
74 .probe = max7300_probe, 74 .probe = max7300_probe,
75 .remove = __devexit_p(max7300_remove), 75 .remove = max7300_remove,
76 .id_table = max7300_id, 76 .id_table = max7300_id,
77}; 77};
78 78
diff --git a/drivers/gpio/gpio-max7301.c b/drivers/gpio/gpio-max7301.c
index 741acfcbe761..c6c535c1310e 100644
--- a/drivers/gpio/gpio-max7301.c
+++ b/drivers/gpio/gpio-max7301.c
@@ -50,7 +50,7 @@ static int max7301_spi_read(struct device *dev, unsigned int reg)
50 return word & 0xff; 50 return word & 0xff;
51} 51}
52 52
53static int __devinit max7301_probe(struct spi_device *spi) 53static int max7301_probe(struct spi_device *spi)
54{ 54{
55 struct max7301 *ts; 55 struct max7301 *ts;
56 int ret; 56 int ret;
@@ -75,7 +75,7 @@ static int __devinit max7301_probe(struct spi_device *spi)
75 return ret; 75 return ret;
76} 76}
77 77
78static int __devexit max7301_remove(struct spi_device *spi) 78static int max7301_remove(struct spi_device *spi)
79{ 79{
80 return __max730x_remove(&spi->dev); 80 return __max730x_remove(&spi->dev);
81} 81}
@@ -92,7 +92,7 @@ static struct spi_driver max7301_driver = {
92 .owner = THIS_MODULE, 92 .owner = THIS_MODULE,
93 }, 93 },
94 .probe = max7301_probe, 94 .probe = max7301_probe,
95 .remove = __devexit_p(max7301_remove), 95 .remove = max7301_remove,
96 .id_table = max7301_id, 96 .id_table = max7301_id,
97}; 97};
98 98
diff --git a/drivers/gpio/gpio-max730x.c b/drivers/gpio/gpio-max730x.c
index c4bf86abd4d8..00092342b84c 100644
--- a/drivers/gpio/gpio-max730x.c
+++ b/drivers/gpio/gpio-max730x.c
@@ -160,7 +160,7 @@ static void max7301_set(struct gpio_chip *chip, unsigned offset, int value)
160 mutex_unlock(&ts->lock); 160 mutex_unlock(&ts->lock);
161} 161}
162 162
163int __devinit __max730x_probe(struct max7301 *ts) 163int __max730x_probe(struct max7301 *ts)
164{ 164{
165 struct device *dev = ts->dev; 165 struct device *dev = ts->dev;
166 struct max7301_platform_data *pdata; 166 struct max7301_platform_data *pdata;
@@ -226,7 +226,7 @@ exit_destroy:
226} 226}
227EXPORT_SYMBOL_GPL(__max730x_probe); 227EXPORT_SYMBOL_GPL(__max730x_probe);
228 228
229int __devexit __max730x_remove(struct device *dev) 229int __max730x_remove(struct device *dev)
230{ 230{
231 struct max7301 *ts = dev_get_drvdata(dev); 231 struct max7301 *ts = dev_get_drvdata(dev);
232 int ret; 232 int ret;
diff --git a/drivers/gpio/gpio-max732x.c b/drivers/gpio/gpio-max732x.c
index 9504120812a5..1e0467ce4c37 100644
--- a/drivers/gpio/gpio-max732x.c
+++ b/drivers/gpio/gpio-max732x.c
@@ -526,7 +526,7 @@ static void max732x_irq_teardown(struct max732x_chip *chip)
526} 526}
527#endif 527#endif
528 528
529static int __devinit max732x_setup_gpio(struct max732x_chip *chip, 529static int max732x_setup_gpio(struct max732x_chip *chip,
530 const struct i2c_device_id *id, 530 const struct i2c_device_id *id,
531 unsigned gpio_start) 531 unsigned gpio_start)
532{ 532{
@@ -574,7 +574,7 @@ static int __devinit max732x_setup_gpio(struct max732x_chip *chip,
574 return port; 574 return port;
575} 575}
576 576
577static int __devinit max732x_probe(struct i2c_client *client, 577static int max732x_probe(struct i2c_client *client,
578 const struct i2c_device_id *id) 578 const struct i2c_device_id *id)
579{ 579{
580 struct max732x_platform_data *pdata; 580 struct max732x_platform_data *pdata;
@@ -651,7 +651,7 @@ out_failed:
651 return ret; 651 return ret;
652} 652}
653 653
654static int __devexit max732x_remove(struct i2c_client *client) 654static int max732x_remove(struct i2c_client *client)
655{ 655{
656 struct max732x_platform_data *pdata = client->dev.platform_data; 656 struct max732x_platform_data *pdata = client->dev.platform_data;
657 struct max732x_chip *chip = i2c_get_clientdata(client); 657 struct max732x_chip *chip = i2c_get_clientdata(client);
@@ -690,7 +690,7 @@ static struct i2c_driver max732x_driver = {
690 .owner = THIS_MODULE, 690 .owner = THIS_MODULE,
691 }, 691 },
692 .probe = max732x_probe, 692 .probe = max732x_probe,
693 .remove = __devexit_p(max732x_remove), 693 .remove = max732x_remove,
694 .id_table = max732x_id, 694 .id_table = max732x_id,
695}; 695};
696 696
diff --git a/drivers/gpio/gpio-mc33880.c b/drivers/gpio/gpio-mc33880.c
index 2de57ce5feb6..6a8fdc26ae6a 100644
--- a/drivers/gpio/gpio-mc33880.c
+++ b/drivers/gpio/gpio-mc33880.c
@@ -80,7 +80,7 @@ static void mc33880_set(struct gpio_chip *chip, unsigned offset, int value)
80 mutex_unlock(&mc->lock); 80 mutex_unlock(&mc->lock);
81} 81}
82 82
83static int __devinit mc33880_probe(struct spi_device *spi) 83static int mc33880_probe(struct spi_device *spi)
84{ 84{
85 struct mc33880 *mc; 85 struct mc33880 *mc;
86 struct mc33880_platform_data *pdata; 86 struct mc33880_platform_data *pdata;
@@ -147,7 +147,7 @@ exit_destroy:
147 return ret; 147 return ret;
148} 148}
149 149
150static int __devexit mc33880_remove(struct spi_device *spi) 150static int mc33880_remove(struct spi_device *spi)
151{ 151{
152 struct mc33880 *mc; 152 struct mc33880 *mc;
153 int ret; 153 int ret;
@@ -175,7 +175,7 @@ static struct spi_driver mc33880_driver = {
175 .owner = THIS_MODULE, 175 .owner = THIS_MODULE,
176 }, 176 },
177 .probe = mc33880_probe, 177 .probe = mc33880_probe,
178 .remove = __devexit_p(mc33880_remove), 178 .remove = mc33880_remove,
179}; 179};
180 180
181static int __init mc33880_init(void) 181static int __init mc33880_init(void)
diff --git a/drivers/gpio/gpio-mcp23s08.c b/drivers/gpio/gpio-mcp23s08.c
index ce1c84760076..3cea0ea79e80 100644
--- a/drivers/gpio/gpio-mcp23s08.c
+++ b/drivers/gpio/gpio-mcp23s08.c
@@ -475,7 +475,7 @@ fail:
475 475
476#if IS_ENABLED(CONFIG_I2C) 476#if IS_ENABLED(CONFIG_I2C)
477 477
478static int __devinit mcp230xx_probe(struct i2c_client *client, 478static int mcp230xx_probe(struct i2c_client *client,
479 const struct i2c_device_id *id) 479 const struct i2c_device_id *id)
480{ 480{
481 struct mcp23s08_platform_data *pdata; 481 struct mcp23s08_platform_data *pdata;
@@ -508,7 +508,7 @@ fail:
508 return status; 508 return status;
509} 509}
510 510
511static int __devexit mcp230xx_remove(struct i2c_client *client) 511static int mcp230xx_remove(struct i2c_client *client)
512{ 512{
513 struct mcp23s08 *mcp = i2c_get_clientdata(client); 513 struct mcp23s08 *mcp = i2c_get_clientdata(client);
514 int status; 514 int status;
@@ -533,7 +533,7 @@ static struct i2c_driver mcp230xx_driver = {
533 .owner = THIS_MODULE, 533 .owner = THIS_MODULE,
534 }, 534 },
535 .probe = mcp230xx_probe, 535 .probe = mcp230xx_probe,
536 .remove = __devexit_p(mcp230xx_remove), 536 .remove = mcp230xx_remove,
537 .id_table = mcp230xx_id, 537 .id_table = mcp230xx_id,
538}; 538};
539 539
diff --git a/drivers/gpio/gpio-ml-ioh.c b/drivers/gpio/gpio-ml-ioh.c
index 6a29ee1847be..b73366523fae 100644
--- a/drivers/gpio/gpio-ml-ioh.c
+++ b/drivers/gpio/gpio-ml-ioh.c
@@ -385,7 +385,7 @@ static irqreturn_t ioh_gpio_handler(int irq, void *dev_id)
385 return ret; 385 return ret;
386} 386}
387 387
388static __devinit void ioh_gpio_alloc_generic_chip(struct ioh_gpio *chip, 388static void ioh_gpio_alloc_generic_chip(struct ioh_gpio *chip,
389 unsigned int irq_start, unsigned int num) 389 unsigned int irq_start, unsigned int num)
390{ 390{
391 struct irq_chip_generic *gc; 391 struct irq_chip_generic *gc;
@@ -406,7 +406,7 @@ static __devinit void ioh_gpio_alloc_generic_chip(struct ioh_gpio *chip,
406 IRQ_NOREQUEST | IRQ_NOPROBE, 0); 406 IRQ_NOREQUEST | IRQ_NOPROBE, 0);
407} 407}
408 408
409static int __devinit ioh_gpio_probe(struct pci_dev *pdev, 409static int ioh_gpio_probe(struct pci_dev *pdev,
410 const struct pci_device_id *id) 410 const struct pci_device_id *id)
411{ 411{
412 int ret; 412 int ret;
@@ -517,7 +517,7 @@ err_pci_enable:
517 return ret; 517 return ret;
518} 518}
519 519
520static void __devexit ioh_gpio_remove(struct pci_dev *pdev) 520static void ioh_gpio_remove(struct pci_dev *pdev)
521{ 521{
522 int err; 522 int err;
523 int i; 523 int i;
@@ -606,7 +606,7 @@ static struct pci_driver ioh_gpio_driver = {
606 .name = "ml_ioh_gpio", 606 .name = "ml_ioh_gpio",
607 .id_table = ioh_gpio_pcidev_id, 607 .id_table = ioh_gpio_pcidev_id,
608 .probe = ioh_gpio_probe, 608 .probe = ioh_gpio_probe,
609 .remove = __devexit_p(ioh_gpio_remove), 609 .remove = ioh_gpio_remove,
610 .suspend = ioh_gpio_suspend, 610 .suspend = ioh_gpio_suspend,
611 .resume = ioh_gpio_resume 611 .resume = ioh_gpio_resume
612}; 612};
diff --git a/drivers/gpio/gpio-mpc5200.c b/drivers/gpio/gpio-mpc5200.c
index 2c7cef367fc0..42647f26c9e0 100644
--- a/drivers/gpio/gpio-mpc5200.c
+++ b/drivers/gpio/gpio-mpc5200.c
@@ -148,7 +148,7 @@ mpc52xx_wkup_gpio_dir_out(struct gpio_chip *gc, unsigned int gpio, int val)
148 return 0; 148 return 0;
149} 149}
150 150
151static int __devinit mpc52xx_wkup_gpiochip_probe(struct platform_device *ofdev) 151static int mpc52xx_wkup_gpiochip_probe(struct platform_device *ofdev)
152{ 152{
153 struct mpc52xx_gpiochip *chip; 153 struct mpc52xx_gpiochip *chip;
154 struct mpc52xx_gpio_wkup __iomem *regs; 154 struct mpc52xx_gpio_wkup __iomem *regs;
@@ -308,7 +308,7 @@ mpc52xx_simple_gpio_dir_out(struct gpio_chip *gc, unsigned int gpio, int val)
308 return 0; 308 return 0;
309} 309}
310 310
311static int __devinit mpc52xx_simple_gpiochip_probe(struct platform_device *ofdev) 311static int mpc52xx_simple_gpiochip_probe(struct platform_device *ofdev)
312{ 312{
313 struct mpc52xx_gpiochip *chip; 313 struct mpc52xx_gpiochip *chip;
314 struct gpio_chip *gc; 314 struct gpio_chip *gc;
diff --git a/drivers/gpio/gpio-msic.c b/drivers/gpio/gpio-msic.c
index b38986285868..27ea7b9257ff 100644
--- a/drivers/gpio/gpio-msic.c
+++ b/drivers/gpio/gpio-msic.c
@@ -256,7 +256,7 @@ static void msic_gpio_irq_handler(unsigned irq, struct irq_desc *desc)
256 chip->irq_eoi(data); 256 chip->irq_eoi(data);
257} 257}
258 258
259static int __devinit platform_msic_gpio_probe(struct platform_device *pdev) 259static int platform_msic_gpio_probe(struct platform_device *pdev)
260{ 260{
261 struct device *dev = &pdev->dev; 261 struct device *dev = &pdev->dev;
262 struct intel_msic_gpio_pdata *pdata = dev->platform_data; 262 struct intel_msic_gpio_pdata *pdata = dev->platform_data;
diff --git a/drivers/gpio/gpio-msm-v2.c b/drivers/gpio/gpio-msm-v2.c
index 38305beb4375..55a7e7769af6 100644
--- a/drivers/gpio/gpio-msm-v2.c
+++ b/drivers/gpio/gpio-msm-v2.c
@@ -352,7 +352,7 @@ static struct irq_chip msm_gpio_irq_chip = {
352 .irq_set_wake = msm_gpio_irq_set_wake, 352 .irq_set_wake = msm_gpio_irq_set_wake,
353}; 353};
354 354
355static int __devinit msm_gpio_probe(struct platform_device *dev) 355static int msm_gpio_probe(struct platform_device *dev)
356{ 356{
357 int i, irq, ret; 357 int i, irq, ret;
358 358
@@ -376,7 +376,7 @@ static int __devinit msm_gpio_probe(struct platform_device *dev)
376 return 0; 376 return 0;
377} 377}
378 378
379static int __devexit msm_gpio_remove(struct platform_device *dev) 379static int msm_gpio_remove(struct platform_device *dev)
380{ 380{
381 int ret = gpiochip_remove(&msm_gpio.gpio_chip); 381 int ret = gpiochip_remove(&msm_gpio.gpio_chip);
382 382
@@ -390,7 +390,7 @@ static int __devexit msm_gpio_remove(struct platform_device *dev)
390 390
391static struct platform_driver msm_gpio_driver = { 391static struct platform_driver msm_gpio_driver = {
392 .probe = msm_gpio_probe, 392 .probe = msm_gpio_probe,
393 .remove = __devexit_p(msm_gpio_remove), 393 .remove = msm_gpio_remove,
394 .driver = { 394 .driver = {
395 .name = "msmgpio", 395 .name = "msmgpio",
396 .owner = THIS_MODULE, 396 .owner = THIS_MODULE,
diff --git a/drivers/gpio/gpio-mvebu.c b/drivers/gpio/gpio-mvebu.c
index a515b9294e92..d767b534c4af 100644
--- a/drivers/gpio/gpio-mvebu.c
+++ b/drivers/gpio/gpio-mvebu.c
@@ -482,7 +482,7 @@ static struct platform_device_id mvebu_gpio_ids[] = {
482}; 482};
483MODULE_DEVICE_TABLE(platform, mvebu_gpio_ids); 483MODULE_DEVICE_TABLE(platform, mvebu_gpio_ids);
484 484
485static struct of_device_id mvebu_gpio_of_match[] __devinitdata = { 485static struct of_device_id mvebu_gpio_of_match[] = {
486 { 486 {
487 .compatible = "marvell,orion-gpio", 487 .compatible = "marvell,orion-gpio",
488 .data = (void*) MVEBU_GPIO_SOC_VARIANT_ORION, 488 .data = (void*) MVEBU_GPIO_SOC_VARIANT_ORION,
@@ -501,7 +501,7 @@ static struct of_device_id mvebu_gpio_of_match[] __devinitdata = {
501}; 501};
502MODULE_DEVICE_TABLE(of, mvebu_gpio_of_match); 502MODULE_DEVICE_TABLE(of, mvebu_gpio_of_match);
503 503
504static int __devinit mvebu_gpio_probe(struct platform_device *pdev) 504static int mvebu_gpio_probe(struct platform_device *pdev)
505{ 505{
506 struct mvebu_gpio_chip *mvchip; 506 struct mvebu_gpio_chip *mvchip;
507 const struct of_device_id *match; 507 const struct of_device_id *match;
diff --git a/drivers/gpio/gpio-mxc.c b/drivers/gpio/gpio-mxc.c
index 80f44bb64a87..7877335c4cc8 100644
--- a/drivers/gpio/gpio-mxc.c
+++ b/drivers/gpio/gpio-mxc.c
@@ -356,7 +356,7 @@ static void __init mxc_gpio_init_gc(struct mxc_gpio_port *port, int irq_base)
356 IRQ_NOREQUEST, 0); 356 IRQ_NOREQUEST, 0);
357} 357}
358 358
359static void __devinit mxc_gpio_get_hw(struct platform_device *pdev) 359static void mxc_gpio_get_hw(struct platform_device *pdev)
360{ 360{
361 const struct of_device_id *of_id = 361 const struct of_device_id *of_id =
362 of_match_device(mxc_gpio_dt_ids, &pdev->dev); 362 of_match_device(mxc_gpio_dt_ids, &pdev->dev);
@@ -395,7 +395,7 @@ static int mxc_gpio_to_irq(struct gpio_chip *gc, unsigned offset)
395 return irq_find_mapping(port->domain, offset); 395 return irq_find_mapping(port->domain, offset);
396} 396}
397 397
398static int __devinit mxc_gpio_probe(struct platform_device *pdev) 398static int mxc_gpio_probe(struct platform_device *pdev)
399{ 399{
400 struct device_node *np = pdev->dev.of_node; 400 struct device_node *np = pdev->dev.of_node;
401 struct mxc_gpio_port *port; 401 struct mxc_gpio_port *port;
diff --git a/drivers/gpio/gpio-mxs.c b/drivers/gpio/gpio-mxs.c
index 796fb13e4815..fa2a63cad32e 100644
--- a/drivers/gpio/gpio-mxs.c
+++ b/drivers/gpio/gpio-mxs.c
@@ -214,7 +214,7 @@ static const struct of_device_id mxs_gpio_dt_ids[] = {
214}; 214};
215MODULE_DEVICE_TABLE(of, mxs_gpio_dt_ids); 215MODULE_DEVICE_TABLE(of, mxs_gpio_dt_ids);
216 216
217static int __devinit mxs_gpio_probe(struct platform_device *pdev) 217static int mxs_gpio_probe(struct platform_device *pdev)
218{ 218{
219 const struct of_device_id *of_id = 219 const struct of_device_id *of_id =
220 of_match_device(mxs_gpio_dt_ids, &pdev->dev); 220 of_match_device(mxs_gpio_dt_ids, &pdev->dev);
diff --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c
index d71e5bdf7b97..f1fbedb2a6f9 100644
--- a/drivers/gpio/gpio-omap.c
+++ b/drivers/gpio/gpio-omap.c
@@ -1012,7 +1012,7 @@ static void omap_gpio_mod_init(struct gpio_bank *bank)
1012 dev_err(bank->dev, "Could not get gpio dbck\n"); 1012 dev_err(bank->dev, "Could not get gpio dbck\n");
1013} 1013}
1014 1014
1015static __devinit void 1015static void
1016omap_mpuio_alloc_gc(struct gpio_bank *bank, unsigned int irq_start, 1016omap_mpuio_alloc_gc(struct gpio_bank *bank, unsigned int irq_start,
1017 unsigned int num) 1017 unsigned int num)
1018{ 1018{
@@ -1041,7 +1041,7 @@ omap_mpuio_alloc_gc(struct gpio_bank *bank, unsigned int irq_start,
1041 IRQ_NOREQUEST | IRQ_NOPROBE, 0); 1041 IRQ_NOREQUEST | IRQ_NOPROBE, 0);
1042} 1042}
1043 1043
1044static void __devinit omap_gpio_chip_init(struct gpio_bank *bank) 1044static void omap_gpio_chip_init(struct gpio_bank *bank)
1045{ 1045{
1046 int j; 1046 int j;
1047 static int gpio; 1047 static int gpio;
@@ -1089,7 +1089,7 @@ static void __devinit omap_gpio_chip_init(struct gpio_bank *bank)
1089 1089
1090static const struct of_device_id omap_gpio_match[]; 1090static const struct of_device_id omap_gpio_match[];
1091 1091
1092static int __devinit omap_gpio_probe(struct platform_device *pdev) 1092static int omap_gpio_probe(struct platform_device *pdev)
1093{ 1093{
1094 struct device *dev = &pdev->dev; 1094 struct device *dev = &pdev->dev;
1095 struct device_node *node = dev->of_node; 1095 struct device_node *node = dev->of_node;
diff --git a/drivers/gpio/gpio-pca953x.c b/drivers/gpio/gpio-pca953x.c
index 0c5eaf5f4c90..cc102d25ee24 100644
--- a/drivers/gpio/gpio-pca953x.c
+++ b/drivers/gpio/gpio-pca953x.c
@@ -616,7 +616,7 @@ pca953x_get_alt_pdata(struct i2c_client *client, int *gpio_base, u32 *invert)
616} 616}
617#endif 617#endif
618 618
619static int __devinit device_pca953x_init(struct pca953x_chip *chip, u32 invert) 619static int device_pca953x_init(struct pca953x_chip *chip, u32 invert)
620{ 620{
621 int ret; 621 int ret;
622 622
@@ -635,7 +635,7 @@ out:
635 return ret; 635 return ret;
636} 636}
637 637
638static int __devinit device_pca957x_init(struct pca953x_chip *chip, u32 invert) 638static int device_pca957x_init(struct pca953x_chip *chip, u32 invert)
639{ 639{
640 int ret; 640 int ret;
641 u32 val = 0; 641 u32 val = 0;
@@ -666,7 +666,7 @@ out:
666 return ret; 666 return ret;
667} 667}
668 668
669static int __devinit pca953x_probe(struct i2c_client *client, 669static int pca953x_probe(struct i2c_client *client,
670 const struct i2c_device_id *id) 670 const struct i2c_device_id *id)
671{ 671{
672 struct pca953x_platform_data *pdata; 672 struct pca953x_platform_data *pdata;
diff --git a/drivers/gpio/gpio-pch.c b/drivers/gpio/gpio-pch.c
index e3a14fef79e1..cdf599687cf7 100644
--- a/drivers/gpio/gpio-pch.c
+++ b/drivers/gpio/gpio-pch.c
@@ -326,7 +326,7 @@ static irqreturn_t pch_gpio_handler(int irq, void *dev_id)
326 return ret; 326 return ret;
327} 327}
328 328
329static __devinit void pch_gpio_alloc_generic_chip(struct pch_gpio *chip, 329static void pch_gpio_alloc_generic_chip(struct pch_gpio *chip,
330 unsigned int irq_start, unsigned int num) 330 unsigned int irq_start, unsigned int num)
331{ 331{
332 struct irq_chip_generic *gc; 332 struct irq_chip_generic *gc;
@@ -346,7 +346,7 @@ static __devinit void pch_gpio_alloc_generic_chip(struct pch_gpio *chip,
346 IRQ_NOREQUEST | IRQ_NOPROBE, 0); 346 IRQ_NOREQUEST | IRQ_NOPROBE, 0);
347} 347}
348 348
349static int __devinit pch_gpio_probe(struct pci_dev *pdev, 349static int pch_gpio_probe(struct pci_dev *pdev,
350 const struct pci_device_id *id) 350 const struct pci_device_id *id)
351{ 351{
352 s32 ret; 352 s32 ret;
@@ -443,7 +443,7 @@ err_pci_enable:
443 return ret; 443 return ret;
444} 444}
445 445
446static void __devexit pch_gpio_remove(struct pci_dev *pdev) 446static void pch_gpio_remove(struct pci_dev *pdev)
447{ 447{
448 int err; 448 int err;
449 struct pch_gpio *chip = pci_get_drvdata(pdev); 449 struct pch_gpio *chip = pci_get_drvdata(pdev);
@@ -532,7 +532,7 @@ static struct pci_driver pch_gpio_driver = {
532 .name = "pch_gpio", 532 .name = "pch_gpio",
533 .id_table = pch_gpio_pcidev_id, 533 .id_table = pch_gpio_pcidev_id,
534 .probe = pch_gpio_probe, 534 .probe = pch_gpio_probe,
535 .remove = __devexit_p(pch_gpio_remove), 535 .remove = pch_gpio_remove,
536 .suspend = pch_gpio_suspend, 536 .suspend = pch_gpio_suspend,
537 .resume = pch_gpio_resume 537 .resume = pch_gpio_resume
538}; 538};
diff --git a/drivers/gpio/gpio-pxa.c b/drivers/gpio/gpio-pxa.c
index 98d52cb3fd1a..3e35243c136f 100644
--- a/drivers/gpio/gpio-pxa.c
+++ b/drivers/gpio/gpio-pxa.c
@@ -250,7 +250,7 @@ static int pxa_gpio_of_xlate(struct gpio_chip *gc,
250} 250}
251#endif 251#endif
252 252
253static int __devinit pxa_init_gpio_chip(int gpio_end, 253static int pxa_init_gpio_chip(int gpio_end,
254 int (*set_wake)(unsigned int, unsigned int)) 254 int (*set_wake)(unsigned int, unsigned int))
255{ 255{
256 int i, gpio, nbanks = gpio_to_bank(gpio_end) + 1; 256 int i, gpio, nbanks = gpio_to_bank(gpio_end) + 1;
@@ -490,7 +490,7 @@ const struct irq_domain_ops pxa_irq_domain_ops = {
490 .xlate = irq_domain_xlate_twocell, 490 .xlate = irq_domain_xlate_twocell,
491}; 491};
492 492
493static int __devinit pxa_gpio_probe_dt(struct platform_device *pdev) 493static int pxa_gpio_probe_dt(struct platform_device *pdev)
494{ 494{
495 int ret, nr_banks, nr_gpios; 495 int ret, nr_banks, nr_gpios;
496 struct device_node *prev, *next, *np = pdev->dev.of_node; 496 struct device_node *prev, *next, *np = pdev->dev.of_node;
@@ -537,7 +537,7 @@ err:
537#define pxa_gpio_probe_dt(pdev) (-1) 537#define pxa_gpio_probe_dt(pdev) (-1)
538#endif 538#endif
539 539
540static int __devinit pxa_gpio_probe(struct platform_device *pdev) 540static int pxa_gpio_probe(struct platform_device *pdev)
541{ 541{
542 struct pxa_gpio_chip *c; 542 struct pxa_gpio_chip *c;
543 struct resource *res; 543 struct resource *res;
diff --git a/drivers/gpio/gpio-rc5t583.c b/drivers/gpio/gpio-rc5t583.c
index 08428bf17718..e63d6a397e17 100644
--- a/drivers/gpio/gpio-rc5t583.c
+++ b/drivers/gpio/gpio-rc5t583.c
@@ -111,7 +111,7 @@ static void rc5t583_gpio_free(struct gpio_chip *gc, unsigned offset)
111 rc5t583_set_bits(parent, RC5T583_GPIO_PGSEL, BIT(offset)); 111 rc5t583_set_bits(parent, RC5T583_GPIO_PGSEL, BIT(offset));
112} 112}
113 113
114static int __devinit rc5t583_gpio_probe(struct platform_device *pdev) 114static int rc5t583_gpio_probe(struct platform_device *pdev)
115{ 115{
116 struct rc5t583 *rc5t583 = dev_get_drvdata(pdev->dev.parent); 116 struct rc5t583 *rc5t583 = dev_get_drvdata(pdev->dev.parent);
117 struct rc5t583_platform_data *pdata = dev_get_platdata(rc5t583->dev); 117 struct rc5t583_platform_data *pdata = dev_get_platdata(rc5t583->dev);
@@ -146,7 +146,7 @@ static int __devinit rc5t583_gpio_probe(struct platform_device *pdev)
146 return gpiochip_add(&rc5t583_gpio->gpio_chip); 146 return gpiochip_add(&rc5t583_gpio->gpio_chip);
147} 147}
148 148
149static int __devexit rc5t583_gpio_remove(struct platform_device *pdev) 149static int rc5t583_gpio_remove(struct platform_device *pdev)
150{ 150{
151 struct rc5t583_gpio *rc5t583_gpio = platform_get_drvdata(pdev); 151 struct rc5t583_gpio *rc5t583_gpio = platform_get_drvdata(pdev);
152 152
@@ -159,7 +159,7 @@ static struct platform_driver rc5t583_gpio_driver = {
159 .owner = THIS_MODULE, 159 .owner = THIS_MODULE,
160 }, 160 },
161 .probe = rc5t583_gpio_probe, 161 .probe = rc5t583_gpio_probe,
162 .remove = __devexit_p(rc5t583_gpio_remove), 162 .remove = rc5t583_gpio_remove,
163}; 163};
164 164
165static int __init rc5t583_gpio_init(void) 165static int __init rc5t583_gpio_init(void)
diff --git a/drivers/gpio/gpio-rdc321x.c b/drivers/gpio/gpio-rdc321x.c
index b62d443e9a59..1bf55f67f7a5 100644
--- a/drivers/gpio/gpio-rdc321x.c
+++ b/drivers/gpio/gpio-rdc321x.c
@@ -128,7 +128,7 @@ static int rdc_gpio_direction_input(struct gpio_chip *chip, unsigned gpio)
128/* 128/*
129 * Cache the initial value of both GPIO data registers 129 * Cache the initial value of both GPIO data registers
130 */ 130 */
131static int __devinit rdc321x_gpio_probe(struct platform_device *pdev) 131static int rdc321x_gpio_probe(struct platform_device *pdev)
132{ 132{
133 int err; 133 int err;
134 struct resource *r; 134 struct resource *r;
@@ -206,7 +206,7 @@ out_free:
206 return err; 206 return err;
207} 207}
208 208
209static int __devexit rdc321x_gpio_remove(struct platform_device *pdev) 209static int rdc321x_gpio_remove(struct platform_device *pdev)
210{ 210{
211 int ret; 211 int ret;
212 struct rdc321x_gpio *rdc321x_gpio_dev = platform_get_drvdata(pdev); 212 struct rdc321x_gpio *rdc321x_gpio_dev = platform_get_drvdata(pdev);
@@ -225,7 +225,7 @@ static struct platform_driver rdc321x_gpio_driver = {
225 .driver.name = "rdc321x-gpio", 225 .driver.name = "rdc321x-gpio",
226 .driver.owner = THIS_MODULE, 226 .driver.owner = THIS_MODULE,
227 .probe = rdc321x_gpio_probe, 227 .probe = rdc321x_gpio_probe,
228 .remove = __devexit_p(rdc321x_gpio_remove), 228 .remove = rdc321x_gpio_remove,
229}; 229};
230 230
231module_platform_driver(rdc321x_gpio_driver); 231module_platform_driver(rdc321x_gpio_driver);
diff --git a/drivers/gpio/gpio-sch.c b/drivers/gpio/gpio-sch.c
index 8707d4572a06..edae963f4625 100644
--- a/drivers/gpio/gpio-sch.c
+++ b/drivers/gpio/gpio-sch.c
@@ -185,7 +185,7 @@ static struct gpio_chip sch_gpio_resume = {
185 .set = sch_gpio_resume_set, 185 .set = sch_gpio_resume_set,
186}; 186};
187 187
188static int __devinit sch_gpio_probe(struct platform_device *pdev) 188static int sch_gpio_probe(struct platform_device *pdev)
189{ 189{
190 struct resource *res; 190 struct resource *res;
191 int err, id; 191 int err, id;
@@ -271,7 +271,7 @@ err_sch_gpio_core:
271 return err; 271 return err;
272} 272}
273 273
274static int __devexit sch_gpio_remove(struct platform_device *pdev) 274static int sch_gpio_remove(struct platform_device *pdev)
275{ 275{
276 struct resource *res; 276 struct resource *res;
277 if (gpio_ba) { 277 if (gpio_ba) {
@@ -303,7 +303,7 @@ static struct platform_driver sch_gpio_driver = {
303 .owner = THIS_MODULE, 303 .owner = THIS_MODULE,
304 }, 304 },
305 .probe = sch_gpio_probe, 305 .probe = sch_gpio_probe,
306 .remove = __devexit_p(sch_gpio_remove), 306 .remove = sch_gpio_remove,
307}; 307};
308 308
309module_platform_driver(sch_gpio_driver); 309module_platform_driver(sch_gpio_driver);
diff --git a/drivers/gpio/gpio-sodaville.c b/drivers/gpio/gpio-sodaville.c
index e25f73130b40..88f374ac7753 100644
--- a/drivers/gpio/gpio-sodaville.c
+++ b/drivers/gpio/gpio-sodaville.c
@@ -129,7 +129,7 @@ static struct irq_domain_ops irq_domain_sdv_ops = {
129 .xlate = sdv_xlate, 129 .xlate = sdv_xlate,
130}; 130};
131 131
132static __devinit int sdv_register_irqsupport(struct sdv_gpio_chip_data *sd, 132static int sdv_register_irqsupport(struct sdv_gpio_chip_data *sd,
133 struct pci_dev *pdev) 133 struct pci_dev *pdev)
134{ 134{
135 struct irq_chip_type *ct; 135 struct irq_chip_type *ct;
@@ -186,7 +186,7 @@ out_free_desc:
186 return ret; 186 return ret;
187} 187}
188 188
189static int __devinit sdv_gpio_probe(struct pci_dev *pdev, 189static int sdv_gpio_probe(struct pci_dev *pdev,
190 const struct pci_device_id *pci_id) 190 const struct pci_device_id *pci_id)
191{ 191{
192 struct sdv_gpio_chip_data *sd; 192 struct sdv_gpio_chip_data *sd;
diff --git a/drivers/gpio/gpio-sta2x11.c b/drivers/gpio/gpio-sta2x11.c
index 6064fb376e11..558542552aae 100644
--- a/drivers/gpio/gpio-sta2x11.c
+++ b/drivers/gpio/gpio-sta2x11.c
@@ -320,7 +320,7 @@ static irqreturn_t gsta_gpio_handler(int irq, void *dev_id)
320 return ret; 320 return ret;
321} 321}
322 322
323static __devinit void gsta_alloc_irq_chip(struct gsta_gpio *chip) 323static void gsta_alloc_irq_chip(struct gsta_gpio *chip)
324{ 324{
325 struct irq_chip_generic *gc; 325 struct irq_chip_generic *gc;
326 struct irq_chip_type *ct; 326 struct irq_chip_type *ct;
@@ -353,7 +353,7 @@ static __devinit void gsta_alloc_irq_chip(struct gsta_gpio *chip)
353} 353}
354 354
355/* The platform device used here is instantiated by the MFD device */ 355/* The platform device used here is instantiated by the MFD device */
356static int __devinit gsta_probe(struct platform_device *dev) 356static int gsta_probe(struct platform_device *dev)
357{ 357{
358 int i, err; 358 int i, err;
359 struct pci_dev *pdev; 359 struct pci_dev *pdev;
diff --git a/drivers/gpio/gpio-stmpe.c b/drivers/gpio/gpio-stmpe.c
index 3e1d39895cef..770476a9da87 100644
--- a/drivers/gpio/gpio-stmpe.c
+++ b/drivers/gpio/gpio-stmpe.c
@@ -307,7 +307,7 @@ static const struct irq_domain_ops stmpe_gpio_irq_simple_ops = {
307 .xlate = irq_domain_xlate_twocell, 307 .xlate = irq_domain_xlate_twocell,
308}; 308};
309 309
310static int __devinit stmpe_gpio_irq_init(struct stmpe_gpio *stmpe_gpio) 310static int stmpe_gpio_irq_init(struct stmpe_gpio *stmpe_gpio)
311{ 311{
312 int base = stmpe_gpio->irq_base; 312 int base = stmpe_gpio->irq_base;
313 313
@@ -322,7 +322,7 @@ static int __devinit stmpe_gpio_irq_init(struct stmpe_gpio *stmpe_gpio)
322 return 0; 322 return 0;
323} 323}
324 324
325static int __devinit stmpe_gpio_probe(struct platform_device *pdev) 325static int stmpe_gpio_probe(struct platform_device *pdev)
326{ 326{
327 struct stmpe *stmpe = dev_get_drvdata(pdev->dev.parent); 327 struct stmpe *stmpe = dev_get_drvdata(pdev->dev.parent);
328 struct device_node *np = pdev->dev.of_node; 328 struct device_node *np = pdev->dev.of_node;
@@ -401,7 +401,7 @@ out_free:
401 return ret; 401 return ret;
402} 402}
403 403
404static int __devexit stmpe_gpio_remove(struct platform_device *pdev) 404static int stmpe_gpio_remove(struct platform_device *pdev)
405{ 405{
406 struct stmpe_gpio *stmpe_gpio = platform_get_drvdata(pdev); 406 struct stmpe_gpio *stmpe_gpio = platform_get_drvdata(pdev);
407 struct stmpe *stmpe = stmpe_gpio->stmpe; 407 struct stmpe *stmpe = stmpe_gpio->stmpe;
@@ -434,7 +434,7 @@ static struct platform_driver stmpe_gpio_driver = {
434 .driver.name = "stmpe-gpio", 434 .driver.name = "stmpe-gpio",
435 .driver.owner = THIS_MODULE, 435 .driver.owner = THIS_MODULE,
436 .probe = stmpe_gpio_probe, 436 .probe = stmpe_gpio_probe,
437 .remove = __devexit_p(stmpe_gpio_remove), 437 .remove = stmpe_gpio_remove,
438}; 438};
439 439
440static int __init stmpe_gpio_init(void) 440static int __init stmpe_gpio_init(void)
diff --git a/drivers/gpio/gpio-stp-xway.c b/drivers/gpio/gpio-stp-xway.c
index 8bead0bb6459..85841ee70b17 100644
--- a/drivers/gpio/gpio-stp-xway.c
+++ b/drivers/gpio/gpio-stp-xway.c
@@ -197,7 +197,7 @@ static int xway_stp_hw_init(struct xway_stp *chip)
197 return 0; 197 return 0;
198} 198}
199 199
200static int __devinit xway_stp_probe(struct platform_device *pdev) 200static int xway_stp_probe(struct platform_device *pdev)
201{ 201{
202 struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0); 202 struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
203 const __be32 *shadow, *groups, *dsl, *phy; 203 const __be32 *shadow, *groups, *dsl, *phy;
diff --git a/drivers/gpio/gpio-sx150x.c b/drivers/gpio/gpio-sx150x.c
index eb3e215d2396..796b6c42fa70 100644
--- a/drivers/gpio/gpio-sx150x.c
+++ b/drivers/gpio/gpio-sx150x.c
@@ -575,7 +575,7 @@ static void sx150x_remove_irq_chip(struct sx150x_chip *chip)
575 } 575 }
576} 576}
577 577
578static int __devinit sx150x_probe(struct i2c_client *client, 578static int sx150x_probe(struct i2c_client *client,
579 const struct i2c_device_id *id) 579 const struct i2c_device_id *id)
580{ 580{
581 static const u32 i2c_funcs = I2C_FUNC_SMBUS_BYTE_DATA | 581 static const u32 i2c_funcs = I2C_FUNC_SMBUS_BYTE_DATA |
@@ -622,7 +622,7 @@ probe_fail_pre_gpiochip_add:
622 return rc; 622 return rc;
623} 623}
624 624
625static int __devexit sx150x_remove(struct i2c_client *client) 625static int sx150x_remove(struct i2c_client *client)
626{ 626{
627 struct sx150x_chip *chip; 627 struct sx150x_chip *chip;
628 int rc; 628 int rc;
@@ -646,7 +646,7 @@ static struct i2c_driver sx150x_driver = {
646 .owner = THIS_MODULE 646 .owner = THIS_MODULE
647 }, 647 },
648 .probe = sx150x_probe, 648 .probe = sx150x_probe,
649 .remove = __devexit_p(sx150x_remove), 649 .remove = sx150x_remove,
650 .id_table = sx150x_id, 650 .id_table = sx150x_id,
651}; 651};
652 652
diff --git a/drivers/gpio/gpio-tc3589x.c b/drivers/gpio/gpio-tc3589x.c
index 8c8447c7d2a8..c0595bbf3268 100644
--- a/drivers/gpio/gpio-tc3589x.c
+++ b/drivers/gpio/gpio-tc3589x.c
@@ -309,7 +309,7 @@ static int tc3589x_gpio_irq_init(struct tc3589x_gpio *tc3589x_gpio,
309 return 0; 309 return 0;
310} 310}
311 311
312static int __devinit tc3589x_gpio_probe(struct platform_device *pdev) 312static int tc3589x_gpio_probe(struct platform_device *pdev)
313{ 313{
314 struct tc3589x *tc3589x = dev_get_drvdata(pdev->dev.parent); 314 struct tc3589x *tc3589x = dev_get_drvdata(pdev->dev.parent);
315 struct tc3589x_gpio_platform_data *pdata; 315 struct tc3589x_gpio_platform_data *pdata;
@@ -387,7 +387,7 @@ out_free:
387 return ret; 387 return ret;
388} 388}
389 389
390static int __devexit tc3589x_gpio_remove(struct platform_device *pdev) 390static int tc3589x_gpio_remove(struct platform_device *pdev)
391{ 391{
392 struct tc3589x_gpio *tc3589x_gpio = platform_get_drvdata(pdev); 392 struct tc3589x_gpio *tc3589x_gpio = platform_get_drvdata(pdev);
393 struct tc3589x *tc3589x = tc3589x_gpio->tc3589x; 393 struct tc3589x *tc3589x = tc3589x_gpio->tc3589x;
@@ -417,7 +417,7 @@ static struct platform_driver tc3589x_gpio_driver = {
417 .driver.name = "tc3589x-gpio", 417 .driver.name = "tc3589x-gpio",
418 .driver.owner = THIS_MODULE, 418 .driver.owner = THIS_MODULE,
419 .probe = tc3589x_gpio_probe, 419 .probe = tc3589x_gpio_probe,
420 .remove = __devexit_p(tc3589x_gpio_remove), 420 .remove = tc3589x_gpio_remove,
421}; 421};
422 422
423static int __init tc3589x_gpio_init(void) 423static int __init tc3589x_gpio_init(void)
diff --git a/drivers/gpio/gpio-tegra.c b/drivers/gpio/gpio-tegra.c
index 5389be8c2b51..63cb643d4b5a 100644
--- a/drivers/gpio/gpio-tegra.c
+++ b/drivers/gpio/gpio-tegra.c
@@ -375,7 +375,7 @@ static struct tegra_gpio_soc_config tegra30_gpio_config = {
375 .upper_offset = 0x80, 375 .upper_offset = 0x80,
376}; 376};
377 377
378static struct of_device_id tegra_gpio_of_match[] __devinitdata = { 378static struct of_device_id tegra_gpio_of_match[] = {
379 { .compatible = "nvidia,tegra30-gpio", .data = &tegra30_gpio_config }, 379 { .compatible = "nvidia,tegra30-gpio", .data = &tegra30_gpio_config },
380 { .compatible = "nvidia,tegra20-gpio", .data = &tegra20_gpio_config }, 380 { .compatible = "nvidia,tegra20-gpio", .data = &tegra20_gpio_config },
381 { }, 381 { },
@@ -386,7 +386,7 @@ static struct of_device_id tegra_gpio_of_match[] __devinitdata = {
386 */ 386 */
387static struct lock_class_key gpio_lock_class; 387static struct lock_class_key gpio_lock_class;
388 388
389static int __devinit tegra_gpio_probe(struct platform_device *pdev) 389static int tegra_gpio_probe(struct platform_device *pdev)
390{ 390{
391 const struct of_device_id *match; 391 const struct of_device_id *match;
392 struct tegra_gpio_soc_config *config; 392 struct tegra_gpio_soc_config *config;
diff --git a/drivers/gpio/gpio-timberdale.c b/drivers/gpio/gpio-timberdale.c
index 1a3e2b9b4772..702cca9284f1 100644
--- a/drivers/gpio/gpio-timberdale.c
+++ b/drivers/gpio/gpio-timberdale.c
@@ -222,7 +222,7 @@ static struct irq_chip timbgpio_irqchip = {
222 .irq_set_type = timbgpio_irq_type, 222 .irq_set_type = timbgpio_irq_type,
223}; 223};
224 224
225static int __devinit timbgpio_probe(struct platform_device *pdev) 225static int timbgpio_probe(struct platform_device *pdev)
226{ 226{
227 int err, i; 227 int err, i;
228 struct gpio_chip *gc; 228 struct gpio_chip *gc;
@@ -316,7 +316,7 @@ err_mem:
316 return err; 316 return err;
317} 317}
318 318
319static int __devexit timbgpio_remove(struct platform_device *pdev) 319static int timbgpio_remove(struct platform_device *pdev)
320{ 320{
321 int err; 321 int err;
322 struct timbgpio_platform_data *pdata = pdev->dev.platform_data; 322 struct timbgpio_platform_data *pdata = pdev->dev.platform_data;
diff --git a/drivers/gpio/gpio-tps6586x.c b/drivers/gpio/gpio-tps6586x.c
index 2526b3bb0fae..c1b82da56504 100644
--- a/drivers/gpio/gpio-tps6586x.c
+++ b/drivers/gpio/gpio-tps6586x.c
@@ -80,7 +80,7 @@ static int tps6586x_gpio_output(struct gpio_chip *gc, unsigned offset,
80 val, mask); 80 val, mask);
81} 81}
82 82
83static int __devinit tps6586x_gpio_probe(struct platform_device *pdev) 83static int tps6586x_gpio_probe(struct platform_device *pdev)
84{ 84{
85 struct tps6586x_platform_data *pdata; 85 struct tps6586x_platform_data *pdata;
86 struct tps6586x_gpio *tps6586x_gpio; 86 struct tps6586x_gpio *tps6586x_gpio;
@@ -126,7 +126,7 @@ static int __devinit tps6586x_gpio_probe(struct platform_device *pdev)
126 return ret; 126 return ret;
127} 127}
128 128
129static int __devexit tps6586x_gpio_remove(struct platform_device *pdev) 129static int tps6586x_gpio_remove(struct platform_device *pdev)
130{ 130{
131 struct tps6586x_gpio *tps6586x_gpio = platform_get_drvdata(pdev); 131 struct tps6586x_gpio *tps6586x_gpio = platform_get_drvdata(pdev);
132 132
@@ -137,7 +137,7 @@ static struct platform_driver tps6586x_gpio_driver = {
137 .driver.name = "tps6586x-gpio", 137 .driver.name = "tps6586x-gpio",
138 .driver.owner = THIS_MODULE, 138 .driver.owner = THIS_MODULE,
139 .probe = tps6586x_gpio_probe, 139 .probe = tps6586x_gpio_probe,
140 .remove = __devexit_p(tps6586x_gpio_remove), 140 .remove = tps6586x_gpio_remove,
141}; 141};
142 142
143static int __init tps6586x_gpio_init(void) 143static int __init tps6586x_gpio_init(void)
diff --git a/drivers/gpio/gpio-tps65910.c b/drivers/gpio/gpio-tps65910.c
index 11f29c82253c..5083825a0348 100644
--- a/drivers/gpio/gpio-tps65910.c
+++ b/drivers/gpio/gpio-tps65910.c
@@ -113,7 +113,7 @@ static struct tps65910_board *tps65910_parse_dt_for_gpio(struct device *dev,
113} 113}
114#endif 114#endif
115 115
116static int __devinit tps65910_gpio_probe(struct platform_device *pdev) 116static int tps65910_gpio_probe(struct platform_device *pdev)
117{ 117{
118 struct tps65910 *tps65910 = dev_get_drvdata(pdev->dev.parent); 118 struct tps65910 *tps65910 = dev_get_drvdata(pdev->dev.parent);
119 struct tps65910_board *pdata = dev_get_platdata(tps65910->dev); 119 struct tps65910_board *pdata = dev_get_platdata(tps65910->dev);
@@ -188,7 +188,7 @@ skip_init:
188 return ret; 188 return ret;
189} 189}
190 190
191static int __devexit tps65910_gpio_remove(struct platform_device *pdev) 191static int tps65910_gpio_remove(struct platform_device *pdev)
192{ 192{
193 struct tps65910_gpio *tps65910_gpio = platform_get_drvdata(pdev); 193 struct tps65910_gpio *tps65910_gpio = platform_get_drvdata(pdev);
194 194
@@ -199,7 +199,7 @@ static struct platform_driver tps65910_gpio_driver = {
199 .driver.name = "tps65910-gpio", 199 .driver.name = "tps65910-gpio",
200 .driver.owner = THIS_MODULE, 200 .driver.owner = THIS_MODULE,
201 .probe = tps65910_gpio_probe, 201 .probe = tps65910_gpio_probe,
202 .remove = __devexit_p(tps65910_gpio_remove), 202 .remove = tps65910_gpio_remove,
203}; 203};
204 204
205static int __init tps65910_gpio_init(void) 205static int __init tps65910_gpio_init(void)
diff --git a/drivers/gpio/gpio-tps65912.c b/drivers/gpio/gpio-tps65912.c
index 99106d1e2e55..30a5844a7dca 100644
--- a/drivers/gpio/gpio-tps65912.c
+++ b/drivers/gpio/gpio-tps65912.c
@@ -84,7 +84,7 @@ static struct gpio_chip template_chip = {
84 .base = -1, 84 .base = -1,
85}; 85};
86 86
87static int __devinit tps65912_gpio_probe(struct platform_device *pdev) 87static int tps65912_gpio_probe(struct platform_device *pdev)
88{ 88{
89 struct tps65912 *tps65912 = dev_get_drvdata(pdev->dev.parent); 89 struct tps65912 *tps65912 = dev_get_drvdata(pdev->dev.parent);
90 struct tps65912_board *pdata = tps65912->dev->platform_data; 90 struct tps65912_board *pdata = tps65912->dev->platform_data;
@@ -113,7 +113,7 @@ static int __devinit tps65912_gpio_probe(struct platform_device *pdev)
113 return ret; 113 return ret;
114} 114}
115 115
116static int __devexit tps65912_gpio_remove(struct platform_device *pdev) 116static int tps65912_gpio_remove(struct platform_device *pdev)
117{ 117{
118 struct tps65912_gpio_data *tps65912_gpio = platform_get_drvdata(pdev); 118 struct tps65912_gpio_data *tps65912_gpio = platform_get_drvdata(pdev);
119 119
@@ -126,7 +126,7 @@ static struct platform_driver tps65912_gpio_driver = {
126 .owner = THIS_MODULE, 126 .owner = THIS_MODULE,
127 }, 127 },
128 .probe = tps65912_gpio_probe, 128 .probe = tps65912_gpio_probe,
129 .remove = __devexit_p(tps65912_gpio_remove), 129 .remove = tps65912_gpio_remove,
130}; 130};
131 131
132static int __init tps65912_gpio_init(void) 132static int __init tps65912_gpio_init(void)
diff --git a/drivers/gpio/gpio-twl4030.c b/drivers/gpio/gpio-twl4030.c
index d2138b0fd4ca..00329f2fc05b 100644
--- a/drivers/gpio/gpio-twl4030.c
+++ b/drivers/gpio/gpio-twl4030.c
@@ -353,7 +353,7 @@ static struct gpio_chip twl_gpiochip = {
353 353
354/*----------------------------------------------------------------------*/ 354/*----------------------------------------------------------------------*/
355 355
356static int __devinit gpio_twl4030_pulls(u32 ups, u32 downs) 356static int gpio_twl4030_pulls(u32 ups, u32 downs)
357{ 357{
358 u8 message[6]; 358 u8 message[6];
359 unsigned i, gpio_bit; 359 unsigned i, gpio_bit;
@@ -378,7 +378,7 @@ static int __devinit gpio_twl4030_pulls(u32 ups, u32 downs)
378 REG_GPIOPUPDCTR1, 5); 378 REG_GPIOPUPDCTR1, 5);
379} 379}
380 380
381static int __devinit gpio_twl4030_debounce(u32 debounce, u8 mmc_cd) 381static int gpio_twl4030_debounce(u32 debounce, u8 mmc_cd)
382{ 382{
383 u8 message[4]; 383 u8 message[4];
384 384
@@ -420,7 +420,7 @@ static struct twl4030_gpio_platform_data *of_gpio_twl4030(struct device *dev)
420 return omap_twl_info; 420 return omap_twl_info;
421} 421}
422 422
423static int __devinit gpio_twl4030_probe(struct platform_device *pdev) 423static int gpio_twl4030_probe(struct platform_device *pdev)
424{ 424{
425 struct twl4030_gpio_platform_data *pdata = pdev->dev.platform_data; 425 struct twl4030_gpio_platform_data *pdata = pdev->dev.platform_data;
426 struct device_node *node = pdev->dev.of_node; 426 struct device_node *node = pdev->dev.of_node;
@@ -506,7 +506,7 @@ out:
506 return ret; 506 return ret;
507} 507}
508 508
509/* Cannot use __devexit as gpio_twl4030_probe() calls us */ 509/* Cannot use as gpio_twl4030_probe() calls us */
510static int gpio_twl4030_remove(struct platform_device *pdev) 510static int gpio_twl4030_remove(struct platform_device *pdev)
511{ 511{
512 struct twl4030_gpio_platform_data *pdata = pdev->dev.platform_data; 512 struct twl4030_gpio_platform_data *pdata = pdev->dev.platform_data;
diff --git a/drivers/gpio/gpio-twl6040.c b/drivers/gpio/gpio-twl6040.c
index dd58e8b25043..0be82c6dd796 100644
--- a/drivers/gpio/gpio-twl6040.c
+++ b/drivers/gpio/gpio-twl6040.c
@@ -82,7 +82,7 @@ static struct gpio_chip twl6040gpo_chip = {
82 82
83/*----------------------------------------------------------------------*/ 83/*----------------------------------------------------------------------*/
84 84
85static int __devinit gpo_twl6040_probe(struct platform_device *pdev) 85static int gpo_twl6040_probe(struct platform_device *pdev)
86{ 86{
87 struct twl6040_gpo_data *pdata = pdev->dev.platform_data; 87 struct twl6040_gpo_data *pdata = pdev->dev.platform_data;
88 struct device *twl6040_core_dev = pdev->dev.parent; 88 struct device *twl6040_core_dev = pdev->dev.parent;
@@ -113,7 +113,7 @@ static int __devinit gpo_twl6040_probe(struct platform_device *pdev)
113 return ret; 113 return ret;
114} 114}
115 115
116static int __devexit gpo_twl6040_remove(struct platform_device *pdev) 116static int gpo_twl6040_remove(struct platform_device *pdev)
117{ 117{
118 return gpiochip_remove(&twl6040gpo_chip); 118 return gpiochip_remove(&twl6040gpo_chip);
119} 119}
diff --git a/drivers/gpio/gpio-vr41xx.c b/drivers/gpio/gpio-vr41xx.c
index 82d5c20ad3cb..9902732a382d 100644
--- a/drivers/gpio/gpio-vr41xx.c
+++ b/drivers/gpio/gpio-vr41xx.c
@@ -490,7 +490,7 @@ static struct gpio_chip vr41xx_gpio_chip = {
490 .to_irq = vr41xx_gpio_to_irq, 490 .to_irq = vr41xx_gpio_to_irq,
491}; 491};
492 492
493static int __devinit giu_probe(struct platform_device *pdev) 493static int giu_probe(struct platform_device *pdev)
494{ 494{
495 struct resource *res; 495 struct resource *res;
496 unsigned int trigger, i, pin; 496 unsigned int trigger, i, pin;
@@ -552,7 +552,7 @@ static int __devinit giu_probe(struct platform_device *pdev)
552 return cascade_irq(irq, giu_get_irq); 552 return cascade_irq(irq, giu_get_irq);
553} 553}
554 554
555static int __devexit giu_remove(struct platform_device *pdev) 555static int giu_remove(struct platform_device *pdev)
556{ 556{
557 if (giu_base) { 557 if (giu_base) {
558 iounmap(giu_base); 558 iounmap(giu_base);
@@ -564,7 +564,7 @@ static int __devexit giu_remove(struct platform_device *pdev)
564 564
565static struct platform_driver giu_device_driver = { 565static struct platform_driver giu_device_driver = {
566 .probe = giu_probe, 566 .probe = giu_probe,
567 .remove = __devexit_p(giu_remove), 567 .remove = giu_remove,
568 .driver = { 568 .driver = {
569 .name = "GIU", 569 .name = "GIU",
570 .owner = THIS_MODULE, 570 .owner = THIS_MODULE,
diff --git a/drivers/gpio/gpio-vt8500.c b/drivers/gpio/gpio-vt8500.c
index 9ed2a2b347fa..b53320a16fc8 100644
--- a/drivers/gpio/gpio-vt8500.c
+++ b/drivers/gpio/gpio-vt8500.c
@@ -271,7 +271,7 @@ static struct of_device_id vt8500_gpio_dt_ids[] = {
271 { /* Sentinel */ }, 271 { /* Sentinel */ },
272}; 272};
273 273
274static int __devinit vt8500_gpio_probe(struct platform_device *pdev) 274static int vt8500_gpio_probe(struct platform_device *pdev)
275{ 275{
276 void __iomem *gpio_base; 276 void __iomem *gpio_base;
277 struct device_node *np; 277 struct device_node *np;
diff --git a/drivers/gpio/gpio-vx855.c b/drivers/gpio/gpio-vx855.c
index 76ebfe5ff702..2b7252cb2427 100644
--- a/drivers/gpio/gpio-vx855.c
+++ b/drivers/gpio/gpio-vx855.c
@@ -219,7 +219,7 @@ static void vx855gpio_gpio_setup(struct vx855_gpio *vg)
219} 219}
220 220
221/* This platform device is ordinarily registered by the vx855 mfd driver */ 221/* This platform device is ordinarily registered by the vx855 mfd driver */
222static __devinit int vx855gpio_probe(struct platform_device *pdev) 222static int vx855gpio_probe(struct platform_device *pdev)
223{ 223{
224 struct resource *res_gpi; 224 struct resource *res_gpi;
225 struct resource *res_gpo; 225 struct resource *res_gpo;
@@ -284,7 +284,7 @@ out_release:
284 return ret; 284 return ret;
285} 285}
286 286
287static int __devexit vx855gpio_remove(struct platform_device *pdev) 287static int vx855gpio_remove(struct platform_device *pdev)
288{ 288{
289 struct vx855_gpio *vg = platform_get_drvdata(pdev); 289 struct vx855_gpio *vg = platform_get_drvdata(pdev);
290 struct resource *res; 290 struct resource *res;
@@ -312,7 +312,7 @@ static struct platform_driver vx855gpio_driver = {
312 .owner = THIS_MODULE, 312 .owner = THIS_MODULE,
313 }, 313 },
314 .probe = vx855gpio_probe, 314 .probe = vx855gpio_probe,
315 .remove = __devexit_p(vx855gpio_remove), 315 .remove = vx855gpio_remove,
316}; 316};
317 317
318module_platform_driver(vx855gpio_driver); 318module_platform_driver(vx855gpio_driver);
diff --git a/drivers/gpio/gpio-wm831x.c b/drivers/gpio/gpio-wm831x.c
index b6eda35089d5..2a743e10ecb6 100644
--- a/drivers/gpio/gpio-wm831x.c
+++ b/drivers/gpio/gpio-wm831x.c
@@ -243,7 +243,7 @@ static struct gpio_chip template_chip = {
243 .can_sleep = 1, 243 .can_sleep = 1,
244}; 244};
245 245
246static int __devinit wm831x_gpio_probe(struct platform_device *pdev) 246static int wm831x_gpio_probe(struct platform_device *pdev)
247{ 247{
248 struct wm831x *wm831x = dev_get_drvdata(pdev->dev.parent); 248 struct wm831x *wm831x = dev_get_drvdata(pdev->dev.parent);
249 struct wm831x_pdata *pdata = wm831x->dev->platform_data; 249 struct wm831x_pdata *pdata = wm831x->dev->platform_data;
@@ -275,7 +275,7 @@ static int __devinit wm831x_gpio_probe(struct platform_device *pdev)
275 return ret; 275 return ret;
276} 276}
277 277
278static int __devexit wm831x_gpio_remove(struct platform_device *pdev) 278static int wm831x_gpio_remove(struct platform_device *pdev)
279{ 279{
280 struct wm831x_gpio *wm831x_gpio = platform_get_drvdata(pdev); 280 struct wm831x_gpio *wm831x_gpio = platform_get_drvdata(pdev);
281 281
@@ -286,7 +286,7 @@ static struct platform_driver wm831x_gpio_driver = {
286 .driver.name = "wm831x-gpio", 286 .driver.name = "wm831x-gpio",
287 .driver.owner = THIS_MODULE, 287 .driver.owner = THIS_MODULE,
288 .probe = wm831x_gpio_probe, 288 .probe = wm831x_gpio_probe,
289 .remove = __devexit_p(wm831x_gpio_remove), 289 .remove = wm831x_gpio_remove,
290}; 290};
291 291
292static int __init wm831x_gpio_init(void) 292static int __init wm831x_gpio_init(void)
diff --git a/drivers/gpio/gpio-wm8350.c b/drivers/gpio/gpio-wm8350.c
index fb4293889392..0b598cf3df9d 100644
--- a/drivers/gpio/gpio-wm8350.c
+++ b/drivers/gpio/gpio-wm8350.c
@@ -109,7 +109,7 @@ static struct gpio_chip template_chip = {
109 .can_sleep = 1, 109 .can_sleep = 1,
110}; 110};
111 111
112static int __devinit wm8350_gpio_probe(struct platform_device *pdev) 112static int wm8350_gpio_probe(struct platform_device *pdev)
113{ 113{
114 struct wm8350 *wm8350 = dev_get_drvdata(pdev->dev.parent); 114 struct wm8350 *wm8350 = dev_get_drvdata(pdev->dev.parent);
115 struct wm8350_platform_data *pdata = wm8350->dev->platform_data; 115 struct wm8350_platform_data *pdata = wm8350->dev->platform_data;
@@ -141,7 +141,7 @@ static int __devinit wm8350_gpio_probe(struct platform_device *pdev)
141 return ret; 141 return ret;
142} 142}
143 143
144static int __devexit wm8350_gpio_remove(struct platform_device *pdev) 144static int wm8350_gpio_remove(struct platform_device *pdev)
145{ 145{
146 struct wm8350_gpio_data *wm8350_gpio = platform_get_drvdata(pdev); 146 struct wm8350_gpio_data *wm8350_gpio = platform_get_drvdata(pdev);
147 147
@@ -152,7 +152,7 @@ static struct platform_driver wm8350_gpio_driver = {
152 .driver.name = "wm8350-gpio", 152 .driver.name = "wm8350-gpio",
153 .driver.owner = THIS_MODULE, 153 .driver.owner = THIS_MODULE,
154 .probe = wm8350_gpio_probe, 154 .probe = wm8350_gpio_probe,
155 .remove = __devexit_p(wm8350_gpio_remove), 155 .remove = wm8350_gpio_remove,
156}; 156};
157 157
158static int __init wm8350_gpio_init(void) 158static int __init wm8350_gpio_init(void)
diff --git a/drivers/gpio/gpio-wm8994.c b/drivers/gpio/gpio-wm8994.c
index 1c764e779d80..ae409fd94af7 100644
--- a/drivers/gpio/gpio-wm8994.c
+++ b/drivers/gpio/gpio-wm8994.c
@@ -245,7 +245,7 @@ static struct gpio_chip template_chip = {
245 .can_sleep = 1, 245 .can_sleep = 1,
246}; 246};
247 247
248static int __devinit wm8994_gpio_probe(struct platform_device *pdev) 248static int wm8994_gpio_probe(struct platform_device *pdev)
249{ 249{
250 struct wm8994 *wm8994 = dev_get_drvdata(pdev->dev.parent); 250 struct wm8994 *wm8994 = dev_get_drvdata(pdev->dev.parent);
251 struct wm8994_pdata *pdata = wm8994->dev->platform_data; 251 struct wm8994_pdata *pdata = wm8994->dev->platform_data;
@@ -281,7 +281,7 @@ err:
281 return ret; 281 return ret;
282} 282}
283 283
284static int __devexit wm8994_gpio_remove(struct platform_device *pdev) 284static int wm8994_gpio_remove(struct platform_device *pdev)
285{ 285{
286 struct wm8994_gpio *wm8994_gpio = platform_get_drvdata(pdev); 286 struct wm8994_gpio *wm8994_gpio = platform_get_drvdata(pdev);
287 287
@@ -292,7 +292,7 @@ static struct platform_driver wm8994_gpio_driver = {
292 .driver.name = "wm8994-gpio", 292 .driver.name = "wm8994-gpio",
293 .driver.owner = THIS_MODULE, 293 .driver.owner = THIS_MODULE,
294 .probe = wm8994_gpio_probe, 294 .probe = wm8994_gpio_probe,
295 .remove = __devexit_p(wm8994_gpio_remove), 295 .remove = wm8994_gpio_remove,
296}; 296};
297 297
298static int __init wm8994_gpio_init(void) 298static int __init wm8994_gpio_init(void)
diff --git a/drivers/gpio/gpio-xilinx.c b/drivers/gpio/gpio-xilinx.c
index 79b0fe8a7253..9ae7aa8ca48a 100644
--- a/drivers/gpio/gpio-xilinx.c
+++ b/drivers/gpio/gpio-xilinx.c
@@ -159,7 +159,7 @@ static void xgpio_save_regs(struct of_mm_gpio_chip *mm_gc)
159 * driver data structure. It returns 0, if the driver is bound to the GPIO 159 * driver data structure. It returns 0, if the driver is bound to the GPIO
160 * device, or a negative value if there is an error. 160 * device, or a negative value if there is an error.
161 */ 161 */
162static int __devinit xgpio_of_probe(struct device_node *np) 162static int xgpio_of_probe(struct device_node *np)
163{ 163{
164 struct xgpio_instance *chip; 164 struct xgpio_instance *chip;
165 int status = 0; 165 int status = 0;
@@ -209,7 +209,7 @@ static int __devinit xgpio_of_probe(struct device_node *np)
209 return 0; 209 return 0;
210} 210}
211 211
212static struct of_device_id xgpio_of_match[] __devinitdata = { 212static struct of_device_id xgpio_of_match[] = {
213 { .compatible = "xlnx,xps-gpio-1.00.a", }, 213 { .compatible = "xlnx,xps-gpio-1.00.a", },
214 { /* end of list */ }, 214 { /* end of list */ },
215}; 215};
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-23 14:46:02 -0500