Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Drivers: pinctrl: remove __dev* attributes.

CONFIG_HOTPLUG is going away as an option. As a result, the __dev*
markings need to be removed.

This change removes the use of __devinit, __devexit_p, __devinitdata,
and __devexit from these drivers.

Based on patches originally written by Bill Pemberton, but redone by me
in order to handle some of the coding style issues better, by hand.

Cc: Bill Pemberton <wfp5p@virginia.edu>
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
Cc: Stephen Warren <swarren@wwwdotorg.org>
Cc: Srinidhi Kasagar <srinidhi.kasagar@stericsson.com>
Cc: Barry Song <baohua.song@csr.com>
Cc: Viresh Kumar <viresh.linux@gmail.com>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Cc: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

+114 -120
+4 -4
drivers/pinctrl/mvebu/pinctrl-armada-370.c
··· 367 367 368 368 static struct mvebu_pinctrl_soc_info armada_370_pinctrl_info; 369 369 370 - static struct of_device_id armada_370_pinctrl_of_match[] __devinitdata = { 370 + static struct of_device_id armada_370_pinctrl_of_match[] = { 371 371 { .compatible = "marvell,mv88f6710-pinctrl" }, 372 372 { }, 373 373 }; ··· 382 382 MPP_GPIO_RANGE(2, 64, 64, 2), 383 383 }; 384 384 385 - static int __devinit armada_370_pinctrl_probe(struct platform_device *pdev) 385 + static int armada_370_pinctrl_probe(struct platform_device *pdev) 386 386 { 387 387 struct mvebu_pinctrl_soc_info *soc = &armada_370_pinctrl_info; 388 388 ··· 399 399 return mvebu_pinctrl_probe(pdev); 400 400 } 401 401 402 - static int __devexit armada_370_pinctrl_remove(struct platform_device *pdev) 402 + static int armada_370_pinctrl_remove(struct platform_device *pdev) 403 403 { 404 404 return mvebu_pinctrl_remove(pdev); 405 405 } ··· 411 411 .of_match_table = of_match_ptr(armada_370_pinctrl_of_match), 412 412 }, 413 413 .probe = armada_370_pinctrl_probe, 414 - .remove = __devexit_p(armada_370_pinctrl_remove), 414 + .remove = armada_370_pinctrl_remove, 415 415 }; 416 416 417 417 module_platform_driver(armada_370_pinctrl_driver);
+4 -4
drivers/pinctrl/mvebu/pinctrl-armada-xp.c
··· 349 349 350 350 static struct mvebu_pinctrl_soc_info armada_xp_pinctrl_info; 351 351 352 - static struct of_device_id armada_xp_pinctrl_of_match[] __devinitdata = { 352 + static struct of_device_id armada_xp_pinctrl_of_match[] = { 353 353 { 354 354 .compatible = "marvell,mv78230-pinctrl", 355 355 .data = (void *) V_MV78230, ··· 394 394 MPP_GPIO_RANGE(2, 64, 64, 3), 395 395 }; 396 396 397 - static int __devinit armada_xp_pinctrl_probe(struct platform_device *pdev) 397 + static int armada_xp_pinctrl_probe(struct platform_device *pdev) 398 398 { 399 399 struct mvebu_pinctrl_soc_info *soc = &armada_xp_pinctrl_info; 400 400 const struct of_device_id *match = ··· 446 446 return mvebu_pinctrl_probe(pdev); 447 447 } 448 448 449 - static int __devexit armada_xp_pinctrl_remove(struct platform_device *pdev) 449 + static int armada_xp_pinctrl_remove(struct platform_device *pdev) 450 450 { 451 451 return mvebu_pinctrl_remove(pdev); 452 452 } ··· 458 458 .of_match_table = of_match_ptr(armada_xp_pinctrl_of_match), 459 459 }, 460 460 .probe = armada_xp_pinctrl_probe, 461 - .remove = __devexit_p(armada_xp_pinctrl_remove), 461 + .remove = armada_xp_pinctrl_remove, 462 462 }; 463 463 464 464 module_platform_driver(armada_xp_pinctrl_driver);
+4 -4
drivers/pinctrl/mvebu/pinctrl-dove.c
··· 579 579 580 580 static struct clk *clk; 581 581 582 - static struct of_device_id dove_pinctrl_of_match[] __devinitdata = { 582 + static struct of_device_id dove_pinctrl_of_match[] = { 583 583 { .compatible = "marvell,dove-pinctrl", .data = &dove_pinctrl_info }, 584 584 { } 585 585 }; 586 586 587 - static int __devinit dove_pinctrl_probe(struct platform_device *pdev) 587 + static int dove_pinctrl_probe(struct platform_device *pdev) 588 588 { 589 589 const struct of_device_id *match = 590 590 of_match_device(dove_pinctrl_of_match, &pdev->dev); ··· 601 601 return mvebu_pinctrl_probe(pdev); 602 602 } 603 603 604 - static int __devexit dove_pinctrl_remove(struct platform_device *pdev) 604 + static int dove_pinctrl_remove(struct platform_device *pdev) 605 605 { 606 606 int ret; 607 607 ··· 618 618 .of_match_table = of_match_ptr(dove_pinctrl_of_match), 619 619 }, 620 620 .probe = dove_pinctrl_probe, 621 - .remove = __devexit_p(dove_pinctrl_remove), 621 + .remove = dove_pinctrl_remove, 622 622 }; 623 623 624 624 module_platform_driver(dove_pinctrl_driver);
+4 -4
drivers/pinctrl/mvebu/pinctrl-kirkwood.c
··· 444 444 .ngpioranges = ARRAY_SIZE(mv88f628x_gpio_ranges), 445 445 }; 446 446 447 - static struct of_device_id kirkwood_pinctrl_of_match[] __devinitdata = { 447 + static struct of_device_id kirkwood_pinctrl_of_match[] = { 448 448 { .compatible = "marvell,88f6180-pinctrl", .data = &mv88f6180_info }, 449 449 { .compatible = "marvell,88f6190-pinctrl", .data = &mv88f6190_info }, 450 450 { .compatible = "marvell,88f6192-pinctrl", .data = &mv88f6192_info }, ··· 454 454 { } 455 455 }; 456 456 457 - static int __devinit kirkwood_pinctrl_probe(struct platform_device *pdev) 457 + static int kirkwood_pinctrl_probe(struct platform_device *pdev) 458 458 { 459 459 const struct of_device_id *match = 460 460 of_match_device(kirkwood_pinctrl_of_match, &pdev->dev); ··· 462 462 return mvebu_pinctrl_probe(pdev); 463 463 } 464 464 465 - static int __devexit kirkwood_pinctrl_remove(struct platform_device *pdev) 465 + static int kirkwood_pinctrl_remove(struct platform_device *pdev) 466 466 { 467 467 return mvebu_pinctrl_remove(pdev); 468 468 } ··· 474 474 .of_match_table = of_match_ptr(kirkwood_pinctrl_of_match), 475 475 }, 476 476 .probe = kirkwood_pinctrl_probe, 477 - .remove = __devexit_p(kirkwood_pinctrl_remove), 477 + .remove = kirkwood_pinctrl_remove, 478 478 }; 479 479 480 480 module_platform_driver(kirkwood_pinctrl_driver);
+5 -6
drivers/pinctrl/mvebu/pinctrl-mvebu.c
··· 478 478 .dt_free_map = mvebu_pinctrl_dt_free_map, 479 479 }; 480 480 481 - static int __devinit _add_function(struct mvebu_pinctrl_function *funcs, 482 - const char *name) 481 + static int _add_function(struct mvebu_pinctrl_function *funcs, const char *name) 483 482 { 484 483 while (funcs->num_groups) { 485 484 /* function already there */ ··· 493 494 return 0; 494 495 } 495 496 496 - static int __devinit mvebu_pinctrl_build_functions(struct platform_device *pdev, 497 - struct mvebu_pinctrl *pctl) 497 + static int mvebu_pinctrl_build_functions(struct platform_device *pdev, 498 + struct mvebu_pinctrl *pctl) 498 499 { 499 500 struct mvebu_pinctrl_function *funcs; 500 501 int num = 0; ··· 567 568 return 0; 568 569 } 569 570 570 - int __devinit mvebu_pinctrl_probe(struct platform_device *pdev) 571 + int mvebu_pinctrl_probe(struct platform_device *pdev) 571 572 { 572 573 struct mvebu_pinctrl_soc_info *soc = dev_get_platdata(&pdev->dev); 573 574 struct device_node *np = pdev->dev.of_node; ··· 744 745 return 0; 745 746 } 746 747 747 - int __devexit mvebu_pinctrl_remove(struct platform_device *pdev) 748 + int mvebu_pinctrl_remove(struct platform_device *pdev) 748 749 { 749 750 struct mvebu_pinctrl *pctl = platform_get_drvdata(pdev); 750 751 pinctrl_unregister(pctl->pctldev);
+18 -19
drivers/pinctrl/pinctrl-at91.c
··· 792 792 793 793 static const char *gpio_compat = "atmel,at91rm9200-gpio"; 794 794 795 - static void __devinit at91_pinctrl_child_count(struct at91_pinctrl *info, 796 - struct device_node *np) 795 + static void at91_pinctrl_child_count(struct at91_pinctrl *info, 796 + struct device_node *np) 797 797 { 798 798 struct device_node *child; 799 799 ··· 807 807 } 808 808 } 809 809 810 - static int __devinit at91_pinctrl_mux_mask(struct at91_pinctrl *info, 811 - struct device_node *np) 810 + static int at91_pinctrl_mux_mask(struct at91_pinctrl *info, 811 + struct device_node *np) 812 812 { 813 813 int ret = 0; 814 814 int size; ··· 840 840 return ret; 841 841 } 842 842 843 - static int __devinit at91_pinctrl_parse_groups(struct device_node *np, 844 - struct at91_pin_group *grp, 845 - struct at91_pinctrl *info, 846 - u32 index) 843 + static int at91_pinctrl_parse_groups(struct device_node *np, 844 + struct at91_pin_group *grp, 845 + struct at91_pinctrl *info, u32 index) 847 846 { 848 847 struct at91_pmx_pin *pin; 849 848 int size; ··· 888 889 return 0; 889 890 } 890 891 891 - static int __devinit at91_pinctrl_parse_functions(struct device_node *np, 892 - struct at91_pinctrl *info, u32 index) 892 + static int at91_pinctrl_parse_functions(struct device_node *np, 893 + struct at91_pinctrl *info, u32 index) 893 894 { 894 895 struct device_node *child; 895 896 struct at91_pmx_func *func; ··· 925 926 return 0; 926 927 } 927 928 928 - static struct of_device_id at91_pinctrl_of_match[] __devinitdata = { 929 + static struct of_device_id at91_pinctrl_of_match[] = { 929 930 { .compatible = "atmel,at91sam9x5-pinctrl", .data = &at91sam9x5_ops }, 930 931 { .compatible = "atmel,at91rm9200-pinctrl", .data = &at91rm9200_ops }, 931 932 { /* sentinel */ } 932 933 }; 933 934 934 - static int __devinit at91_pinctrl_probe_dt(struct platform_device *pdev, 935 - struct at91_pinctrl *info) 935 + static int at91_pinctrl_probe_dt(struct platform_device *pdev, 936 + struct at91_pinctrl *info) 936 937 { 937 938 int ret = 0; 938 939 int i, j; ··· 998 999 return 0; 999 1000 } 1000 1001 1001 - static int __devinit at91_pinctrl_probe(struct platform_device *pdev) 1002 + static int at91_pinctrl_probe(struct platform_device *pdev) 1002 1003 { 1003 1004 struct at91_pinctrl *info; 1004 1005 struct pinctrl_pin_desc *pdesc; ··· 1062 1063 return ret; 1063 1064 } 1064 1065 1065 - static int __devexit at91_pinctrl_remove(struct platform_device *pdev) 1066 + static int at91_pinctrl_remove(struct platform_device *pdev) 1066 1067 { 1067 1068 struct at91_pinctrl *info = platform_get_drvdata(pdev); 1068 1069 ··· 1442 1443 .ngpio = MAX_NB_GPIO_PER_BANK, 1443 1444 }; 1444 1445 1445 - static void __devinit at91_gpio_probe_fixup(void) 1446 + static void at91_gpio_probe_fixup(void) 1446 1447 { 1447 1448 unsigned i; 1448 1449 struct at91_gpio_chip *at91_gpio, *last = NULL; ··· 1460 1461 } 1461 1462 } 1462 1463 1463 - static struct of_device_id at91_gpio_of_match[] __devinitdata = { 1464 + static struct of_device_id at91_gpio_of_match[] = { 1464 1465 { .compatible = "atmel,at91sam9x5-gpio", .data = &at91sam9x5_ops, }, 1465 1466 { .compatible = "atmel,at91rm9200-gpio", .data = &at91rm9200_ops }, 1466 1467 { /* sentinel */ } 1467 1468 }; 1468 1469 1469 - static int __devinit at91_gpio_probe(struct platform_device *pdev) 1470 + static int at91_gpio_probe(struct platform_device *pdev) 1470 1471 { 1471 1472 struct device_node *np = pdev->dev.of_node; 1472 1473 struct resource *res; ··· 1608 1609 .of_match_table = of_match_ptr(at91_pinctrl_of_match), 1609 1610 }, 1610 1611 .probe = at91_pinctrl_probe, 1611 - .remove = __devexit_p(at91_pinctrl_remove), 1612 + .remove = at91_pinctrl_remove, 1612 1613 }; 1613 1614 1614 1615 static int __init at91_pinctrl_init(void)
+1 -1
drivers/pinctrl/pinctrl-bcm2835.c
··· 936 936 .npins = BCM2835_NUM_GPIOS, 937 937 }; 938 938 939 - static int __devinit bcm2835_pinctrl_probe(struct platform_device *pdev) 939 + static int bcm2835_pinctrl_probe(struct platform_device *pdev) 940 940 { 941 941 struct device *dev = &pdev->dev; 942 942 struct device_node *np = dev->of_node;
+1 -1
drivers/pinctrl/pinctrl-exynos5440.c
··· 842 842 return 0; 843 843 } 844 844 845 - static int __devinit exynos5440_pinctrl_probe(struct platform_device *pdev) 845 + static int exynos5440_pinctrl_probe(struct platform_device *pdev) 846 846 { 847 847 struct device *dev = &pdev->dev; 848 848 struct exynos5440_pinctrl_priv_data *priv;
+10 -9
drivers/pinctrl/pinctrl-imx.c
··· 425 425 return 0; 426 426 } 427 427 428 - static int __devinit imx_pinctrl_parse_groups(struct device_node *np, 429 - struct imx_pin_group *grp, 430 - struct imx_pinctrl_soc_info *info, 431 - u32 index) 428 + static int imx_pinctrl_parse_groups(struct device_node *np, 429 + struct imx_pin_group *grp, 430 + struct imx_pinctrl_soc_info *info, 431 + u32 index) 432 432 { 433 433 unsigned int pin_func_id; 434 434 int ret, size; ··· 482 482 return 0; 483 483 } 484 484 485 - static int __devinit imx_pinctrl_parse_functions(struct device_node *np, 486 - struct imx_pinctrl_soc_info *info, u32 index) 485 + static int imx_pinctrl_parse_functions(struct device_node *np, 486 + struct imx_pinctrl_soc_info *info, 487 + u32 index) 487 488 { 488 489 struct device_node *child; 489 490 struct imx_pmx_func *func; ··· 518 517 return 0; 519 518 } 520 519 521 - static int __devinit imx_pinctrl_probe_dt(struct platform_device *pdev, 520 + static int imx_pinctrl_probe_dt(struct platform_device *pdev, 522 521 struct imx_pinctrl_soc_info *info) 523 522 { 524 523 struct device_node *np = pdev->dev.of_node; ··· 561 560 return 0; 562 561 } 563 562 564 - int __devinit imx_pinctrl_probe(struct platform_device *pdev, 565 - struct imx_pinctrl_soc_info *info) 563 + int imx_pinctrl_probe(struct platform_device *pdev, 564 + struct imx_pinctrl_soc_info *info) 566 565 { 567 566 struct imx_pinctrl *ipctl; 568 567 struct resource *res;
+1 -1
drivers/pinctrl/pinctrl-imx23.c
··· 267 267 .npins = ARRAY_SIZE(imx23_pins), 268 268 }; 269 269 270 - static int __devinit imx23_pinctrl_probe(struct platform_device *pdev) 270 + static int imx23_pinctrl_probe(struct platform_device *pdev) 271 271 { 272 272 return mxs_pinctrl_probe(pdev, &imx23_pinctrl_data); 273 273 }
+1 -1
drivers/pinctrl/pinctrl-imx28.c
··· 383 383 .npins = ARRAY_SIZE(imx28_pins), 384 384 }; 385 385 386 - static int __devinit imx28_pinctrl_probe(struct platform_device *pdev) 386 + static int imx28_pinctrl_probe(struct platform_device *pdev) 387 387 { 388 388 return mxs_pinctrl_probe(pdev, &imx28_pinctrl_data); 389 389 }
+1 -1
drivers/pinctrl/pinctrl-imx35.c
··· 1564 1564 { /* sentinel */ } 1565 1565 }; 1566 1566 1567 - static int __devinit imx35_pinctrl_probe(struct platform_device *pdev) 1567 + static int imx35_pinctrl_probe(struct platform_device *pdev) 1568 1568 { 1569 1569 return imx_pinctrl_probe(pdev, &imx35_pinctrl_info); 1570 1570 }
+1 -1
drivers/pinctrl/pinctrl-imx51.c
··· 1291 1291 { /* sentinel */ } 1292 1292 }; 1293 1293 1294 - static int __devinit imx51_pinctrl_probe(struct platform_device *pdev) 1294 + static int imx51_pinctrl_probe(struct platform_device *pdev) 1295 1295 { 1296 1296 return imx_pinctrl_probe(pdev, &imx51_pinctrl_info); 1297 1297 }
+1 -1
drivers/pinctrl/pinctrl-imx53.c
··· 1618 1618 { /* sentinel */ } 1619 1619 }; 1620 1620 1621 - static int __devinit imx53_pinctrl_probe(struct platform_device *pdev) 1621 + static int imx53_pinctrl_probe(struct platform_device *pdev) 1622 1622 { 1623 1623 return imx_pinctrl_probe(pdev, &imx53_pinctrl_info); 1624 1624 }
+1 -1
drivers/pinctrl/pinctrl-imx6q.c
··· 2302 2302 { /* sentinel */ } 2303 2303 }; 2304 2304 2305 - static int __devinit imx6q_pinctrl_probe(struct platform_device *pdev) 2305 + static int imx6q_pinctrl_probe(struct platform_device *pdev) 2306 2306 { 2307 2307 return imx_pinctrl_probe(pdev, &imx6q_pinctrl_info); 2308 2308 }
+1 -1
drivers/pinctrl/pinctrl-mmp2.c
··· 686 686 .ds_shift = MMP2_DS_SHIFT, 687 687 }; 688 688 689 - static int __devinit mmp2_pinmux_probe(struct platform_device *pdev) 689 + static int mmp2_pinmux_probe(struct platform_device *pdev) 690 690 { 691 691 return pxa3xx_pinctrl_register(pdev, &mmp2_info); 692 692 }
+7 -7
drivers/pinctrl/pinctrl-mxs.c
··· 335 335 .owner = THIS_MODULE, 336 336 }; 337 337 338 - static int __devinit mxs_pinctrl_parse_group(struct platform_device *pdev, 339 - struct device_node *np, int idx, 340 - const char **out_name) 338 + static int mxs_pinctrl_parse_group(struct platform_device *pdev, 339 + struct device_node *np, int idx, 340 + const char **out_name) 341 341 { 342 342 struct mxs_pinctrl_data *d = platform_get_drvdata(pdev); 343 343 struct mxs_group *g = &d->soc->groups[idx]; ··· 384 384 return 0; 385 385 } 386 386 387 - static int __devinit mxs_pinctrl_probe_dt(struct platform_device *pdev, 388 - struct mxs_pinctrl_data *d) 387 + static int mxs_pinctrl_probe_dt(struct platform_device *pdev, 388 + struct mxs_pinctrl_data *d) 389 389 { 390 390 struct mxs_pinctrl_soc_data *soc = d->soc; 391 391 struct device_node *np = pdev->dev.of_node; ··· 476 476 return 0; 477 477 } 478 478 479 - int __devinit mxs_pinctrl_probe(struct platform_device *pdev, 480 - struct mxs_pinctrl_soc_data *soc) 479 + int mxs_pinctrl_probe(struct platform_device *pdev, 480 + struct mxs_pinctrl_soc_data *soc) 481 481 { 482 482 struct device_node *np = pdev->dev.of_node; 483 483 struct mxs_pinctrl_data *d;
+1 -2
drivers/pinctrl/pinctrl-nomadik-db8500.c
··· 1251 1251 .prcm_gpiocr_registers = db8500_prcm_gpiocr_regs, 1252 1252 }; 1253 1253 1254 - void __devinit 1255 - nmk_pinctrl_db8500_init(const struct nmk_pinctrl_soc_data **soc) 1254 + void nmk_pinctrl_db8500_init(const struct nmk_pinctrl_soc_data **soc) 1256 1255 { 1257 1256 *soc = &nmk_db8500_soc; 1258 1257 }
+1 -2
drivers/pinctrl/pinctrl-nomadik-db8540.c
··· 1260 1260 .prcm_gpiocr_registers = db8540_prcm_gpiocr_regs, 1261 1261 }; 1262 1262 1263 - void __devinit 1264 - nmk_pinctrl_db8540_init(const struct nmk_pinctrl_soc_data **soc) 1263 + void nmk_pinctrl_db8540_init(const struct nmk_pinctrl_soc_data **soc) 1265 1264 { 1266 1265 *soc = &nmk_db8540_soc; 1267 1266 }
+1 -2
drivers/pinctrl/pinctrl-nomadik-stn8815.c
··· 350 350 .ngroups = ARRAY_SIZE(nmk_stn8815_groups), 351 351 }; 352 352 353 - void __devinit 354 - nmk_pinctrl_stn8815_init(const struct nmk_pinctrl_soc_data **soc) 353 + void nmk_pinctrl_stn8815_init(const struct nmk_pinctrl_soc_data **soc) 355 354 { 356 355 *soc = &nmk_stn8815_soc; 357 356 }
+2 -2
drivers/pinctrl/pinctrl-nomadik.c
··· 1306 1306 .xlate = irq_domain_xlate_twocell, 1307 1307 }; 1308 1308 1309 - static int __devinit nmk_gpio_probe(struct platform_device *dev) 1309 + static int nmk_gpio_probe(struct platform_device *dev) 1310 1310 { 1311 1311 struct nmk_gpio_platform_data *pdata = dev->dev.platform_data; 1312 1312 struct device_node *np = dev->dev.of_node; ··· 1846 1846 {}, 1847 1847 }; 1848 1848 1849 - static int __devinit nmk_pinctrl_probe(struct platform_device *pdev) 1849 + static int nmk_pinctrl_probe(struct platform_device *pdev) 1850 1850 { 1851 1851 const struct platform_device_id *platid = platform_get_device_id(pdev); 1852 1852 struct device_node *np = pdev->dev.of_node;
+1 -1
drivers/pinctrl/pinctrl-pxa168.c
··· 615 615 .ds_shift = PXA168_DS_SHIFT, 616 616 }; 617 617 618 - static int __devinit pxa168_pinmux_probe(struct platform_device *pdev) 618 + static int pxa168_pinmux_probe(struct platform_device *pdev) 619 619 { 620 620 return pxa3xx_pinctrl_register(pdev, &pxa168_info); 621 621 }
+1 -1
drivers/pinctrl/pinctrl-pxa910.c
··· 971 971 .ds_shift = PXA910_DS_SHIFT, 972 972 }; 973 973 974 - static int __devinit pxa910_pinmux_probe(struct platform_device *pdev) 974 + static int pxa910_pinmux_probe(struct platform_device *pdev) 975 975 { 976 976 return pxa3xx_pinctrl_register(pdev, &pxa910_info); 977 977 }
+14 -12
drivers/pinctrl/pinctrl-samsung.c
··· 549 549 * Parse the pin names listed in the 'samsung,pins' property and convert it 550 550 * into a list of gpio numbers are create a pin group from it. 551 551 */ 552 - static int __devinit samsung_pinctrl_parse_dt_pins(struct platform_device *pdev, 553 - struct device_node *cfg_np, struct pinctrl_desc *pctl, 554 - unsigned int **pin_list, unsigned int *npins) 552 + static int samsung_pinctrl_parse_dt_pins(struct platform_device *pdev, 553 + struct device_node *cfg_np, 554 + struct pinctrl_desc *pctl, 555 + unsigned int **pin_list, 556 + unsigned int *npins) 555 557 { 556 558 struct device *dev = &pdev->dev; 557 559 struct property *prop; ··· 598 596 * from device node of the pin-controller. A pin group is formed with all 599 597 * the pins listed in the "samsung,pins" property. 600 598 */ 601 - static int __devinit samsung_pinctrl_parse_dt(struct platform_device *pdev, 602 - struct samsung_pinctrl_drv_data *drvdata) 599 + static int samsung_pinctrl_parse_dt(struct platform_device *pdev, 600 + struct samsung_pinctrl_drv_data *drvdata) 603 601 { 604 602 struct device *dev = &pdev->dev; 605 603 struct device_node *dev_np = dev->of_node; ··· 693 691 } 694 692 695 693 /* register the pinctrl interface with the pinctrl subsystem */ 696 - static int __devinit samsung_pinctrl_register(struct platform_device *pdev, 697 - struct samsung_pinctrl_drv_data *drvdata) 694 + static int samsung_pinctrl_register(struct platform_device *pdev, 695 + struct samsung_pinctrl_drv_data *drvdata) 698 696 { 699 697 struct pinctrl_desc *ctrldesc = &drvdata->pctl; 700 698 struct pinctrl_pin_desc *pindesc, *pdesc; ··· 780 778 }; 781 779 782 780 /* register the gpiolib interface with the gpiolib subsystem */ 783 - static int __devinit samsung_gpiolib_register(struct platform_device *pdev, 784 - struct samsung_pinctrl_drv_data *drvdata) 781 + static int samsung_gpiolib_register(struct platform_device *pdev, 782 + struct samsung_pinctrl_drv_data *drvdata) 785 783 { 786 784 struct samsung_pin_ctrl *ctrl = drvdata->ctrl; 787 785 struct samsung_pin_bank *bank = ctrl->pin_banks; ··· 818 816 } 819 817 820 818 /* unregister the gpiolib interface with the gpiolib subsystem */ 821 - static int __devinit samsung_gpiolib_unregister(struct platform_device *pdev, 822 - struct samsung_pinctrl_drv_data *drvdata) 819 + static int samsung_gpiolib_unregister(struct platform_device *pdev, 820 + struct samsung_pinctrl_drv_data *drvdata) 823 821 { 824 822 struct samsung_pin_ctrl *ctrl = drvdata->ctrl; 825 823 struct samsung_pin_bank *bank = ctrl->pin_banks; ··· 883 881 return ctrl; 884 882 } 885 883 886 - static int __devinit samsung_pinctrl_probe(struct platform_device *pdev) 884 + static int samsung_pinctrl_probe(struct platform_device *pdev) 887 885 { 888 886 struct samsung_pinctrl_drv_data *drvdata; 889 887 struct device *dev = &pdev->dev;
+4 -5
drivers/pinctrl/pinctrl-single.c
··· 493 493 * @pcs: pcs driver instance 494 494 * @offset: register offset from base 495 495 */ 496 - static int __devinit pcs_add_pin(struct pcs_device *pcs, unsigned offset) 496 + static int pcs_add_pin(struct pcs_device *pcs, unsigned offset) 497 497 { 498 498 struct pinctrl_pin_desc *pin; 499 499 struct pcs_name *pn; ··· 526 526 * If your hardware needs holes in the address space, then just set 527 527 * up multiple driver instances. 528 528 */ 529 - static int __devinit pcs_allocate_pin_table(struct pcs_device *pcs) 529 + static int pcs_allocate_pin_table(struct pcs_device *pcs) 530 530 { 531 531 int mux_bytes, nr_pins, i; 532 532 ··· 907 907 908 908 static struct of_device_id pcs_of_match[]; 909 909 910 - static int __devinit pcs_add_gpio_range(struct device_node *node, 911 - struct pcs_device *pcs) 910 + static int pcs_add_gpio_range(struct device_node *node, struct pcs_device *pcs) 912 911 { 913 912 struct pcs_gpio_range *gpio; 914 913 struct device_node *child; ··· 950 951 return 0; 951 952 } 952 953 953 - static int __devinit pcs_probe(struct platform_device *pdev) 954 + static int pcs_probe(struct platform_device *pdev) 954 955 { 955 956 struct device_node *np = pdev->dev.of_node; 956 957 const struct of_device_id *match;
+2 -2
drivers/pinctrl/pinctrl-sirf.c
··· 1246 1246 return of_iomap(np, 0); 1247 1247 } 1248 1248 1249 - static int __devinit sirfsoc_pinmux_probe(struct platform_device *pdev) 1249 + static int sirfsoc_pinmux_probe(struct platform_device *pdev) 1250 1250 { 1251 1251 int ret; 1252 1252 struct sirfsoc_pmx *spmx; ··· 1663 1663 .xlate = irq_domain_xlate_twocell, 1664 1664 }; 1665 1665 1666 - static int __devinit sirfsoc_gpio_probe(struct device_node *np) 1666 + static int sirfsoc_gpio_probe(struct device_node *np) 1667 1667 { 1668 1668 int i, err = 0; 1669 1669 struct sirfsoc_gpio_bank *bank;
+1 -1
drivers/pinctrl/pinctrl-tegra.c
··· 687 687 .owner = THIS_MODULE, 688 688 }; 689 689 690 - int __devinit tegra_pinctrl_probe(struct platform_device *pdev, 690 + int tegra_pinctrl_probe(struct platform_device *pdev, 691 691 const struct tegra_pinctrl_soc_data *soc_data) 692 692 { 693 693 struct tegra_pmx *pmx;
+1 -1
drivers/pinctrl/pinctrl-tegra20.c
··· 2856 2856 .ngroups = ARRAY_SIZE(tegra20_groups), 2857 2857 }; 2858 2858 2859 - static int __devinit tegra20_pinctrl_probe(struct platform_device *pdev) 2859 + static int tegra20_pinctrl_probe(struct platform_device *pdev) 2860 2860 { 2861 2861 return tegra_pinctrl_probe(pdev, &tegra20_pinctrl); 2862 2862 }
+1 -1
drivers/pinctrl/pinctrl-tegra30.c
··· 3722 3722 .ngroups = ARRAY_SIZE(tegra30_groups), 3723 3723 }; 3724 3724 3725 - static int __devinit tegra30_pinctrl_probe(struct platform_device *pdev) 3725 + static int tegra30_pinctrl_probe(struct platform_device *pdev) 3726 3726 { 3727 3727 return tegra_pinctrl_probe(pdev, &tegra30_pinctrl); 3728 3728 }
+1 -1
drivers/pinctrl/pinctrl-u300.c
··· 1062 1062 .owner = THIS_MODULE, 1063 1063 }; 1064 1064 1065 - static int __devinit u300_pmx_probe(struct platform_device *pdev) 1065 + static int u300_pmx_probe(struct platform_device *pdev) 1066 1066 { 1067 1067 struct u300_pmx *upmx; 1068 1068 struct resource *res;
+1 -1
drivers/pinctrl/pinctrl-xway.c
··· 674 674 }; 675 675 MODULE_DEVICE_TABLE(of, xway_match); 676 676 677 - static int __devinit pinmux_xway_probe(struct platform_device *pdev) 677 + static int pinmux_xway_probe(struct platform_device *pdev) 678 678 { 679 679 const struct of_device_id *match; 680 680 const struct pinctrl_xway_soc *xway_soc;
+2 -3
drivers/pinctrl/spear/pinctrl-plgpio.c
··· 451 451 return offset + 2; 452 452 } 453 453 454 - static int __devinit plgpio_probe_dt(struct platform_device *pdev, 455 - struct plgpio *plgpio) 454 + static int plgpio_probe_dt(struct platform_device *pdev, struct plgpio *plgpio) 456 455 { 457 456 struct device_node *np = pdev->dev.of_node; 458 457 int ret = -EINVAL; ··· 521 522 end: 522 523 return ret; 523 524 } 524 - static int __devinit plgpio_probe(struct platform_device *pdev) 525 + static int plgpio_probe(struct platform_device *pdev) 525 526 { 526 527 struct device_node *np = pdev->dev.of_node; 527 528 struct plgpio *plgpio;
+5 -6
drivers/pinctrl/spear/pinctrl-spear.c
··· 82 82 return 0; 83 83 } 84 84 85 - void __devinit 86 - pmx_init_gpio_pingroup_addr(struct spear_gpio_pingroup *gpio_pingroup, 87 - unsigned count, u16 reg) 85 + void pmx_init_gpio_pingroup_addr(struct spear_gpio_pingroup *gpio_pingroup, 86 + unsigned count, u16 reg) 88 87 { 89 88 int i, j; 90 89 ··· 92 93 gpio_pingroup[i].muxregs[j].reg = reg; 93 94 } 94 95 95 - void __devinit pmx_init_addr(struct spear_pinctrl_machdata *machdata, u16 reg) 96 + void pmx_init_addr(struct spear_pinctrl_machdata *machdata, u16 reg) 96 97 { 97 98 struct spear_pingroup *pgroup; 98 99 struct spear_modemux *modemux; ··· 357 358 .owner = THIS_MODULE, 358 359 }; 359 360 360 - int __devinit spear_pinctrl_probe(struct platform_device *pdev, 361 - struct spear_pinctrl_machdata *machdata) 361 + int spear_pinctrl_probe(struct platform_device *pdev, 362 + struct spear_pinctrl_machdata *machdata) 362 363 { 363 364 struct device_node *np = pdev->dev.of_node; 364 365 struct resource *res;
+5 -6
drivers/pinctrl/spear/pinctrl-spear.h
··· 192 192 writel_relaxed(val, pmx->vbase + reg); 193 193 } 194 194 195 - void __devinit pmx_init_addr(struct spear_pinctrl_machdata *machdata, u16 reg); 196 - void __devinit 197 - pmx_init_gpio_pingroup_addr(struct spear_gpio_pingroup *gpio_pingroup, 198 - unsigned count, u16 reg); 199 - int __devinit spear_pinctrl_probe(struct platform_device *pdev, 200 - struct spear_pinctrl_machdata *machdata); 195 + void pmx_init_addr(struct spear_pinctrl_machdata *machdata, u16 reg); 196 + void pmx_init_gpio_pingroup_addr(struct spear_gpio_pingroup *gpio_pingroup, 197 + unsigned count, u16 reg); 198 + int spear_pinctrl_probe(struct platform_device *pdev, 199 + struct spear_pinctrl_machdata *machdata); 201 200 int spear_pinctrl_remove(struct platform_device *pdev); 202 201 203 202 #define SPEAR_PIN_0_TO_101 \
+1 -1
drivers/pinctrl/spear/pinctrl-spear1310.c
··· 2699 2699 {}, 2700 2700 }; 2701 2701 2702 - static int __devinit spear1310_pinctrl_probe(struct platform_device *pdev) 2702 + static int spear1310_pinctrl_probe(struct platform_device *pdev) 2703 2703 { 2704 2704 return spear_pinctrl_probe(pdev, &spear1310_machdata); 2705 2705 }
+1 -1
drivers/pinctrl/spear/pinctrl-spear1340.c
··· 2015 2015 {}, 2016 2016 }; 2017 2017 2018 - static int __devinit spear1340_pinctrl_probe(struct platform_device *pdev) 2018 + static int spear1340_pinctrl_probe(struct platform_device *pdev) 2019 2019 { 2020 2020 return spear_pinctrl_probe(pdev, &spear1340_machdata); 2021 2021 }
+1 -1
drivers/pinctrl/spear/pinctrl-spear300.c
··· 653 653 {}, 654 654 }; 655 655 656 - static int __devinit spear300_pinctrl_probe(struct platform_device *pdev) 656 + static int spear300_pinctrl_probe(struct platform_device *pdev) 657 657 { 658 658 int ret; 659 659
+1 -1
drivers/pinctrl/spear/pinctrl-spear310.c
··· 378 378 {}, 379 379 }; 380 380 381 - static int __devinit spear310_pinctrl_probe(struct platform_device *pdev) 381 + static int spear310_pinctrl_probe(struct platform_device *pdev) 382 382 { 383 383 int ret; 384 384
+1 -1
drivers/pinctrl/spear/pinctrl-spear320.c
··· 3417 3417 {}, 3418 3418 }; 3419 3419 3420 - static int __devinit spear320_pinctrl_probe(struct platform_device *pdev) 3420 + static int spear320_pinctrl_probe(struct platform_device *pdev) 3421 3421 { 3422 3422 int ret; 3423 3423