diff options
-rw-r--r-- | drivers/spi/spi-atmel.c | 2 | ||||
-rw-r--r-- | drivers/spi/spi-au1550.c | 8 | ||||
-rw-r--r-- | drivers/spi/spi-bfin5xx.c | 2 | ||||
-rw-r--r-- | drivers/spi/spi-omap-100k.c | 6 | ||||
-rw-r--r-- | drivers/spi/spi-omap-uwire.c | 6 | ||||
-rw-r--r-- | drivers/spi/spi-orion.c | 8 | ||||
-rw-r--r-- | drivers/spi/spi-ppc4xx.c | 6 | ||||
-rw-r--r-- | drivers/spi/spi-s3c64xx.c | 2 | ||||
-rw-r--r-- | drivers/spi/spi-txx9.c | 6 |
9 files changed, 23 insertions, 23 deletions
diff --git a/drivers/spi/spi-atmel.c b/drivers/spi/spi-atmel.c index ab34497bcfee..656d137db253 100644 --- a/drivers/spi/spi-atmel.c +++ b/drivers/spi/spi-atmel.c | |||
@@ -1088,7 +1088,7 @@ static struct platform_driver atmel_spi_driver = { | |||
1088 | .suspend = atmel_spi_suspend, | 1088 | .suspend = atmel_spi_suspend, |
1089 | .resume = atmel_spi_resume, | 1089 | .resume = atmel_spi_resume, |
1090 | .probe = atmel_spi_probe, | 1090 | .probe = atmel_spi_probe, |
1091 | .remove = __exit_p(atmel_spi_remove), | 1091 | .remove = atmel_spi_remove, |
1092 | }; | 1092 | }; |
1093 | module_platform_driver(atmel_spi_driver); | 1093 | module_platform_driver(atmel_spi_driver); |
1094 | 1094 | ||
diff --git a/drivers/spi/spi-au1550.c b/drivers/spi/spi-au1550.c index 4de66d1cfe51..44dd34b6ad09 100644 --- a/drivers/spi/spi-au1550.c +++ b/drivers/spi/spi-au1550.c | |||
@@ -717,7 +717,7 @@ static void au1550_spi_bits_handlers_set(struct au1550_spi *hw, int bpw) | |||
717 | } | 717 | } |
718 | } | 718 | } |
719 | 719 | ||
720 | static void __init au1550_spi_setup_psc_as_spi(struct au1550_spi *hw) | 720 | static void au1550_spi_setup_psc_as_spi(struct au1550_spi *hw) |
721 | { | 721 | { |
722 | u32 stat, cfg; | 722 | u32 stat, cfg; |
723 | 723 | ||
@@ -766,7 +766,7 @@ static void __init au1550_spi_setup_psc_as_spi(struct au1550_spi *hw) | |||
766 | } | 766 | } |
767 | 767 | ||
768 | 768 | ||
769 | static int __init au1550_spi_probe(struct platform_device *pdev) | 769 | static int au1550_spi_probe(struct platform_device *pdev) |
770 | { | 770 | { |
771 | struct au1550_spi *hw; | 771 | struct au1550_spi *hw; |
772 | struct spi_master *master; | 772 | struct spi_master *master; |
@@ -968,7 +968,7 @@ err_nomem: | |||
968 | return err; | 968 | return err; |
969 | } | 969 | } |
970 | 970 | ||
971 | static int __exit au1550_spi_remove(struct platform_device *pdev) | 971 | static int au1550_spi_remove(struct platform_device *pdev) |
972 | { | 972 | { |
973 | struct au1550_spi *hw = platform_get_drvdata(pdev); | 973 | struct au1550_spi *hw = platform_get_drvdata(pdev); |
974 | 974 | ||
@@ -997,7 +997,7 @@ static int __exit au1550_spi_remove(struct platform_device *pdev) | |||
997 | MODULE_ALIAS("platform:au1550-spi"); | 997 | MODULE_ALIAS("platform:au1550-spi"); |
998 | 998 | ||
999 | static struct platform_driver au1550_spi_drv = { | 999 | static struct platform_driver au1550_spi_drv = { |
1000 | .remove = __exit_p(au1550_spi_remove), | 1000 | .remove = au1550_spi_remove, |
1001 | .driver = { | 1001 | .driver = { |
1002 | .name = "au1550-spi", | 1002 | .name = "au1550-spi", |
1003 | .owner = THIS_MODULE, | 1003 | .owner = THIS_MODULE, |
diff --git a/drivers/spi/spi-bfin5xx.c b/drivers/spi/spi-bfin5xx.c index 7d7c9918fffe..317f564c899c 100644 --- a/drivers/spi/spi-bfin5xx.c +++ b/drivers/spi/spi-bfin5xx.c | |||
@@ -1273,7 +1273,7 @@ static int bfin_spi_destroy_queue(struct bfin_spi_master_data *drv_data) | |||
1273 | return 0; | 1273 | return 0; |
1274 | } | 1274 | } |
1275 | 1275 | ||
1276 | static int __init bfin_spi_probe(struct platform_device *pdev) | 1276 | static int bfin_spi_probe(struct platform_device *pdev) |
1277 | { | 1277 | { |
1278 | struct device *dev = &pdev->dev; | 1278 | struct device *dev = &pdev->dev; |
1279 | struct bfin5xx_spi_master *platform_info; | 1279 | struct bfin5xx_spi_master *platform_info; |
diff --git a/drivers/spi/spi-omap-100k.c b/drivers/spi/spi-omap-100k.c index 3aef7fa7d5b8..78d29a18dcc4 100644 --- a/drivers/spi/spi-omap-100k.c +++ b/drivers/spi/spi-omap-100k.c | |||
@@ -481,7 +481,7 @@ static int omap1_spi100k_transfer(struct spi_device *spi, struct spi_message *m) | |||
481 | return 0; | 481 | return 0; |
482 | } | 482 | } |
483 | 483 | ||
484 | static int __init omap1_spi100k_reset(struct omap1_spi100k *spi100k) | 484 | static int omap1_spi100k_reset(struct omap1_spi100k *spi100k) |
485 | { | 485 | { |
486 | return 0; | 486 | return 0; |
487 | } | 487 | } |
@@ -560,7 +560,7 @@ err1: | |||
560 | return status; | 560 | return status; |
561 | } | 561 | } |
562 | 562 | ||
563 | static int __exit omap1_spi100k_remove(struct platform_device *pdev) | 563 | static int omap1_spi100k_remove(struct platform_device *pdev) |
564 | { | 564 | { |
565 | struct spi_master *master; | 565 | struct spi_master *master; |
566 | struct omap1_spi100k *spi100k; | 566 | struct omap1_spi100k *spi100k; |
@@ -604,7 +604,7 @@ static struct platform_driver omap1_spi100k_driver = { | |||
604 | .name = "omap1_spi100k", | 604 | .name = "omap1_spi100k", |
605 | .owner = THIS_MODULE, | 605 | .owner = THIS_MODULE, |
606 | }, | 606 | }, |
607 | .remove = __exit_p(omap1_spi100k_remove), | 607 | .remove = omap1_spi100k_remove, |
608 | }; | 608 | }; |
609 | 609 | ||
610 | 610 | ||
diff --git a/drivers/spi/spi-omap-uwire.c b/drivers/spi/spi-omap-uwire.c index 0a94d9dc9c31..102b233b50c4 100644 --- a/drivers/spi/spi-omap-uwire.c +++ b/drivers/spi/spi-omap-uwire.c | |||
@@ -476,7 +476,7 @@ static void uwire_off(struct uwire_spi *uwire) | |||
476 | spi_master_put(uwire->bitbang.master); | 476 | spi_master_put(uwire->bitbang.master); |
477 | } | 477 | } |
478 | 478 | ||
479 | static int __init uwire_probe(struct platform_device *pdev) | 479 | static int uwire_probe(struct platform_device *pdev) |
480 | { | 480 | { |
481 | struct spi_master *master; | 481 | struct spi_master *master; |
482 | struct uwire_spi *uwire; | 482 | struct uwire_spi *uwire; |
@@ -536,7 +536,7 @@ static int __init uwire_probe(struct platform_device *pdev) | |||
536 | return status; | 536 | return status; |
537 | } | 537 | } |
538 | 538 | ||
539 | static int __exit uwire_remove(struct platform_device *pdev) | 539 | static int uwire_remove(struct platform_device *pdev) |
540 | { | 540 | { |
541 | struct uwire_spi *uwire = dev_get_drvdata(&pdev->dev); | 541 | struct uwire_spi *uwire = dev_get_drvdata(&pdev->dev); |
542 | int status; | 542 | int status; |
@@ -557,7 +557,7 @@ static struct platform_driver uwire_driver = { | |||
557 | .name = "omap_uwire", | 557 | .name = "omap_uwire", |
558 | .owner = THIS_MODULE, | 558 | .owner = THIS_MODULE, |
559 | }, | 559 | }, |
560 | .remove = __exit_p(uwire_remove), | 560 | .remove = uwire_remove, |
561 | // suspend ... unuse ck | 561 | // suspend ... unuse ck |
562 | // resume ... use ck | 562 | // resume ... use ck |
563 | }; | 563 | }; |
diff --git a/drivers/spi/spi-orion.c b/drivers/spi/spi-orion.c index b7e718254b1d..6a3cdc7cfeaf 100644 --- a/drivers/spi/spi-orion.c +++ b/drivers/spi/spi-orion.c | |||
@@ -366,7 +366,7 @@ msg_done: | |||
366 | return 0; | 366 | return 0; |
367 | } | 367 | } |
368 | 368 | ||
369 | static int __init orion_spi_reset(struct orion_spi *orion_spi) | 369 | static int orion_spi_reset(struct orion_spi *orion_spi) |
370 | { | 370 | { |
371 | /* Verify that the CS is deasserted */ | 371 | /* Verify that the CS is deasserted */ |
372 | orion_spi_set_cs(orion_spi, 0); | 372 | orion_spi_set_cs(orion_spi, 0); |
@@ -396,7 +396,7 @@ static int orion_spi_setup(struct spi_device *spi) | |||
396 | return 0; | 396 | return 0; |
397 | } | 397 | } |
398 | 398 | ||
399 | static int __init orion_spi_probe(struct platform_device *pdev) | 399 | static int orion_spi_probe(struct platform_device *pdev) |
400 | { | 400 | { |
401 | struct spi_master *master; | 401 | struct spi_master *master; |
402 | struct orion_spi *spi; | 402 | struct orion_spi *spi; |
@@ -479,7 +479,7 @@ out: | |||
479 | } | 479 | } |
480 | 480 | ||
481 | 481 | ||
482 | static int __exit orion_spi_remove(struct platform_device *pdev) | 482 | static int orion_spi_remove(struct platform_device *pdev) |
483 | { | 483 | { |
484 | struct spi_master *master; | 484 | struct spi_master *master; |
485 | struct resource *r; | 485 | struct resource *r; |
@@ -513,7 +513,7 @@ static struct platform_driver orion_spi_driver = { | |||
513 | .owner = THIS_MODULE, | 513 | .owner = THIS_MODULE, |
514 | .of_match_table = of_match_ptr(orion_spi_of_match_table), | 514 | .of_match_table = of_match_ptr(orion_spi_of_match_table), |
515 | }, | 515 | }, |
516 | .remove = __exit_p(orion_spi_remove), | 516 | .remove = orion_spi_remove, |
517 | }; | 517 | }; |
518 | 518 | ||
519 | static int __init orion_spi_init(void) | 519 | static int __init orion_spi_init(void) |
diff --git a/drivers/spi/spi-ppc4xx.c b/drivers/spi/spi-ppc4xx.c index 7a85f22b6474..424b333fab18 100644 --- a/drivers/spi/spi-ppc4xx.c +++ b/drivers/spi/spi-ppc4xx.c | |||
@@ -389,7 +389,7 @@ static void free_gpios(struct ppc4xx_spi *hw) | |||
389 | /* | 389 | /* |
390 | * platform_device layer stuff... | 390 | * platform_device layer stuff... |
391 | */ | 391 | */ |
392 | static int __init spi_ppc4xx_of_probe(struct platform_device *op) | 392 | static int spi_ppc4xx_of_probe(struct platform_device *op) |
393 | { | 393 | { |
394 | struct ppc4xx_spi *hw; | 394 | struct ppc4xx_spi *hw; |
395 | struct spi_master *master; | 395 | struct spi_master *master; |
@@ -560,7 +560,7 @@ free_master: | |||
560 | return ret; | 560 | return ret; |
561 | } | 561 | } |
562 | 562 | ||
563 | static int __exit spi_ppc4xx_of_remove(struct platform_device *op) | 563 | static int spi_ppc4xx_of_remove(struct platform_device *op) |
564 | { | 564 | { |
565 | struct spi_master *master = dev_get_drvdata(&op->dev); | 565 | struct spi_master *master = dev_get_drvdata(&op->dev); |
566 | struct ppc4xx_spi *hw = spi_master_get_devdata(master); | 566 | struct ppc4xx_spi *hw = spi_master_get_devdata(master); |
@@ -583,7 +583,7 @@ MODULE_DEVICE_TABLE(of, spi_ppc4xx_of_match); | |||
583 | 583 | ||
584 | static struct platform_driver spi_ppc4xx_of_driver = { | 584 | static struct platform_driver spi_ppc4xx_of_driver = { |
585 | .probe = spi_ppc4xx_of_probe, | 585 | .probe = spi_ppc4xx_of_probe, |
586 | .remove = __exit_p(spi_ppc4xx_of_remove), | 586 | .remove = spi_ppc4xx_of_remove, |
587 | .driver = { | 587 | .driver = { |
588 | .name = DRIVER_NAME, | 588 | .name = DRIVER_NAME, |
589 | .owner = THIS_MODULE, | 589 | .owner = THIS_MODULE, |
diff --git a/drivers/spi/spi-s3c64xx.c b/drivers/spi/spi-s3c64xx.c index d8928d0592df..8f492ed317cc 100644 --- a/drivers/spi/spi-s3c64xx.c +++ b/drivers/spi/spi-s3c64xx.c | |||
@@ -1191,7 +1191,7 @@ static inline struct s3c64xx_spi_port_config *s3c64xx_spi_get_port_config( | |||
1191 | platform_get_device_id(pdev)->driver_data; | 1191 | platform_get_device_id(pdev)->driver_data; |
1192 | } | 1192 | } |
1193 | 1193 | ||
1194 | static int __init s3c64xx_spi_probe(struct platform_device *pdev) | 1194 | static int s3c64xx_spi_probe(struct platform_device *pdev) |
1195 | { | 1195 | { |
1196 | struct resource *mem_res; | 1196 | struct resource *mem_res; |
1197 | struct s3c64xx_spi_driver_data *sdd; | 1197 | struct s3c64xx_spi_driver_data *sdd; |
diff --git a/drivers/spi/spi-txx9.c b/drivers/spi/spi-txx9.c index 550b5f48fd8f..adb853047926 100644 --- a/drivers/spi/spi-txx9.c +++ b/drivers/spi/spi-txx9.c | |||
@@ -335,7 +335,7 @@ static int txx9spi_transfer(struct spi_device *spi, struct spi_message *m) | |||
335 | return 0; | 335 | return 0; |
336 | } | 336 | } |
337 | 337 | ||
338 | static int __init txx9spi_probe(struct platform_device *dev) | 338 | static int txx9spi_probe(struct platform_device *dev) |
339 | { | 339 | { |
340 | struct spi_master *master; | 340 | struct spi_master *master; |
341 | struct txx9spi *c; | 341 | struct txx9spi *c; |
@@ -430,7 +430,7 @@ exit: | |||
430 | return ret; | 430 | return ret; |
431 | } | 431 | } |
432 | 432 | ||
433 | static int __exit txx9spi_remove(struct platform_device *dev) | 433 | static int txx9spi_remove(struct platform_device *dev) |
434 | { | 434 | { |
435 | struct spi_master *master = spi_master_get(platform_get_drvdata(dev)); | 435 | struct spi_master *master = spi_master_get(platform_get_drvdata(dev)); |
436 | struct txx9spi *c = spi_master_get_devdata(master); | 436 | struct txx9spi *c = spi_master_get_devdata(master); |
@@ -448,7 +448,7 @@ static int __exit txx9spi_remove(struct platform_device *dev) | |||
448 | MODULE_ALIAS("platform:spi_txx9"); | 448 | MODULE_ALIAS("platform:spi_txx9"); |
449 | 449 | ||
450 | static struct platform_driver txx9spi_driver = { | 450 | static struct platform_driver txx9spi_driver = { |
451 | .remove = __exit_p(txx9spi_remove), | 451 | .remove = txx9spi_remove, |
452 | .driver = { | 452 | .driver = { |
453 | .name = "spi_txx9", | 453 | .name = "spi_txx9", |
454 | .owner = THIS_MODULE, | 454 | .owner = THIS_MODULE, |