aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@secretlab.ca>2012-12-07 11:57:14 -0500
committerGrant Likely <grant.likely@secretlab.ca>2012-12-07 12:06:43 -0500
commitfd4a319bc933ae93e68935b21924a9ca4ba2d060 (patch)
tree6c813c841e056164fe22bd91a4cd2295028d497d
parent7730cba2a50332c194f50a58b86359ea39a82bd1 (diff)
spi: Remove HOTPLUG section attributes
CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Bill Pemberton has done most of the legwork on this series. I've used his script to purge the attributes from the drivers/gpio tree. Reported-by: Bill Pemberton <wfp5p@virginia.edu> Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Diffstat
-rw-r--r--drivers/spi/spi-altera.c6
-rw-r--r--drivers/spi/spi-ath79.c6
-rw-r--r--drivers/spi/spi-atmel.c4
-rw-r--r--drivers/spi/spi-bcm63xx.c6
-rw-r--r--drivers/spi/spi-bfin-sport.c8
-rw-r--r--drivers/spi/spi-bfin5xx.c4
-rw-r--r--drivers/spi/spi-clps711x.c6
-rw-r--r--drivers/spi/spi-coldfire-qspi.c6
-rw-r--r--drivers/spi/spi-davinci.c6
-rw-r--r--drivers/spi/spi-dw-mmio.c6
-rw-r--r--drivers/spi/spi-dw-pci.c6
-rw-r--r--drivers/spi/spi-dw.c6
-rw-r--r--drivers/spi/spi-ep93xx.c6
-rw-r--r--drivers/spi/spi-falcon.c6
-rw-r--r--drivers/spi/spi-fsl-espi.c8
-rw-r--r--drivers/spi/spi-fsl-lib.c4
-rw-r--r--drivers/spi/spi-fsl-spi.c14
-rw-r--r--drivers/spi/spi-gpio.c13
-rw-r--r--drivers/spi/spi-imx.c6
-rw-r--r--drivers/spi/spi-mpc512x-psc.c10
-rw-r--r--drivers/spi/spi-mpc52xx-psc.c8
-rw-r--r--drivers/spi/spi-mpc52xx.c8
-rw-r--r--drivers/spi/spi-mxs.c6
-rw-r--r--drivers/spi/spi-nuc900.c6
-rw-r--r--drivers/spi/spi-oc-tiny.c10
-rw-r--r--drivers/spi/spi-octeon.c6
-rw-r--r--drivers/spi/spi-omap-100k.c2
-rw-r--r--drivers/spi/spi-omap2-mcspi.c8
-rw-r--r--drivers/spi/spi-orion.c2
-rw-r--r--drivers/spi/spi-pl022.c9
-rw-r--r--drivers/spi/spi-pxa2xx-pci.c6
-rw-r--r--drivers/spi/spi-pxa2xx.c4
-rw-r--r--drivers/spi/spi-rspi.c10
-rw-r--r--drivers/spi/spi-s3c24xx.c6
-rw-r--r--drivers/spi/spi-s3c64xx.c4
-rw-r--r--drivers/spi/spi-sh-hspi.c6
-rw-r--r--drivers/spi/spi-sh.c6
-rw-r--r--drivers/spi/spi-sirf.c6
-rw-r--r--drivers/spi/spi-tegra20-sflash.c8
-rw-r--r--drivers/spi/spi-tegra20-slink.c8
-rw-r--r--drivers/spi/spi-ti-ssp.c6
-rw-r--r--drivers/spi/spi-tle62x0.c6
-rw-r--r--drivers/spi/spi-topcliff-pch.c12
-rw-r--r--drivers/spi/spi-xcomm.c6
-rw-r--r--drivers/spi/spi-xilinx.c6
-rw-r--r--drivers/spi/spi.c3
-rw-r--r--drivers/spi/spidev.c6
47 files changed, 153 insertions, 158 deletions
diff --git a/drivers/spi/spi-altera.c b/drivers/spi/spi-altera.c
index f1fec2a19d10..5e7314ac51e9 100644
--- a/drivers/spi/spi-altera.c
+++ b/drivers/spi/spi-altera.c
@@ -215,7 +215,7 @@ static irqreturn_t altera_spi_irq(int irq, void *dev)
215 return IRQ_HANDLED; 215 return IRQ_HANDLED;
216} 216}
217 217
218static int __devinit altera_spi_probe(struct platform_device *pdev) 218static int altera_spi_probe(struct platform_device *pdev)
219{ 219{
220 struct altera_spi_platform_data *platp = pdev->dev.platform_data; 220 struct altera_spi_platform_data *platp = pdev->dev.platform_data;
221 struct altera_spi *hw; 221 struct altera_spi *hw;
@@ -290,7 +290,7 @@ exit:
290 return err; 290 return err;
291} 291}
292 292
293static int __devexit altera_spi_remove(struct platform_device *dev) 293static int altera_spi_remove(struct platform_device *dev)
294{ 294{
295 struct altera_spi *hw = platform_get_drvdata(dev); 295 struct altera_spi *hw = platform_get_drvdata(dev);
296 struct spi_master *master = hw->bitbang.master; 296 struct spi_master *master = hw->bitbang.master;
@@ -311,7 +311,7 @@ MODULE_DEVICE_TABLE(of, altera_spi_match);
311 311
312static struct platform_driver altera_spi_driver = { 312static struct platform_driver altera_spi_driver = {
313 .probe = altera_spi_probe, 313 .probe = altera_spi_probe,
314 .remove = __devexit_p(altera_spi_remove), 314 .remove = altera_spi_remove,
315 .driver = { 315 .driver = {
316 .name = DRV_NAME, 316 .name = DRV_NAME,
317 .owner = THIS_MODULE, 317 .owner = THIS_MODULE,
diff --git a/drivers/spi/spi-ath79.c b/drivers/spi/spi-ath79.c
index 249077e5cc48..9a5d7791c5fb 100644
--- a/drivers/spi/spi-ath79.c
+++ b/drivers/spi/spi-ath79.c
@@ -192,7 +192,7 @@ static u32 ath79_spi_txrx_mode0(struct spi_device *spi, unsigned nsecs,
192 return ath79_spi_rr(sp, AR71XX_SPI_REG_RDS); 192 return ath79_spi_rr(sp, AR71XX_SPI_REG_RDS);
193} 193}
194 194
195static __devinit int ath79_spi_probe(struct platform_device *pdev) 195static int ath79_spi_probe(struct platform_device *pdev)
196{ 196{
197 struct spi_master *master; 197 struct spi_master *master;
198 struct ath79_spi *sp; 198 struct ath79_spi *sp;
@@ -251,7 +251,7 @@ err_put_master:
251 return ret; 251 return ret;
252} 252}
253 253
254static __devexit int ath79_spi_remove(struct platform_device *pdev) 254static int ath79_spi_remove(struct platform_device *pdev)
255{ 255{
256 struct ath79_spi *sp = platform_get_drvdata(pdev); 256 struct ath79_spi *sp = platform_get_drvdata(pdev);
257 257
@@ -265,7 +265,7 @@ static __devexit int ath79_spi_remove(struct platform_device *pdev)
265 265
266static struct platform_driver ath79_spi_driver = { 266static struct platform_driver ath79_spi_driver = {
267 .probe = ath79_spi_probe, 267 .probe = ath79_spi_probe,
268 .remove = __devexit_p(ath79_spi_remove), 268 .remove = ath79_spi_remove,
269 .driver = { 269 .driver = {
270 .name = DRV_NAME, 270 .name = DRV_NAME,
271 .owner = THIS_MODULE, 271 .owner = THIS_MODULE,
diff --git a/drivers/spi/spi-atmel.c b/drivers/spi/spi-atmel.c
index 16d6a839c7fa..364ee2eb74ec 100644
--- a/drivers/spi/spi-atmel.c
+++ b/drivers/spi/spi-atmel.c
@@ -907,7 +907,7 @@ static void atmel_spi_cleanup(struct spi_device *spi)
907 907
908/*-------------------------------------------------------------------------*/ 908/*-------------------------------------------------------------------------*/
909 909
910static int __devinit atmel_spi_probe(struct platform_device *pdev) 910static int atmel_spi_probe(struct platform_device *pdev)
911{ 911{
912 struct resource *regs; 912 struct resource *regs;
913 int irq; 913 int irq;
@@ -1003,7 +1003,7 @@ out_free:
1003 return ret; 1003 return ret;
1004} 1004}
1005 1005
1006static int __devexit atmel_spi_remove(struct platform_device *pdev) 1006static int atmel_spi_remove(struct platform_device *pdev)
1007{ 1007{
1008 struct spi_master *master = platform_get_drvdata(pdev); 1008 struct spi_master *master = platform_get_drvdata(pdev);
1009 struct atmel_spi *as = spi_master_get_devdata(master); 1009 struct atmel_spi *as = spi_master_get_devdata(master);
diff --git a/drivers/spi/spi-bcm63xx.c b/drivers/spi/spi-bcm63xx.c
index 6d97047d9242..f44ab5508535 100644
--- a/drivers/spi/spi-bcm63xx.c
+++ b/drivers/spi/spi-bcm63xx.c
@@ -329,7 +329,7 @@ static irqreturn_t bcm63xx_spi_interrupt(int irq, void *dev_id)
329} 329}
330 330
331 331
332static int __devinit bcm63xx_spi_probe(struct platform_device *pdev) 332static int bcm63xx_spi_probe(struct platform_device *pdev)
333{ 333{
334 struct resource *r; 334 struct resource *r;
335 struct device *dev = &pdev->dev; 335 struct device *dev = &pdev->dev;
@@ -449,7 +449,7 @@ out:
449 return ret; 449 return ret;
450} 450}
451 451
452static int __devexit bcm63xx_spi_remove(struct platform_device *pdev) 452static int bcm63xx_spi_remove(struct platform_device *pdev)
453{ 453{
454 struct spi_master *master = spi_master_get(platform_get_drvdata(pdev)); 454 struct spi_master *master = spi_master_get(platform_get_drvdata(pdev));
455 struct bcm63xx_spi *bs = spi_master_get_devdata(master); 455 struct bcm63xx_spi *bs = spi_master_get_devdata(master);
@@ -514,7 +514,7 @@ static struct platform_driver bcm63xx_spi_driver = {
514 .pm = BCM63XX_SPI_PM_OPS, 514 .pm = BCM63XX_SPI_PM_OPS,
515 }, 515 },
516 .probe = bcm63xx_spi_probe, 516 .probe = bcm63xx_spi_probe,
517 .remove = __devexit_p(bcm63xx_spi_remove), 517 .remove = bcm63xx_spi_remove,
518}; 518};
519 519
520module_platform_driver(bcm63xx_spi_driver); 520module_platform_driver(bcm63xx_spi_driver);
diff --git a/drivers/spi/spi-bfin-sport.c b/drivers/spi/spi-bfin-sport.c
index 6555ecd07302..ac7ffca7ba47 100644
--- a/drivers/spi/spi-bfin-sport.c
+++ b/drivers/spi/spi-bfin-sport.c
@@ -755,8 +755,7 @@ bfin_sport_spi_destroy_queue(struct bfin_sport_spi_master_data *drv_data)
755 return 0; 755 return 0;
756} 756}
757 757
758static int __devinit 758static int bfin_sport_spi_probe(struct platform_device *pdev)
759bfin_sport_spi_probe(struct platform_device *pdev)
760{ 759{
761 struct device *dev = &pdev->dev; 760 struct device *dev = &pdev->dev;
762 struct bfin5xx_spi_master *platform_info; 761 struct bfin5xx_spi_master *platform_info;
@@ -863,8 +862,7 @@ bfin_sport_spi_probe(struct platform_device *pdev)
863} 862}
864 863
865/* stop hardware and remove the driver */ 864/* stop hardware and remove the driver */
866static int __devexit 865static int bfin_sport_spi_remove(struct platform_device *pdev)
867bfin_sport_spi_remove(struct platform_device *pdev)
868{ 866{
869 struct bfin_sport_spi_master_data *drv_data = platform_get_drvdata(pdev); 867 struct bfin_sport_spi_master_data *drv_data = platform_get_drvdata(pdev);
870 int status = 0; 868 int status = 0;
@@ -935,7 +933,7 @@ static struct platform_driver bfin_sport_spi_driver = {
935 .owner = THIS_MODULE, 933 .owner = THIS_MODULE,
936 }, 934 },
937 .probe = bfin_sport_spi_probe, 935 .probe = bfin_sport_spi_probe,
938 .remove = __devexit_p(bfin_sport_spi_remove), 936 .remove = bfin_sport_spi_remove,
939 .suspend = bfin_sport_spi_suspend, 937 .suspend = bfin_sport_spi_suspend,
940 .resume = bfin_sport_spi_resume, 938 .resume = bfin_sport_spi_resume,
941}; 939};
diff --git a/drivers/spi/spi-bfin5xx.c b/drivers/spi/spi-bfin5xx.c
index 9bb4d4af8547..0429d833f75b 100644
--- a/drivers/spi/spi-bfin5xx.c
+++ b/drivers/spi/spi-bfin5xx.c
@@ -1387,7 +1387,7 @@ out_error_get_res:
1387} 1387}
1388 1388
1389/* stop hardware and remove the driver */ 1389/* stop hardware and remove the driver */
1390static int __devexit bfin_spi_remove(struct platform_device *pdev) 1390static int bfin_spi_remove(struct platform_device *pdev)
1391{ 1391{
1392 struct bfin_spi_master_data *drv_data = platform_get_drvdata(pdev); 1392 struct bfin_spi_master_data *drv_data = platform_get_drvdata(pdev);
1393 int status = 0; 1393 int status = 0;
@@ -1477,7 +1477,7 @@ static struct platform_driver bfin_spi_driver = {
1477 }, 1477 },
1478 .suspend = bfin_spi_suspend, 1478 .suspend = bfin_spi_suspend,
1479 .resume = bfin_spi_resume, 1479 .resume = bfin_spi_resume,
1480 .remove = __devexit_p(bfin_spi_remove), 1480 .remove = bfin_spi_remove,
1481}; 1481};
1482 1482
1483static int __init bfin_spi_init(void) 1483static int __init bfin_spi_init(void)
diff --git a/drivers/spi/spi-clps711x.c b/drivers/spi/spi-clps711x.c
index 59677eb30f94..1366c4620d5d 100644
--- a/drivers/spi/spi-clps711x.c
+++ b/drivers/spi/spi-clps711x.c
@@ -163,7 +163,7 @@ static irqreturn_t spi_clps711x_isr(int irq, void *dev_id)
163 return IRQ_HANDLED; 163 return IRQ_HANDLED;
164} 164}
165 165
166static int __devinit spi_clps711x_probe(struct platform_device *pdev) 166static int spi_clps711x_probe(struct platform_device *pdev)
167{ 167{
168 int i, ret; 168 int i, ret;
169 struct spi_master *master; 169 struct spi_master *master;
@@ -261,7 +261,7 @@ err_out:
261 return ret; 261 return ret;
262} 262}
263 263
264static int __devexit spi_clps711x_remove(struct platform_device *pdev) 264static int spi_clps711x_remove(struct platform_device *pdev)
265{ 265{
266 int i; 266 int i;
267 struct spi_master *master = platform_get_drvdata(pdev); 267 struct spi_master *master = platform_get_drvdata(pdev);
@@ -287,7 +287,7 @@ static struct platform_driver clps711x_spi_driver = {
287 .owner = THIS_MODULE, 287 .owner = THIS_MODULE,
288 }, 288 },
289 .probe = spi_clps711x_probe, 289 .probe = spi_clps711x_probe,
290 .remove = __devexit_p(spi_clps711x_remove), 290 .remove = spi_clps711x_remove,
291}; 291};
292module_platform_driver(clps711x_spi_driver); 292module_platform_driver(clps711x_spi_driver);
293 293
diff --git a/drivers/spi/spi-coldfire-qspi.c b/drivers/spi/spi-coldfire-qspi.c
index 764bfee75920..58466b810da4 100644
--- a/drivers/spi/spi-coldfire-qspi.c
+++ b/drivers/spi/spi-coldfire-qspi.c
@@ -401,7 +401,7 @@ static int mcfqspi_setup(struct spi_device *spi)
401 return 0; 401 return 0;
402} 402}
403 403
404static int __devinit mcfqspi_probe(struct platform_device *pdev) 404static int mcfqspi_probe(struct platform_device *pdev)
405{ 405{
406 struct spi_master *master; 406 struct spi_master *master;
407 struct mcfqspi *mcfqspi; 407 struct mcfqspi *mcfqspi;
@@ -515,7 +515,7 @@ fail0:
515 return status; 515 return status;
516} 516}
517 517
518static int __devexit mcfqspi_remove(struct platform_device *pdev) 518static int mcfqspi_remove(struct platform_device *pdev)
519{ 519{
520 struct spi_master *master = platform_get_drvdata(pdev); 520 struct spi_master *master = platform_get_drvdata(pdev);
521 struct mcfqspi *mcfqspi = spi_master_get_devdata(master); 521 struct mcfqspi *mcfqspi = spi_master_get_devdata(master);
@@ -594,7 +594,7 @@ static struct platform_driver mcfqspi_driver = {
594 .driver.owner = THIS_MODULE, 594 .driver.owner = THIS_MODULE,
595 .driver.pm = &mcfqspi_pm, 595 .driver.pm = &mcfqspi_pm,
596 .probe = mcfqspi_probe, 596 .probe = mcfqspi_probe,
597 .remove = __devexit_p(mcfqspi_remove), 597 .remove = mcfqspi_remove,
598}; 598};
599module_platform_driver(mcfqspi_driver); 599module_platform_driver(mcfqspi_driver);
600 600
diff --git a/drivers/spi/spi-davinci.c b/drivers/spi/spi-davinci.c
index 147dfa87a64b..13661e129d96 100644
--- a/drivers/spi/spi-davinci.c
+++ b/drivers/spi/spi-davinci.c
@@ -769,7 +769,7 @@ rx_dma_failed:
769 * It will invoke spi_bitbang_start to create work queue so that client driver 769 * It will invoke spi_bitbang_start to create work queue so that client driver
770 * can register transfer method to work queue. 770 * can register transfer method to work queue.
771 */ 771 */
772static int __devinit davinci_spi_probe(struct platform_device *pdev) 772static int davinci_spi_probe(struct platform_device *pdev)
773{ 773{
774 struct spi_master *master; 774 struct spi_master *master;
775 struct davinci_spi *dspi; 775 struct davinci_spi *dspi;
@@ -952,7 +952,7 @@ err:
952 * It will also call spi_bitbang_stop to destroy the work queue which was 952 * It will also call spi_bitbang_stop to destroy the work queue which was
953 * created by spi_bitbang_start. 953 * created by spi_bitbang_start.
954 */ 954 */
955static int __devexit davinci_spi_remove(struct platform_device *pdev) 955static int davinci_spi_remove(struct platform_device *pdev)
956{ 956{
957 struct davinci_spi *dspi; 957 struct davinci_spi *dspi;
958 struct spi_master *master; 958 struct spi_master *master;
@@ -980,7 +980,7 @@ static struct platform_driver davinci_spi_driver = {
980 .owner = THIS_MODULE, 980 .owner = THIS_MODULE,
981 }, 981 },
982 .probe = davinci_spi_probe, 982 .probe = davinci_spi_probe,
983 .remove = __devexit_p(davinci_spi_remove), 983 .remove = davinci_spi_remove,
984}; 984};
985module_platform_driver(davinci_spi_driver); 985module_platform_driver(davinci_spi_driver);
986 986
diff --git a/drivers/spi/spi-dw-mmio.c b/drivers/spi/spi-dw-mmio.c
index db2f1ba06eab..4a6d5c9057a4 100644
--- a/drivers/spi/spi-dw-mmio.c
+++ b/drivers/spi/spi-dw-mmio.c
@@ -26,7 +26,7 @@ struct dw_spi_mmio {
26 struct clk *clk; 26 struct clk *clk;
27}; 27};
28 28
29static int __devinit dw_spi_mmio_probe(struct platform_device *pdev) 29static int dw_spi_mmio_probe(struct platform_device *pdev)
30{ 30{
31 struct dw_spi_mmio *dwsmmio; 31 struct dw_spi_mmio *dwsmmio;
32 struct dw_spi *dws; 32 struct dw_spi *dws;
@@ -106,7 +106,7 @@ err_end:
106 return ret; 106 return ret;
107} 107}
108 108
109static int __devexit dw_spi_mmio_remove(struct platform_device *pdev) 109static int dw_spi_mmio_remove(struct platform_device *pdev)
110{ 110{
111 struct dw_spi_mmio *dwsmmio = platform_get_drvdata(pdev); 111 struct dw_spi_mmio *dwsmmio = platform_get_drvdata(pdev);
112 struct resource *mem; 112 struct resource *mem;
@@ -129,7 +129,7 @@ static int __devexit dw_spi_mmio_remove(struct platform_device *pdev)
129 129
130static struct platform_driver dw_spi_mmio_driver = { 130static struct platform_driver dw_spi_mmio_driver = {
131 .probe = dw_spi_mmio_probe, 131 .probe = dw_spi_mmio_probe,
132 .remove = __devexit_p(dw_spi_mmio_remove), 132 .remove = dw_spi_mmio_remove,
133 .driver = { 133 .driver = {
134 .name = DRIVER_NAME, 134 .name = DRIVER_NAME,
135 .owner = THIS_MODULE, 135 .owner = THIS_MODULE,
diff --git a/drivers/spi/spi-dw-pci.c b/drivers/spi/spi-dw-pci.c
index ff81abbb3066..6055c8d9fdd7 100644
--- a/drivers/spi/spi-dw-pci.c
+++ b/drivers/spi/spi-dw-pci.c
@@ -32,7 +32,7 @@ struct dw_spi_pci {
32 struct dw_spi dws; 32 struct dw_spi dws;
33}; 33};
34 34
35static int __devinit spi_pci_probe(struct pci_dev *pdev, 35static int spi_pci_probe(struct pci_dev *pdev,
36 const struct pci_device_id *ent) 36 const struct pci_device_id *ent)
37{ 37{
38 struct dw_spi_pci *dwpci; 38 struct dw_spi_pci *dwpci;
@@ -105,7 +105,7 @@ err_disable:
105 return ret; 105 return ret;
106} 106}
107 107
108static void __devexit spi_pci_remove(struct pci_dev *pdev) 108static void spi_pci_remove(struct pci_dev *pdev)
109{ 109{
110 struct dw_spi_pci *dwpci = pci_get_drvdata(pdev); 110 struct dw_spi_pci *dwpci = pci_get_drvdata(pdev);
111 111
@@ -159,7 +159,7 @@ static struct pci_driver dw_spi_driver = {
159 .name = DRIVER_NAME, 159 .name = DRIVER_NAME,
160 .id_table = pci_ids, 160 .id_table = pci_ids,
161 .probe = spi_pci_probe, 161 .probe = spi_pci_probe,
162 .remove = __devexit_p(spi_pci_remove), 162 .remove = spi_pci_remove,
163 .suspend = spi_suspend, 163 .suspend = spi_suspend,
164 .resume = spi_resume, 164 .resume = spi_resume,
165}; 165};
diff --git a/drivers/spi/spi-dw.c b/drivers/spi/spi-dw.c
index d1a495f64e2d..c1abc06899e7 100644
--- a/drivers/spi/spi-dw.c
+++ b/drivers/spi/spi-dw.c
@@ -696,7 +696,7 @@ static void dw_spi_cleanup(struct spi_device *spi)
696 kfree(chip); 696 kfree(chip);
697} 697}
698 698
699static int __devinit init_queue(struct dw_spi *dws) 699static int init_queue(struct dw_spi *dws)
700{ 700{
701 INIT_LIST_HEAD(&dws->queue); 701 INIT_LIST_HEAD(&dws->queue);
702 spin_lock_init(&dws->lock); 702 spin_lock_init(&dws->lock);
@@ -795,7 +795,7 @@ static void spi_hw_init(struct dw_spi *dws)
795 } 795 }
796} 796}
797 797
798int __devinit dw_spi_add_host(struct dw_spi *dws) 798int dw_spi_add_host(struct dw_spi *dws)
799{ 799{
800 struct spi_master *master; 800 struct spi_master *master;
801 int ret; 801 int ret;
@@ -877,7 +877,7 @@ exit:
877} 877}
878EXPORT_SYMBOL_GPL(dw_spi_add_host); 878EXPORT_SYMBOL_GPL(dw_spi_add_host);
879 879
880void __devexit dw_spi_remove_host(struct dw_spi *dws) 880void dw_spi_remove_host(struct dw_spi *dws)
881{ 881{
882 int status = 0; 882 int status = 0;
883 883
diff --git a/drivers/spi/spi-ep93xx.c b/drivers/spi/spi-ep93xx.c
index 3a219599612a..acb1e1935c5a 100644
--- a/drivers/spi/spi-ep93xx.c
+++ b/drivers/spi/spi-ep93xx.c
@@ -1023,7 +1023,7 @@ static void ep93xx_spi_release_dma(struct ep93xx_spi *espi)
1023 free_page((unsigned long)espi->zeropage); 1023 free_page((unsigned long)espi->zeropage);
1024} 1024}
1025 1025
1026static int __devinit ep93xx_spi_probe(struct platform_device *pdev) 1026static int ep93xx_spi_probe(struct platform_device *pdev)
1027{ 1027{
1028 struct spi_master *master; 1028 struct spi_master *master;
1029 struct ep93xx_spi_info *info; 1029 struct ep93xx_spi_info *info;
@@ -1138,7 +1138,7 @@ fail_release_master:
1138 return error; 1138 return error;
1139} 1139}
1140 1140
1141static int __devexit ep93xx_spi_remove(struct platform_device *pdev) 1141static int ep93xx_spi_remove(struct platform_device *pdev)
1142{ 1142{
1143 struct spi_master *master = platform_get_drvdata(pdev); 1143 struct spi_master *master = platform_get_drvdata(pdev);
1144 struct ep93xx_spi *espi = spi_master_get_devdata(master); 1144 struct ep93xx_spi *espi = spi_master_get_devdata(master);
@@ -1180,7 +1180,7 @@ static struct platform_driver ep93xx_spi_driver = {
1180 .owner = THIS_MODULE, 1180 .owner = THIS_MODULE,
1181 }, 1181 },
1182 .probe = ep93xx_spi_probe, 1182 .probe = ep93xx_spi_probe,
1183 .remove = __devexit_p(ep93xx_spi_remove), 1183 .remove = ep93xx_spi_remove,
1184}; 1184};
1185module_platform_driver(ep93xx_spi_driver); 1185module_platform_driver(ep93xx_spi_driver);
1186 1186
diff --git a/drivers/spi/spi-falcon.c b/drivers/spi/spi-falcon.c
index 8f6aa735a24c..6a6f62ec2840 100644
--- a/drivers/spi/spi-falcon.c
+++ b/drivers/spi/spi-falcon.c
@@ -403,7 +403,7 @@ static int falcon_sflash_xfer_one(struct spi_master *master,
403 return 0; 403 return 0;
404} 404}
405 405
406static int __devinit falcon_sflash_probe(struct platform_device *pdev) 406static int falcon_sflash_probe(struct platform_device *pdev)
407{ 407{
408 struct falcon_sflash *priv; 408 struct falcon_sflash *priv;
409 struct spi_master *master; 409 struct spi_master *master;
@@ -438,7 +438,7 @@ static int __devinit falcon_sflash_probe(struct platform_device *pdev)
438 return ret; 438 return ret;
439} 439}
440 440
441static int __devexit falcon_sflash_remove(struct platform_device *pdev) 441static int falcon_sflash_remove(struct platform_device *pdev)
442{ 442{
443 struct falcon_sflash *priv = platform_get_drvdata(pdev); 443 struct falcon_sflash *priv = platform_get_drvdata(pdev);
444 444
@@ -455,7 +455,7 @@ MODULE_DEVICE_TABLE(of, falcon_sflash_match);
455 455
456static struct platform_driver falcon_sflash_driver = { 456static struct platform_driver falcon_sflash_driver = {
457 .probe = falcon_sflash_probe, 457 .probe = falcon_sflash_probe,
458 .remove = __devexit_p(falcon_sflash_remove), 458 .remove = falcon_sflash_remove,
459 .driver = { 459 .driver = {
460 .name = DRV_NAME, 460 .name = DRV_NAME,
461 .owner = THIS_MODULE, 461 .owner = THIS_MODULE,
diff --git a/drivers/spi/spi-fsl-espi.c b/drivers/spi/spi-fsl-espi.c
index 27bdc47b5250..24610ca8955d 100644
--- a/drivers/spi/spi-fsl-espi.c
+++ b/drivers/spi/spi-fsl-espi.c
@@ -587,7 +587,7 @@ static void fsl_espi_remove(struct mpc8xxx_spi *mspi)
587 iounmap(mspi->reg_base); 587 iounmap(mspi->reg_base);
588} 588}
589 589
590static struct spi_master * __devinit fsl_espi_probe(struct device *dev, 590static struct spi_master * fsl_espi_probe(struct device *dev,
591 struct resource *mem, unsigned int irq) 591 struct resource *mem, unsigned int irq)
592{ 592{
593 struct fsl_spi_platform_data *pdata = dev->platform_data; 593 struct fsl_spi_platform_data *pdata = dev->platform_data;
@@ -686,7 +686,7 @@ static int of_fsl_espi_get_chipselects(struct device *dev)
686 return 0; 686 return 0;
687} 687}
688 688
689static int __devinit of_fsl_espi_probe(struct platform_device *ofdev) 689static int of_fsl_espi_probe(struct platform_device *ofdev)
690{ 690{
691 struct device *dev = &ofdev->dev; 691 struct device *dev = &ofdev->dev;
692 struct device_node *np = ofdev->dev.of_node; 692 struct device_node *np = ofdev->dev.of_node;
@@ -725,7 +725,7 @@ err:
725 return ret; 725 return ret;
726} 726}
727 727
728static int __devexit of_fsl_espi_remove(struct platform_device *dev) 728static int of_fsl_espi_remove(struct platform_device *dev)
729{ 729{
730 return mpc8xxx_spi_remove(&dev->dev); 730 return mpc8xxx_spi_remove(&dev->dev);
731} 731}
@@ -743,7 +743,7 @@ static struct platform_driver fsl_espi_driver = {
743 .of_match_table = of_fsl_espi_match, 743 .of_match_table = of_fsl_espi_match,
744 }, 744 },
745 .probe = of_fsl_espi_probe, 745 .probe = of_fsl_espi_probe,
746 .remove = __devexit_p(of_fsl_espi_remove), 746 .remove = of_fsl_espi_remove,
747}; 747};
748module_platform_driver(fsl_espi_driver); 748module_platform_driver(fsl_espi_driver);
749 749
diff --git a/drivers/spi/spi-fsl-lib.c b/drivers/spi/spi-fsl-lib.c
index 1503574b215a..8ade675a04f1 100644
--- a/drivers/spi/spi-fsl-lib.c
+++ b/drivers/spi/spi-fsl-lib.c
@@ -169,7 +169,7 @@ err:
169 return ret; 169 return ret;
170} 170}
171 171
172int __devexit mpc8xxx_spi_remove(struct device *dev) 172int mpc8xxx_spi_remove(struct device *dev)
173{ 173{
174 struct mpc8xxx_spi *mpc8xxx_spi; 174 struct mpc8xxx_spi *mpc8xxx_spi;
175 struct spi_master *master; 175 struct spi_master *master;
@@ -189,7 +189,7 @@ int __devexit mpc8xxx_spi_remove(struct device *dev)
189 return 0; 189 return 0;
190} 190}
191 191
192int __devinit of_mpc8xxx_spi_probe(struct platform_device *ofdev) 192int of_mpc8xxx_spi_probe(struct platform_device *ofdev)
193{ 193{
194 struct device *dev = &ofdev->dev; 194 struct device *dev = &ofdev->dev;
195 struct device_node *np = ofdev->dev.of_node; 195 struct device_node *np = ofdev->dev.of_node;
diff --git a/drivers/spi/spi-fsl-spi.c b/drivers/spi/spi-fsl-spi.c
index 6a62934ca74c..1a7f6359d998 100644
--- a/drivers/spi/spi-fsl-spi.c
+++ b/drivers/spi/spi-fsl-spi.c
@@ -843,7 +843,7 @@ static void fsl_spi_remove(struct mpc8xxx_spi *mspi)
843 fsl_spi_cpm_free(mspi); 843 fsl_spi_cpm_free(mspi);
844} 844}
845 845
846static struct spi_master * __devinit fsl_spi_probe(struct device *dev, 846static struct spi_master * fsl_spi_probe(struct device *dev,
847 struct resource *mem, unsigned int irq) 847 struct resource *mem, unsigned int irq)
848{ 848{
849 struct fsl_spi_platform_data *pdata = dev->platform_data; 849 struct fsl_spi_platform_data *pdata = dev->platform_data;
@@ -1041,7 +1041,7 @@ static int of_fsl_spi_free_chipselects(struct device *dev)
1041 return 0; 1041 return 0;
1042} 1042}
1043 1043
1044static int __devinit of_fsl_spi_probe(struct platform_device *ofdev) 1044static int of_fsl_spi_probe(struct platform_device *ofdev)
1045{ 1045{
1046 struct device *dev = &ofdev->dev; 1046 struct device *dev = &ofdev->dev;
1047 struct device_node *np = ofdev->dev.of_node; 1047 struct device_node *np = ofdev->dev.of_node;
@@ -1081,7 +1081,7 @@ err:
1081 return ret; 1081 return ret;
1082} 1082}
1083 1083
1084static int __devexit of_fsl_spi_remove(struct platform_device *ofdev) 1084static int of_fsl_spi_remove(struct platform_device *ofdev)
1085{ 1085{
1086 int ret; 1086 int ret;
1087 1087
@@ -1105,7 +1105,7 @@ static struct platform_driver of_fsl_spi_driver = {
1105 .of_match_table = of_fsl_spi_match, 1105 .of_match_table = of_fsl_spi_match,
1106 }, 1106 },
1107 .probe = of_fsl_spi_probe, 1107 .probe = of_fsl_spi_probe,
1108 .remove = __devexit_p(of_fsl_spi_remove), 1108 .remove = of_fsl_spi_remove,
1109}; 1109};
1110 1110
1111#ifdef CONFIG_MPC832x_RDB 1111#ifdef CONFIG_MPC832x_RDB
@@ -1116,7 +1116,7 @@ static struct platform_driver of_fsl_spi_driver = {
1116 * tree can work with OpenFirmware driver. But for now we support old trees 1116 * tree can work with OpenFirmware driver. But for now we support old trees
1117 * as well. 1117 * as well.
1118 */ 1118 */
1119static int __devinit plat_mpc8xxx_spi_probe(struct platform_device *pdev) 1119static int plat_mpc8xxx_spi_probe(struct platform_device *pdev)
1120{ 1120{
1121 struct resource *mem; 1121 struct resource *mem;
1122 int irq; 1122 int irq;
@@ -1139,7 +1139,7 @@ static int __devinit plat_mpc8xxx_spi_probe(struct platform_device *pdev)
1139 return 0; 1139 return 0;
1140} 1140}
1141 1141
1142static int __devexit plat_mpc8xxx_spi_remove(struct platform_device *pdev) 1142static int plat_mpc8xxx_spi_remove(struct platform_device *pdev)
1143{ 1143{
1144 return mpc8xxx_spi_remove(&pdev->dev); 1144 return mpc8xxx_spi_remove(&pdev->dev);
1145} 1145}
@@ -1147,7 +1147,7 @@ static int __devexit plat_mpc8xxx_spi_remove(struct platform_device *pdev)
1147MODULE_ALIAS("platform:mpc8xxx_spi"); 1147MODULE_ALIAS("platform:mpc8xxx_spi");
1148static struct platform_driver mpc8xxx_spi_driver = { 1148static struct platform_driver mpc8xxx_spi_driver = {
1149 .probe = plat_mpc8xxx_spi_probe, 1149 .probe = plat_mpc8xxx_spi_probe,
1150 .remove = __devexit_p(plat_mpc8xxx_spi_remove), 1150 .remove = plat_mpc8xxx_spi_remove,
1151 .driver = { 1151 .driver = {
1152 .name = "mpc8xxx_spi", 1152 .name = "mpc8xxx_spi",
1153 .owner = THIS_MODULE, 1153 .owner = THIS_MODULE,
diff --git a/drivers/spi/spi-gpio.c b/drivers/spi/spi-gpio.c
index a2b50c516b31..c7cf0b7a069b 100644
--- a/drivers/spi/spi-gpio.c
+++ b/drivers/spi/spi-gpio.c
@@ -287,7 +287,7 @@ static void spi_gpio_cleanup(struct spi_device *spi)
287 spi_bitbang_cleanup(spi); 287 spi_bitbang_cleanup(spi);
288} 288}
289 289
290static int __devinit spi_gpio_alloc(unsigned pin, const char *label, bool is_in) 290static int spi_gpio_alloc(unsigned pin, const char *label, bool is_in)
291{ 291{
292 int value; 292 int value;
293 293
@@ -301,9 +301,8 @@ static int __devinit spi_gpio_alloc(unsigned pin, const char *label, bool is_in)
301 return value; 301 return value;
302} 302}
303 303
304static int __devinit 304static int spi_gpio_request(struct spi_gpio_platform_data *pdata,
305spi_gpio_request(struct spi_gpio_platform_data *pdata, const char *label, 305 const char *label, u16 *res_flags)
306 u16 *res_flags)
307{ 306{
308 int value; 307 int value;
309 308
@@ -392,7 +391,7 @@ static inline int spi_gpio_probe_dt(struct platform_device *pdev)
392} 391}
393#endif 392#endif
394 393
395static int __devinit spi_gpio_probe(struct platform_device *pdev) 394static int spi_gpio_probe(struct platform_device *pdev)
396{ 395{
397 int status; 396 int status;
398 struct spi_master *master; 397 struct spi_master *master;
@@ -485,7 +484,7 @@ gpio_free:
485 return status; 484 return status;
486} 485}
487 486
488static int __devexit spi_gpio_remove(struct platform_device *pdev) 487static int spi_gpio_remove(struct platform_device *pdev)
489{ 488{
490 struct spi_gpio *spi_gpio; 489 struct spi_gpio *spi_gpio;
491 struct spi_gpio_platform_data *pdata; 490 struct spi_gpio_platform_data *pdata;
@@ -518,7 +517,7 @@ static struct platform_driver spi_gpio_driver = {
518 .of_match_table = of_match_ptr(spi_gpio_dt_ids), 517 .of_match_table = of_match_ptr(spi_gpio_dt_ids),
519 }, 518 },
520 .probe = spi_gpio_probe, 519 .probe = spi_gpio_probe,
521 .remove = __devexit_p(spi_gpio_remove), 520 .remove = spi_gpio_remove,
522}; 521};
523module_platform_driver(spi_gpio_driver); 522module_platform_driver(spi_gpio_driver);
524 523
diff --git a/drivers/spi/spi-imx.c b/drivers/spi/spi-imx.c
index c9a0d8467de6..904913290aa5 100644
--- a/drivers/spi/spi-imx.c
+++ b/drivers/spi/spi-imx.c
@@ -750,7 +750,7 @@ static void spi_imx_cleanup(struct spi_device *spi)
750{ 750{
751} 751}
752 752
753static int __devinit spi_imx_probe(struct platform_device *pdev) 753static int spi_imx_probe(struct platform_device *pdev)
754{ 754{
755 struct device_node *np = pdev->dev.of_node; 755 struct device_node *np = pdev->dev.of_node;
756 const struct of_device_id *of_id = 756 const struct of_device_id *of_id =
@@ -906,7 +906,7 @@ out_gpio_free:
906 return ret; 906 return ret;
907} 907}
908 908
909static int __devexit spi_imx_remove(struct platform_device *pdev) 909static int spi_imx_remove(struct platform_device *pdev)
910{ 910{
911 struct spi_master *master = platform_get_drvdata(pdev); 911 struct spi_master *master = platform_get_drvdata(pdev);
912 struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0); 912 struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
@@ -942,7 +942,7 @@ static struct platform_driver spi_imx_driver = {
942 }, 942 },
943 .id_table = spi_imx_devtype, 943 .id_table = spi_imx_devtype,
944 .probe = spi_imx_probe, 944 .probe = spi_imx_probe,
945 .remove = __devexit_p(spi_imx_remove), 945 .remove = spi_imx_remove,
946}; 946};
947module_platform_driver(spi_imx_driver); 947module_platform_driver(spi_imx_driver);
948 948
diff --git a/drivers/spi/spi-mpc512x-psc.c b/drivers/spi/spi-mpc512x-psc.c
index 0a1e39e94d06..cb3a3106bd4f 100644
--- a/drivers/spi/spi-mpc512x-psc.c
+++ b/drivers/spi/spi-mpc512x-psc.c
@@ -406,7 +406,7 @@ static irqreturn_t mpc512x_psc_spi_isr(int irq, void *dev_id)
406} 406}
407 407
408/* bus_num is used only for the case dev->platform_data == NULL */ 408/* bus_num is used only for the case dev->platform_data == NULL */
409static int __devinit mpc512x_psc_spi_do_probe(struct device *dev, u32 regaddr, 409static int mpc512x_psc_spi_do_probe(struct device *dev, u32 regaddr,
410 u32 size, unsigned int irq, 410 u32 size, unsigned int irq,
411 s16 bus_num) 411 s16 bus_num)
412{ 412{
@@ -492,7 +492,7 @@ free_master:
492 return ret; 492 return ret;
493} 493}
494 494
495static int __devexit mpc512x_psc_spi_do_remove(struct device *dev) 495static int mpc512x_psc_spi_do_remove(struct device *dev)
496{ 496{
497 struct spi_master *master = spi_master_get(dev_get_drvdata(dev)); 497 struct spi_master *master = spi_master_get(dev_get_drvdata(dev));
498 struct mpc512x_psc_spi *mps = spi_master_get_devdata(master); 498 struct mpc512x_psc_spi *mps = spi_master_get_devdata(master);
@@ -508,7 +508,7 @@ static int __devexit mpc512x_psc_spi_do_remove(struct device *dev)
508 return 0; 508 return 0;
509} 509}
510 510
511static int __devinit mpc512x_psc_spi_of_probe(struct platform_device *op) 511static int mpc512x_psc_spi_of_probe(struct platform_device *op)
512{ 512{
513 const u32 *regaddr_p; 513 const u32 *regaddr_p;
514 u64 regaddr64, size64; 514 u64 regaddr64, size64;
@@ -539,7 +539,7 @@ static int __devinit mpc512x_psc_spi_of_probe(struct platform_device *op)
539 irq_of_parse_and_map(op->dev.of_node, 0), id); 539 irq_of_parse_and_map(op->dev.of_node, 0), id);
540} 540}
541 541
542static int __devexit mpc512x_psc_spi_of_remove(struct platform_device *op) 542static int mpc512x_psc_spi_of_remove(struct platform_device *op)
543{ 543{
544 return mpc512x_psc_spi_do_remove(&op->dev); 544 return mpc512x_psc_spi_do_remove(&op->dev);
545} 545}
@@ -553,7 +553,7 @@ MODULE_DEVICE_TABLE(of, mpc512x_psc_spi_of_match);
553 553
554static struct platform_driver mpc512x_psc_spi_of_driver = { 554static struct platform_driver mpc512x_psc_spi_of_driver = {
555 .probe = mpc512x_psc_spi_of_probe, 555 .probe = mpc512x_psc_spi_of_probe,
556 .remove = __devexit_p(mpc512x_psc_spi_of_remove), 556 .remove = mpc512x_psc_spi_of_remove,
557 .driver = { 557 .driver = {
558 .name = "mpc512x-psc-spi", 558 .name = "mpc512x-psc-spi",
559 .owner = THIS_MODULE, 559 .owner = THIS_MODULE,
diff --git a/drivers/spi/spi-mpc52xx-psc.c b/drivers/spi/spi-mpc52xx-psc.c
index bd47d262d53f..291120b37dbb 100644
--- a/drivers/spi/spi-mpc52xx-psc.c
+++ b/drivers/spi/spi-mpc52xx-psc.c
@@ -363,7 +363,7 @@ static irqreturn_t mpc52xx_psc_spi_isr(int irq, void *dev_id)
363} 363}
364 364
365/* bus_num is used only for the case dev->platform_data == NULL */ 365/* bus_num is used only for the case dev->platform_data == NULL */
366static int __devinit mpc52xx_psc_spi_do_probe(struct device *dev, u32 regaddr, 366static int mpc52xx_psc_spi_do_probe(struct device *dev, u32 regaddr,
367 u32 size, unsigned int irq, s16 bus_num) 367 u32 size, unsigned int irq, s16 bus_num)
368{ 368{
369 struct fsl_spi_platform_data *pdata = dev->platform_data; 369 struct fsl_spi_platform_data *pdata = dev->platform_data;
@@ -450,7 +450,7 @@ free_master:
450 return ret; 450 return ret;
451} 451}
452 452
453static int __devinit mpc52xx_psc_spi_of_probe(struct platform_device *op) 453static int mpc52xx_psc_spi_of_probe(struct platform_device *op)
454{ 454{
455 const u32 *regaddr_p; 455 const u32 *regaddr_p;
456 u64 regaddr64, size64; 456 u64 regaddr64, size64;
@@ -479,7 +479,7 @@ static int __devinit mpc52xx_psc_spi_of_probe(struct platform_device *op)
479 irq_of_parse_and_map(op->dev.of_node, 0), id); 479 irq_of_parse_and_map(op->dev.of_node, 0), id);
480} 480}
481 481
482static int __devexit mpc52xx_psc_spi_of_remove(struct platform_device *op) 482static int mpc52xx_psc_spi_of_remove(struct platform_device *op)
483{ 483{
484 struct spi_master *master = spi_master_get(dev_get_drvdata(&op->dev)); 484 struct spi_master *master = spi_master_get(dev_get_drvdata(&op->dev));
485 struct mpc52xx_psc_spi *mps = spi_master_get_devdata(master); 485 struct mpc52xx_psc_spi *mps = spi_master_get_devdata(master);
@@ -505,7 +505,7 @@ MODULE_DEVICE_TABLE(of, mpc52xx_psc_spi_of_match);
505 505
506static struct platform_driver mpc52xx_psc_spi_of_driver = { 506static struct platform_driver mpc52xx_psc_spi_of_driver = {
507 .probe = mpc52xx_psc_spi_of_probe, 507 .probe = mpc52xx_psc_spi_of_probe,
508 .remove = __devexit_p(mpc52xx_psc_spi_of_remove), 508 .remove = mpc52xx_psc_spi_of_remove,
509 .driver = { 509 .driver = {
510 .name = "mpc52xx-psc-spi", 510 .name = "mpc52xx-psc-spi",
511 .owner = THIS_MODULE, 511 .owner = THIS_MODULE,
diff --git a/drivers/spi/spi-mpc52xx.c b/drivers/spi/spi-mpc52xx.c
index 045410650212..29f77056eedc 100644
--- a/drivers/spi/spi-mpc52xx.c
+++ b/drivers/spi/spi-mpc52xx.c
@@ -390,7 +390,7 @@ static int mpc52xx_spi_transfer(struct spi_device *spi, struct spi_message *m)
390/* 390/*
391 * OF Platform Bus Binding 391 * OF Platform Bus Binding
392 */ 392 */
393static int __devinit mpc52xx_spi_probe(struct platform_device *op) 393static int mpc52xx_spi_probe(struct platform_device *op)
394{ 394{
395 struct spi_master *master; 395 struct spi_master *master;
396 struct mpc52xx_spi *ms; 396 struct mpc52xx_spi *ms;
@@ -527,7 +527,7 @@ static int __devinit mpc52xx_spi_probe(struct platform_device *op)
527 return rc; 527 return rc;
528} 528}
529 529
530static int __devexit mpc52xx_spi_remove(struct platform_device *op) 530static int mpc52xx_spi_remove(struct platform_device *op)
531{ 531{
532 struct spi_master *master = spi_master_get(dev_get_drvdata(&op->dev)); 532 struct spi_master *master = spi_master_get(dev_get_drvdata(&op->dev));
533 struct mpc52xx_spi *ms = spi_master_get_devdata(master); 533 struct mpc52xx_spi *ms = spi_master_get_devdata(master);
@@ -547,7 +547,7 @@ static int __devexit mpc52xx_spi_remove(struct platform_device *op)
547 return 0; 547 return 0;
548} 548}
549 549
550static const struct of_device_id mpc52xx_spi_match[] __devinitconst = { 550static const struct of_device_id mpc52xx_spi_match[] = {
551 { .compatible = "fsl,mpc5200-spi", }, 551 { .compatible = "fsl,mpc5200-spi", },
552 {} 552 {}
553}; 553};
@@ -560,6 +560,6 @@ static struct platform_driver mpc52xx_spi_of_driver = {
560 .of_match_table = mpc52xx_spi_match, 560 .of_match_table = mpc52xx_spi_match,
561 }, 561 },
562 .probe = mpc52xx_spi_probe, 562 .probe = mpc52xx_spi_probe,
563 .remove = __devexit_p(mpc52xx_spi_remove), 563 .remove = mpc52xx_spi_remove,
564}; 564};
565module_platform_driver(mpc52xx_spi_of_driver); 565module_platform_driver(mpc52xx_spi_of_driver);
diff --git a/drivers/spi/spi-mxs.c b/drivers/spi/spi-mxs.c
index 86dd04d6bc87..a3ede249d05d 100644
--- a/drivers/spi/spi-mxs.c
+++ b/drivers/spi/spi-mxs.c
@@ -509,7 +509,7 @@ static const struct of_device_id mxs_spi_dt_ids[] = {
509}; 509};
510MODULE_DEVICE_TABLE(of, mxs_spi_dt_ids); 510MODULE_DEVICE_TABLE(of, mxs_spi_dt_ids);
511 511
512static int __devinit mxs_spi_probe(struct platform_device *pdev) 512static int mxs_spi_probe(struct platform_device *pdev)
513{ 513{
514 const struct of_device_id *of_id = 514 const struct of_device_id *of_id =
515 of_match_device(mxs_spi_dt_ids, &pdev->dev); 515 of_match_device(mxs_spi_dt_ids, &pdev->dev);
@@ -636,7 +636,7 @@ out_master_free:
636 return ret; 636 return ret;
637} 637}
638 638
639static int __devexit mxs_spi_remove(struct platform_device *pdev) 639static int mxs_spi_remove(struct platform_device *pdev)
640{ 640{
641 struct spi_master *master; 641 struct spi_master *master;
642 struct mxs_spi *spi; 642 struct mxs_spi *spi;
@@ -659,7 +659,7 @@ static int __devexit mxs_spi_remove(struct platform_device *pdev)
659 659
660static struct platform_driver mxs_spi_driver = { 660static struct platform_driver mxs_spi_driver = {
661 .probe = mxs_spi_probe, 661 .probe = mxs_spi_probe,
662 .remove = __devexit_p(mxs_spi_remove), 662 .remove = mxs_spi_remove,
663 .driver = { 663 .driver = {
664 .name = DRIVER_NAME, 664 .name = DRIVER_NAME,
665 .owner = THIS_MODULE, 665 .owner = THIS_MODULE,
diff --git a/drivers/spi/spi-nuc900.c b/drivers/spi/spi-nuc900.c
index a6eca6ffdabe..b3f9ec83ef73 100644
--- a/drivers/spi/spi-nuc900.c
+++ b/drivers/spi/spi-nuc900.c
@@ -346,7 +346,7 @@ static void nuc900_init_spi(struct nuc900_spi *hw)
346 nuc900_enable_int(hw); 346 nuc900_enable_int(hw);
347} 347}
348 348
349static int __devinit nuc900_spi_probe(struct platform_device *pdev) 349static int nuc900_spi_probe(struct platform_device *pdev)
350{ 350{
351 struct nuc900_spi *hw; 351 struct nuc900_spi *hw;
352 struct spi_master *master; 352 struct spi_master *master;
@@ -453,7 +453,7 @@ err_nomem:
453 return err; 453 return err;
454} 454}
455 455
456static int __devexit nuc900_spi_remove(struct platform_device *dev) 456static int nuc900_spi_remove(struct platform_device *dev)
457{ 457{
458 struct nuc900_spi *hw = platform_get_drvdata(dev); 458 struct nuc900_spi *hw = platform_get_drvdata(dev);
459 459
@@ -477,7 +477,7 @@ static int __devexit nuc900_spi_remove(struct platform_device *dev)
477 477
478static struct platform_driver nuc900_spi_driver = { 478static struct platform_driver nuc900_spi_driver = {
479 .probe = nuc900_spi_probe, 479 .probe = nuc900_spi_probe,
480 .remove = __devexit_p(nuc900_spi_remove), 480 .remove = nuc900_spi_remove,
481 .driver = { 481 .driver = {
482 .name = "nuc900-spi", 482 .name = "nuc900-spi",
483 .owner = THIS_MODULE, 483 .owner = THIS_MODULE,
diff --git a/drivers/spi/spi-oc-tiny.c b/drivers/spi/spi-oc-tiny.c
index 9d9071b730be..432e66ec3088 100644
--- a/drivers/spi/spi-oc-tiny.c
+++ b/drivers/spi/spi-oc-tiny.c
@@ -243,7 +243,7 @@ static irqreturn_t tiny_spi_irq(int irq, void *dev)
243#ifdef CONFIG_OF 243#ifdef CONFIG_OF
244#include <linux/of_gpio.h> 244#include <linux/of_gpio.h>
245 245
246static int __devinit tiny_spi_of_probe(struct platform_device *pdev) 246static int tiny_spi_of_probe(struct platform_device *pdev)
247{ 247{
248 struct tiny_spi *hw = platform_get_drvdata(pdev); 248 struct tiny_spi *hw = platform_get_drvdata(pdev);
249 struct device_node *np = pdev->dev.of_node; 249 struct device_node *np = pdev->dev.of_node;
@@ -277,13 +277,13 @@ static int __devinit tiny_spi_of_probe(struct platform_device *pdev)
277 return 0; 277 return 0;
278} 278}
279#else /* !CONFIG_OF */ 279#else /* !CONFIG_OF */
280static int __devinit tiny_spi_of_probe(struct platform_device *pdev) 280static int tiny_spi_of_probe(struct platform_device *pdev)
281{ 281{
282 return 0; 282 return 0;
283} 283}
284#endif /* CONFIG_OF */ 284#endif /* CONFIG_OF */
285 285
286static int __devinit tiny_spi_probe(struct platform_device *pdev) 286static int tiny_spi_probe(struct platform_device *pdev)
287{ 287{
288 struct tiny_spi_platform_data *platp = pdev->dev.platform_data; 288 struct tiny_spi_platform_data *platp = pdev->dev.platform_data;
289 struct tiny_spi *hw; 289 struct tiny_spi *hw;
@@ -373,7 +373,7 @@ exit:
373 return err; 373 return err;
374} 374}
375 375
376static int __devexit tiny_spi_remove(struct platform_device *pdev) 376static int tiny_spi_remove(struct platform_device *pdev)
377{ 377{
378 struct tiny_spi *hw = platform_get_drvdata(pdev); 378 struct tiny_spi *hw = platform_get_drvdata(pdev);
379 struct spi_master *master = hw->bitbang.master; 379 struct spi_master *master = hw->bitbang.master;
@@ -399,7 +399,7 @@ MODULE_DEVICE_TABLE(of, tiny_spi_match);
399 399
400static struct platform_driver tiny_spi_driver = { 400static struct platform_driver tiny_spi_driver = {
401 .probe = tiny_spi_probe, 401 .probe = tiny_spi_probe,
402 .remove = __devexit_p(tiny_spi_remove), 402 .remove = tiny_spi_remove,
403 .driver = { 403 .driver = {
404 .name = DRV_NAME, 404 .name = DRV_NAME,
405 .owner = THIS_MODULE, 405 .owner = THIS_MODULE,
diff --git a/drivers/spi/spi-octeon.c b/drivers/spi/spi-octeon.c
index ea8fb2efb0f8..24daf964a409 100644
--- a/drivers/spi/spi-octeon.c
+++ b/drivers/spi/spi-octeon.c
@@ -266,7 +266,7 @@ static int octeon_spi_nop_transfer_hardware(struct spi_master *master)
266 return 0; 266 return 0;
267} 267}
268 268
269static int __devinit octeon_spi_probe(struct platform_device *pdev) 269static int octeon_spi_probe(struct platform_device *pdev)
270{ 270{
271 271
272 struct resource *res_mem; 272 struct resource *res_mem;
@@ -326,7 +326,7 @@ fail:
326 return err; 326 return err;
327} 327}
328 328
329static int __devexit octeon_spi_remove(struct platform_device *pdev) 329static int octeon_spi_remove(struct platform_device *pdev)
330{ 330{
331 struct octeon_spi *p = platform_get_drvdata(pdev); 331 struct octeon_spi *p = platform_get_drvdata(pdev);
332 u64 register_base = p->register_base; 332 u64 register_base = p->register_base;
@@ -352,7 +352,7 @@ static struct platform_driver octeon_spi_driver = {
352 .of_match_table = octeon_spi_match, 352 .of_match_table = octeon_spi_match,
353 }, 353 },
354 .probe = octeon_spi_probe, 354 .probe = octeon_spi_probe,
355 .remove = __devexit_p(octeon_spi_remove), 355 .remove = octeon_spi_remove,
356}; 356};
357 357
358module_platform_driver(octeon_spi_driver); 358module_platform_driver(octeon_spi_driver);
diff --git a/drivers/spi/spi-omap-100k.c b/drivers/spi/spi-omap-100k.c
index dfb4b7f448c5..3aef7fa7d5b8 100644
--- a/drivers/spi/spi-omap-100k.c
+++ b/drivers/spi/spi-omap-100k.c
@@ -486,7 +486,7 @@ static int __init omap1_spi100k_reset(struct omap1_spi100k *spi100k)
486 return 0; 486 return 0;
487} 487}
488 488
489static int __devinit omap1_spi100k_probe(struct platform_device *pdev) 489static int omap1_spi100k_probe(struct platform_device *pdev)
490{ 490{
491 struct spi_master *master; 491 struct spi_master *master;
492 struct omap1_spi100k *spi100k; 492 struct omap1_spi100k *spi100k;
diff --git a/drivers/spi/spi-omap2-mcspi.c b/drivers/spi/spi-omap2-mcspi.c
index 850138455259..b610f522ca44 100644
--- a/drivers/spi/spi-omap2-mcspi.c
+++ b/drivers/spi/spi-omap2-mcspi.c
@@ -1088,7 +1088,7 @@ static int omap2_mcspi_transfer_one_message(struct spi_master *master,
1088 return 0; 1088 return 0;
1089} 1089}
1090 1090
1091static int __devinit omap2_mcspi_master_setup(struct omap2_mcspi *mcspi) 1091static int omap2_mcspi_master_setup(struct omap2_mcspi *mcspi)
1092{ 1092{
1093 struct spi_master *master = mcspi->master; 1093 struct spi_master *master = mcspi->master;
1094 struct omap2_mcspi_regs *ctx = &mcspi->ctx; 1094 struct omap2_mcspi_regs *ctx = &mcspi->ctx;
@@ -1141,7 +1141,7 @@ static const struct of_device_id omap_mcspi_of_match[] = {
1141}; 1141};
1142MODULE_DEVICE_TABLE(of, omap_mcspi_of_match); 1142MODULE_DEVICE_TABLE(of, omap_mcspi_of_match);
1143 1143
1144static int __devinit omap2_mcspi_probe(struct platform_device *pdev) 1144static int omap2_mcspi_probe(struct platform_device *pdev)
1145{ 1145{
1146 struct spi_master *master; 1146 struct spi_master *master;
1147 const struct omap2_mcspi_platform_config *pdata; 1147 const struct omap2_mcspi_platform_config *pdata;
@@ -1278,7 +1278,7 @@ free_master:
1278 return status; 1278 return status;
1279} 1279}
1280 1280
1281static int __devexit omap2_mcspi_remove(struct platform_device *pdev) 1281static int omap2_mcspi_remove(struct platform_device *pdev)
1282{ 1282{
1283 struct spi_master *master; 1283 struct spi_master *master;
1284 struct omap2_mcspi *mcspi; 1284 struct omap2_mcspi *mcspi;
@@ -1347,7 +1347,7 @@ static struct platform_driver omap2_mcspi_driver = {
1347 .of_match_table = omap_mcspi_of_match, 1347 .of_match_table = omap_mcspi_of_match,
1348 }, 1348 },
1349 .probe = omap2_mcspi_probe, 1349 .probe = omap2_mcspi_probe,
1350 .remove = __devexit_p(omap2_mcspi_remove), 1350 .remove = omap2_mcspi_remove,
1351}; 1351};
1352 1352
1353module_platform_driver(omap2_mcspi_driver); 1353module_platform_driver(omap2_mcspi_driver);
diff --git a/drivers/spi/spi-orion.c b/drivers/spi/spi-orion.c
index 011186d570fe..b7e718254b1d 100644
--- a/drivers/spi/spi-orion.c
+++ b/drivers/spi/spi-orion.c
@@ -501,7 +501,7 @@ static int __exit orion_spi_remove(struct platform_device *pdev)
501 501
502MODULE_ALIAS("platform:" DRIVER_NAME); 502MODULE_ALIAS("platform:" DRIVER_NAME);
503 503
504static const struct of_device_id orion_spi_of_match_table[] __devinitdata = { 504static const struct of_device_id orion_spi_of_match_table[] = {
505 { .compatible = "marvell,orion-spi", }, 505 { .compatible = "marvell,orion-spi", },
506 {} 506 {}
507}; 507};
diff --git a/drivers/spi/spi-pl022.c b/drivers/spi/spi-pl022.c
index 1361868fced7..b0fe393c882c 100644
--- a/drivers/spi/spi-pl022.c
+++ b/drivers/spi/spi-pl022.c
@@ -1089,7 +1089,7 @@ err_alloc_rx_sg:
1089 return -ENOMEM; 1089 return -ENOMEM;
1090} 1090}
1091 1091
1092static int __devinit pl022_dma_probe(struct pl022 *pl022) 1092static int pl022_dma_probe(struct pl022 *pl022)
1093{ 1093{
1094 dma_cap_mask_t mask; 1094 dma_cap_mask_t mask;
1095 1095
@@ -2058,8 +2058,7 @@ pl022_platform_data_dt_get(struct device *dev)
2058 return pd; 2058 return pd;
2059} 2059}
2060 2060
2061static int __devinit 2061static int pl022_probe(struct amba_device *adev, const struct amba_id *id)
2062pl022_probe(struct amba_device *adev, const struct amba_id *id)
2063{ 2062{
2064 struct device *dev = &adev->dev; 2063 struct device *dev = &adev->dev;
2065 struct pl022_ssp_controller *platform_info = adev->dev.platform_data; 2064 struct pl022_ssp_controller *platform_info = adev->dev.platform_data;
@@ -2275,7 +2274,7 @@ pl022_probe(struct amba_device *adev, const struct amba_id *id)
2275 return status; 2274 return status;
2276} 2275}
2277 2276
2278static int __devexit 2277static int
2279pl022_remove(struct amba_device *adev) 2278pl022_remove(struct amba_device *adev)
2280{ 2279{
2281 struct pl022 *pl022 = amba_get_drvdata(adev); 2280 struct pl022 *pl022 = amba_get_drvdata(adev);
@@ -2484,7 +2483,7 @@ static struct amba_driver pl022_driver = {
2484 }, 2483 },
2485 .id_table = pl022_ids, 2484 .id_table = pl022_ids,
2486 .probe = pl022_probe, 2485 .probe = pl022_probe,
2487 .remove = __devexit_p(pl022_remove), 2486 .remove = pl022_remove,
2488}; 2487};
2489 2488
2490static int __init pl022_init(void) 2489static int __init pl022_init(void)
diff --git a/drivers/spi/spi-pxa2xx-pci.c b/drivers/spi/spi-pxa2xx-pci.c
index 9f6ba34b172c..cf95587eefde 100644
--- a/drivers/spi/spi-pxa2xx-pci.c
+++ b/drivers/spi/spi-pxa2xx-pci.c
@@ -51,7 +51,7 @@ void pxa_ssp_free(struct ssp_device *ssp)
51} 51}
52EXPORT_SYMBOL_GPL(pxa_ssp_free); 52EXPORT_SYMBOL_GPL(pxa_ssp_free);
53 53
54static int __devinit ce4100_spi_probe(struct pci_dev *dev, 54static int ce4100_spi_probe(struct pci_dev *dev,
55 const struct pci_device_id *ent) 55 const struct pci_device_id *ent)
56{ 56{
57 int ret; 57 int ret;
@@ -129,7 +129,7 @@ err_nomem:
129 return ret; 129 return ret;
130} 130}
131 131
132static void __devexit ce4100_spi_remove(struct pci_dev *dev) 132static void ce4100_spi_remove(struct pci_dev *dev)
133{ 133{
134 struct ce4100_info *spi_info; 134 struct ce4100_info *spi_info;
135 struct ssp_device *ssp; 135 struct ssp_device *ssp;
@@ -161,7 +161,7 @@ static struct pci_driver ce4100_spi_driver = {
161 .name = "ce4100_spi", 161 .name = "ce4100_spi",
162 .id_table = ce4100_spi_devices, 162 .id_table = ce4100_spi_devices,
163 .probe = ce4100_spi_probe, 163 .probe = ce4100_spi_probe,
164 .remove = __devexit_p(ce4100_spi_remove), 164 .remove = ce4100_spi_remove,
165}; 165};
166 166
167module_pci_driver(ce4100_spi_driver); 167module_pci_driver(ce4100_spi_driver);
diff --git a/drivers/spi/spi-pxa2xx.c b/drivers/spi/spi-pxa2xx.c
index dc25bee8d33f..5c8c4f5883c4 100644
--- a/drivers/spi/spi-pxa2xx.c
+++ b/drivers/spi/spi-pxa2xx.c
@@ -1438,7 +1438,7 @@ static void cleanup(struct spi_device *spi)
1438 kfree(chip); 1438 kfree(chip);
1439} 1439}
1440 1440
1441static int __devinit init_queue(struct driver_data *drv_data) 1441static int init_queue(struct driver_data *drv_data)
1442{ 1442{
1443 INIT_LIST_HEAD(&drv_data->queue); 1443 INIT_LIST_HEAD(&drv_data->queue);
1444 spin_lock_init(&drv_data->lock); 1444 spin_lock_init(&drv_data->lock);
@@ -1526,7 +1526,7 @@ static int destroy_queue(struct driver_data *drv_data)
1526 return 0; 1526 return 0;
1527} 1527}
1528 1528
1529static int __devinit pxa2xx_spi_probe(struct platform_device *pdev) 1529static int pxa2xx_spi_probe(struct platform_device *pdev)
1530{ 1530{
1531 struct device *dev = &pdev->dev; 1531 struct device *dev = &pdev->dev;
1532 struct pxa2xx_spi_master *platform_info; 1532 struct pxa2xx_spi_master *platform_info;
diff --git a/drivers/spi/spi-rspi.c b/drivers/spi/spi-rspi.c
index 30faf6d4ab91..902f2fb902db 100644
--- a/drivers/spi/spi-rspi.c
+++ b/drivers/spi/spi-rspi.c
@@ -661,7 +661,7 @@ static irqreturn_t rspi_irq(int irq, void *_sr)
661 return ret; 661 return ret;
662} 662}
663 663
664static int __devinit rspi_request_dma(struct rspi_data *rspi, 664static int rspi_request_dma(struct rspi_data *rspi,
665 struct platform_device *pdev) 665 struct platform_device *pdev)
666{ 666{
667 struct rspi_plat_data *rspi_pd = pdev->dev.platform_data; 667 struct rspi_plat_data *rspi_pd = pdev->dev.platform_data;
@@ -709,7 +709,7 @@ static int __devinit rspi_request_dma(struct rspi_data *rspi,
709 return 0; 709 return 0;
710} 710}
711 711
712static void __devexit rspi_release_dma(struct rspi_data *rspi) 712static void rspi_release_dma(struct rspi_data *rspi)
713{ 713{
714 if (rspi->chan_tx) 714 if (rspi->chan_tx)
715 dma_release_channel(rspi->chan_tx); 715 dma_release_channel(rspi->chan_tx);
@@ -717,7 +717,7 @@ static void __devexit rspi_release_dma(struct rspi_data *rspi)
717 dma_release_channel(rspi->chan_rx); 717 dma_release_channel(rspi->chan_rx);
718} 718}
719 719
720static int __devexit rspi_remove(struct platform_device *pdev) 720static int rspi_remove(struct platform_device *pdev)
721{ 721{
722 struct rspi_data *rspi = dev_get_drvdata(&pdev->dev); 722 struct rspi_data *rspi = dev_get_drvdata(&pdev->dev);
723 723
@@ -731,7 +731,7 @@ static int __devexit rspi_remove(struct platform_device *pdev)
731 return 0; 731 return 0;
732} 732}
733 733
734static int __devinit rspi_probe(struct platform_device *pdev) 734static int rspi_probe(struct platform_device *pdev)
735{ 735{
736 struct resource *res; 736 struct resource *res;
737 struct spi_master *master; 737 struct spi_master *master;
@@ -827,7 +827,7 @@ error1:
827 827
828static struct platform_driver rspi_driver = { 828static struct platform_driver rspi_driver = {
829 .probe = rspi_probe, 829 .probe = rspi_probe,
830 .remove = __devexit_p(rspi_remove), 830 .remove = rspi_remove,
831 .driver = { 831 .driver = {
832 .name = "rspi", 832 .name = "rspi",
833 .owner = THIS_MODULE, 833 .owner = THIS_MODULE,
diff --git a/drivers/spi/spi-s3c24xx.c b/drivers/spi/spi-s3c24xx.c
index a2a080b7f42b..02d64603fcc5 100644
--- a/drivers/spi/spi-s3c24xx.c
+++ b/drivers/spi/spi-s3c24xx.c
@@ -506,7 +506,7 @@ static void s3c24xx_spi_initialsetup(struct s3c24xx_spi *hw)
506 } 506 }
507} 507}
508 508
509static int __devinit s3c24xx_spi_probe(struct platform_device *pdev) 509static int s3c24xx_spi_probe(struct platform_device *pdev)
510{ 510{
511 struct s3c2410_spi_info *pdata; 511 struct s3c2410_spi_info *pdata;
512 struct s3c24xx_spi *hw; 512 struct s3c24xx_spi *hw;
@@ -663,7 +663,7 @@ static int __devinit s3c24xx_spi_probe(struct platform_device *pdev)
663 return err; 663 return err;
664} 664}
665 665
666static int __devexit s3c24xx_spi_remove(struct platform_device *dev) 666static int s3c24xx_spi_remove(struct platform_device *dev)
667{ 667{
668 struct s3c24xx_spi *hw = platform_get_drvdata(dev); 668 struct s3c24xx_spi *hw = platform_get_drvdata(dev);
669 669
@@ -722,7 +722,7 @@ static const struct dev_pm_ops s3c24xx_spi_pmops = {
722MODULE_ALIAS("platform:s3c2410-spi"); 722MODULE_ALIAS("platform:s3c2410-spi");
723static struct platform_driver s3c24xx_spi_driver = { 723static struct platform_driver s3c24xx_spi_driver = {
724 .probe = s3c24xx_spi_probe, 724 .probe = s3c24xx_spi_probe,
725 .remove = __devexit_p(s3c24xx_spi_remove), 725 .remove = s3c24xx_spi_remove,
726 .driver = { 726 .driver = {
727 .name = "s3c2410-spi", 727 .name = "s3c2410-spi",
728 .owner = THIS_MODULE, 728 .owner = THIS_MODULE,
diff --git a/drivers/spi/spi-s3c64xx.c b/drivers/spi/spi-s3c64xx.c
index 57900a810bf2..4dd7b7ce5c5a 100644
--- a/drivers/spi/spi-s3c64xx.c
+++ b/drivers/spi/spi-s3c64xx.c
@@ -1056,7 +1056,7 @@ static void s3c64xx_spi_hwinit(struct s3c64xx_spi_driver_data *sdd, int channel)
1056 flush_fifo(sdd); 1056 flush_fifo(sdd);
1057} 1057}
1058 1058
1059static int __devinit s3c64xx_spi_get_dmares( 1059static int s3c64xx_spi_get_dmares(
1060 struct s3c64xx_spi_driver_data *sdd, bool tx) 1060 struct s3c64xx_spi_driver_data *sdd, bool tx)
1061{ 1061{
1062 struct platform_device *pdev = sdd->pdev; 1062 struct platform_device *pdev = sdd->pdev;
@@ -1135,7 +1135,7 @@ static void s3c64xx_spi_dt_gpio_free(struct s3c64xx_spi_driver_data *sdd)
1135 gpio_free(sdd->gpios[idx]); 1135 gpio_free(sdd->gpios[idx]);
1136} 1136}
1137 1137
1138static struct __devinit s3c64xx_spi_info * s3c64xx_spi_parse_dt( 1138static struct s3c64xx_spi_info * s3c64xx_spi_parse_dt(
1139 struct device *dev) 1139 struct device *dev)
1140{ 1140{
1141 struct s3c64xx_spi_info *sci; 1141 struct s3c64xx_spi_info *sci;
diff --git a/drivers/spi/spi-sh-hspi.c b/drivers/spi/spi-sh-hspi.c
index 47c4beee8a0e..32f7b55fce09 100644
--- a/drivers/spi/spi-sh-hspi.c
+++ b/drivers/spi/spi-sh-hspi.c
@@ -268,7 +268,7 @@ static void hspi_cleanup(struct spi_device *spi)
268 dev_dbg(dev, "%s cleanup\n", spi->modalias); 268 dev_dbg(dev, "%s cleanup\n", spi->modalias);
269} 269}
270 270
271static int __devinit hspi_probe(struct platform_device *pdev) 271static int hspi_probe(struct platform_device *pdev)
272{ 272{
273 struct resource *res; 273 struct resource *res;
274 struct spi_master *master; 274 struct spi_master *master;
@@ -339,7 +339,7 @@ static int __devinit hspi_probe(struct platform_device *pdev)
339 return ret; 339 return ret;
340} 340}
341 341
342static int __devexit hspi_remove(struct platform_device *pdev) 342static int hspi_remove(struct platform_device *pdev)
343{ 343{
344 struct hspi_priv *hspi = dev_get_drvdata(&pdev->dev); 344 struct hspi_priv *hspi = dev_get_drvdata(&pdev->dev);
345 345
@@ -353,7 +353,7 @@ static int __devexit hspi_remove(struct platform_device *pdev)
353 353
354static struct platform_driver hspi_driver = { 354static struct platform_driver hspi_driver = {
355 .probe = hspi_probe, 355 .probe = hspi_probe,
356 .remove = __devexit_p(hspi_remove), 356 .remove = hspi_remove,
357 .driver = { 357 .driver = {
358 .name = "sh-hspi", 358 .name = "sh-hspi",
359 .owner = THIS_MODULE, 359 .owner = THIS_MODULE,
diff --git a/drivers/spi/spi-sh.c b/drivers/spi/spi-sh.c
index 79442c31bcd9..3c3600a994bd 100644
--- a/drivers/spi/spi-sh.c
+++ b/drivers/spi/spi-sh.c
@@ -432,7 +432,7 @@ static irqreturn_t spi_sh_irq(int irq, void *_ss)
432 return IRQ_HANDLED; 432 return IRQ_HANDLED;
433} 433}
434 434
435static int __devexit spi_sh_remove(struct platform_device *pdev) 435static int spi_sh_remove(struct platform_device *pdev)
436{ 436{
437 struct spi_sh_data *ss = dev_get_drvdata(&pdev->dev); 437 struct spi_sh_data *ss = dev_get_drvdata(&pdev->dev);
438 438
@@ -444,7 +444,7 @@ static int __devexit spi_sh_remove(struct platform_device *pdev)
444 return 0; 444 return 0;
445} 445}
446 446
447static int __devinit spi_sh_probe(struct platform_device *pdev) 447static int spi_sh_probe(struct platform_device *pdev)
448{ 448{
449 struct resource *res; 449 struct resource *res;
450 struct spi_master *master; 450 struct spi_master *master;
@@ -539,7 +539,7 @@ static int __devinit spi_sh_probe(struct platform_device *pdev)
539 539
540static struct platform_driver spi_sh_driver = { 540static struct platform_driver spi_sh_driver = {
541 .probe = spi_sh_probe, 541 .probe = spi_sh_probe,
542 .remove = __devexit_p(spi_sh_remove), 542 .remove = spi_sh_remove,
543 .driver = { 543 .driver = {
544 .name = "sh_spi", 544 .name = "sh_spi",
545 .owner = THIS_MODULE, 545 .owner = THIS_MODULE,
diff --git a/drivers/spi/spi-sirf.c b/drivers/spi/spi-sirf.c
index ecc3d9763d10..e0f43a512e84 100644
--- a/drivers/spi/spi-sirf.c
+++ b/drivers/spi/spi-sirf.c
@@ -479,7 +479,7 @@ static int spi_sirfsoc_setup(struct spi_device *spi)
479 return spi_sirfsoc_setup_transfer(spi, NULL); 479 return spi_sirfsoc_setup_transfer(spi, NULL);
480} 480}
481 481
482static int __devinit spi_sirfsoc_probe(struct platform_device *pdev) 482static int spi_sirfsoc_probe(struct platform_device *pdev)
483{ 483{
484 struct sirfsoc_spi *sspi; 484 struct sirfsoc_spi *sspi;
485 struct spi_master *master; 485 struct spi_master *master;
@@ -604,7 +604,7 @@ err_cs:
604 return ret; 604 return ret;
605} 605}
606 606
607static int __devexit spi_sirfsoc_remove(struct platform_device *pdev) 607static int spi_sirfsoc_remove(struct platform_device *pdev)
608{ 608{
609 struct spi_master *master; 609 struct spi_master *master;
610 struct sirfsoc_spi *sspi; 610 struct sirfsoc_spi *sspi;
@@ -673,7 +673,7 @@ static struct platform_driver spi_sirfsoc_driver = {
673 .of_match_table = spi_sirfsoc_of_match, 673 .of_match_table = spi_sirfsoc_of_match,
674 }, 674 },
675 .probe = spi_sirfsoc_probe, 675 .probe = spi_sirfsoc_probe,
676 .remove = __devexit_p(spi_sirfsoc_remove), 676 .remove = spi_sirfsoc_remove,
677}; 677};
678module_platform_driver(spi_sirfsoc_driver); 678module_platform_driver(spi_sirfsoc_driver);
679 679
diff --git a/drivers/spi/spi-tegra20-sflash.c b/drivers/spi/spi-tegra20-sflash.c
index 54eb9488fa5a..448a8cc71df3 100644
--- a/drivers/spi/spi-tegra20-sflash.c
+++ b/drivers/spi/spi-tegra20-sflash.c
@@ -451,13 +451,13 @@ static struct tegra_spi_platform_data *tegra_sflash_parse_dt(
451 return pdata; 451 return pdata;
452} 452}
453 453
454static struct of_device_id tegra_sflash_of_match[] __devinitconst = { 454static struct of_device_id tegra_sflash_of_match[] = {
455 { .compatible = "nvidia,tegra20-sflash", }, 455 { .compatible = "nvidia,tegra20-sflash", },
456 {} 456 {}
457}; 457};
458MODULE_DEVICE_TABLE(of, tegra_sflash_of_match); 458MODULE_DEVICE_TABLE(of, tegra_sflash_of_match);
459 459
460static int __devinit tegra_sflash_probe(struct platform_device *pdev) 460static int tegra_sflash_probe(struct platform_device *pdev)
461{ 461{
462 struct spi_master *master; 462 struct spi_master *master;
463 struct tegra_sflash_data *tsd; 463 struct tegra_sflash_data *tsd;
@@ -575,7 +575,7 @@ exit_free_master:
575 return ret; 575 return ret;
576} 576}
577 577
578static int __devexit tegra_sflash_remove(struct platform_device *pdev) 578static int tegra_sflash_remove(struct platform_device *pdev)
579{ 579{
580 struct spi_master *master = dev_get_drvdata(&pdev->dev); 580 struct spi_master *master = dev_get_drvdata(&pdev->dev);
581 struct tegra_sflash_data *tsd = spi_master_get_devdata(master); 581 struct tegra_sflash_data *tsd = spi_master_get_devdata(master);
@@ -655,7 +655,7 @@ static struct platform_driver tegra_sflash_driver = {
655 .of_match_table = of_match_ptr(tegra_sflash_of_match), 655 .of_match_table = of_match_ptr(tegra_sflash_of_match),
656 }, 656 },
657 .probe = tegra_sflash_probe, 657 .probe = tegra_sflash_probe,
658 .remove = __devexit_p(tegra_sflash_remove), 658 .remove = tegra_sflash_remove,
659}; 659};
660module_platform_driver(tegra_sflash_driver); 660module_platform_driver(tegra_sflash_driver);
661 661
diff --git a/drivers/spi/spi-tegra20-slink.c b/drivers/spi/spi-tegra20-slink.c
index 7882b50329e2..651167f2e0af 100644
--- a/drivers/spi/spi-tegra20-slink.c
+++ b/drivers/spi/spi-tegra20-slink.c
@@ -1108,14 +1108,14 @@ const struct tegra_slink_chip_data tegra20_spi_cdata = {
1108 .cs_hold_time = false, 1108 .cs_hold_time = false,
1109}; 1109};
1110 1110
1111static struct of_device_id tegra_slink_of_match[] __devinitconst = { 1111static struct of_device_id tegra_slink_of_match[] = {
1112 { .compatible = "nvidia,tegra30-slink", .data = &tegra30_spi_cdata, }, 1112 { .compatible = "nvidia,tegra30-slink", .data = &tegra30_spi_cdata, },
1113 { .compatible = "nvidia,tegra20-slink", .data = &tegra20_spi_cdata, }, 1113 { .compatible = "nvidia,tegra20-slink", .data = &tegra20_spi_cdata, },
1114 {} 1114 {}
1115}; 1115};
1116MODULE_DEVICE_TABLE(of, tegra_slink_of_match); 1116MODULE_DEVICE_TABLE(of, tegra_slink_of_match);
1117 1117
1118static int __devinit tegra_slink_probe(struct platform_device *pdev) 1118static int tegra_slink_probe(struct platform_device *pdev)
1119{ 1119{
1120 struct spi_master *master; 1120 struct spi_master *master;
1121 struct tegra_slink_data *tspi; 1121 struct tegra_slink_data *tspi;
@@ -1261,7 +1261,7 @@ exit_free_master:
1261 return ret; 1261 return ret;
1262} 1262}
1263 1263
1264static int __devexit tegra_slink_remove(struct platform_device *pdev) 1264static int tegra_slink_remove(struct platform_device *pdev)
1265{ 1265{
1266 struct spi_master *master = dev_get_drvdata(&pdev->dev); 1266 struct spi_master *master = dev_get_drvdata(&pdev->dev);
1267 struct tegra_slink_data *tspi = spi_master_get_devdata(master); 1267 struct tegra_slink_data *tspi = spi_master_get_devdata(master);
@@ -1348,7 +1348,7 @@ static struct platform_driver tegra_slink_driver = {
1348 .of_match_table = of_match_ptr(tegra_slink_of_match), 1348 .of_match_table = of_match_ptr(tegra_slink_of_match),
1349 }, 1349 },
1350 .probe = tegra_slink_probe, 1350 .probe = tegra_slink_probe,
1351 .remove = __devexit_p(tegra_slink_remove), 1351 .remove = tegra_slink_remove,
1352}; 1352};
1353module_platform_driver(tegra_slink_driver); 1353module_platform_driver(tegra_slink_driver);
1354 1354
diff --git a/drivers/spi/spi-ti-ssp.c b/drivers/spi/spi-ti-ssp.c
index 3f6f6e81c655..46992cab65f1 100644
--- a/drivers/spi/spi-ti-ssp.c
+++ b/drivers/spi/spi-ti-ssp.c
@@ -289,7 +289,7 @@ error_unlock:
289 return error; 289 return error;
290} 290}
291 291
292static int __devinit ti_ssp_spi_probe(struct platform_device *pdev) 292static int ti_ssp_spi_probe(struct platform_device *pdev)
293{ 293{
294 const struct ti_ssp_spi_data *pdata; 294 const struct ti_ssp_spi_data *pdata;
295 struct ti_ssp_spi *hw; 295 struct ti_ssp_spi *hw;
@@ -357,7 +357,7 @@ error_wq:
357 return error; 357 return error;
358} 358}
359 359
360static int __devexit ti_ssp_spi_remove(struct platform_device *pdev) 360static int ti_ssp_spi_remove(struct platform_device *pdev)
361{ 361{
362 struct ti_ssp_spi *hw = platform_get_drvdata(pdev); 362 struct ti_ssp_spi *hw = platform_get_drvdata(pdev);
363 int error; 363 int error;
@@ -378,7 +378,7 @@ static int __devexit ti_ssp_spi_remove(struct platform_device *pdev)
378 378
379static struct platform_driver ti_ssp_spi_driver = { 379static struct platform_driver ti_ssp_spi_driver = {
380 .probe = ti_ssp_spi_probe, 380 .probe = ti_ssp_spi_probe,
381 .remove = __devexit_p(ti_ssp_spi_remove), 381 .remove = ti_ssp_spi_remove,
382 .driver = { 382 .driver = {
383 .name = "ti-ssp-spi", 383 .name = "ti-ssp-spi",
384 .owner = THIS_MODULE, 384 .owner = THIS_MODULE,
diff --git a/drivers/spi/spi-tle62x0.c b/drivers/spi/spi-tle62x0.c
index 24421024deaf..6b0874d782ed 100644
--- a/drivers/spi/spi-tle62x0.c
+++ b/drivers/spi/spi-tle62x0.c
@@ -240,7 +240,7 @@ static int to_gpio_num(struct device_attribute *attr)
240 return -1; 240 return -1;
241} 241}
242 242
243static int __devinit tle62x0_probe(struct spi_device *spi) 243static int tle62x0_probe(struct spi_device *spi)
244{ 244{
245 struct tle62x0_state *st; 245 struct tle62x0_state *st;
246 struct tle62x0_pdata *pdata; 246 struct tle62x0_pdata *pdata;
@@ -294,7 +294,7 @@ static int __devinit tle62x0_probe(struct spi_device *spi)
294 return ret; 294 return ret;
295} 295}
296 296
297static int __devexit tle62x0_remove(struct spi_device *spi) 297static int tle62x0_remove(struct spi_device *spi)
298{ 298{
299 struct tle62x0_state *st = spi_get_drvdata(spi); 299 struct tle62x0_state *st = spi_get_drvdata(spi);
300 int ptr; 300 int ptr;
@@ -313,7 +313,7 @@ static struct spi_driver tle62x0_driver = {
313 .owner = THIS_MODULE, 313 .owner = THIS_MODULE,
314 }, 314 },
315 .probe = tle62x0_probe, 315 .probe = tle62x0_probe,
316 .remove = __devexit_p(tle62x0_remove), 316 .remove = tle62x0_remove,
317}; 317};
318 318
319module_spi_driver(tle62x0_driver); 319module_spi_driver(tle62x0_driver);
diff --git a/drivers/spi/spi-topcliff-pch.c b/drivers/spi/spi-topcliff-pch.c
index 135f7406f4bf..f756481b0fea 100644
--- a/drivers/spi/spi-topcliff-pch.c
+++ b/drivers/spi/spi-topcliff-pch.c
@@ -1401,7 +1401,7 @@ static void pch_alloc_dma_buf(struct pch_spi_board_data *board_dat,
1401 PCH_BUF_SIZE, &dma->rx_buf_dma, GFP_KERNEL); 1401 PCH_BUF_SIZE, &dma->rx_buf_dma, GFP_KERNEL);
1402} 1402}
1403 1403
1404static int __devinit pch_spi_pd_probe(struct platform_device *plat_dev) 1404static int pch_spi_pd_probe(struct platform_device *plat_dev)
1405{ 1405{
1406 int ret; 1406 int ret;
1407 struct spi_master *master; 1407 struct spi_master *master;
@@ -1498,7 +1498,7 @@ err_pci_iomap:
1498 return ret; 1498 return ret;
1499} 1499}
1500 1500
1501static int __devexit pch_spi_pd_remove(struct platform_device *plat_dev) 1501static int pch_spi_pd_remove(struct platform_device *plat_dev)
1502{ 1502{
1503 struct pch_spi_board_data *board_dat = dev_get_platdata(&plat_dev->dev); 1503 struct pch_spi_board_data *board_dat = dev_get_platdata(&plat_dev->dev);
1504 struct pch_spi_data *data = platform_get_drvdata(plat_dev); 1504 struct pch_spi_data *data = platform_get_drvdata(plat_dev);
@@ -1619,12 +1619,12 @@ static struct platform_driver pch_spi_pd_driver = {
1619 .owner = THIS_MODULE, 1619 .owner = THIS_MODULE,
1620 }, 1620 },
1621 .probe = pch_spi_pd_probe, 1621 .probe = pch_spi_pd_probe,
1622 .remove = __devexit_p(pch_spi_pd_remove), 1622 .remove = pch_spi_pd_remove,
1623 .suspend = pch_spi_pd_suspend, 1623 .suspend = pch_spi_pd_suspend,
1624 .resume = pch_spi_pd_resume 1624 .resume = pch_spi_pd_resume
1625}; 1625};
1626 1626
1627static int __devinit pch_spi_probe(struct pci_dev *pdev, 1627static int pch_spi_probe(struct pci_dev *pdev,
1628 const struct pci_device_id *id) 1628 const struct pci_device_id *id)
1629{ 1629{
1630 struct pch_spi_board_data *board_dat; 1630 struct pch_spi_board_data *board_dat;
@@ -1705,7 +1705,7 @@ err_no_mem:
1705 return retval; 1705 return retval;
1706} 1706}
1707 1707
1708static void __devexit pch_spi_remove(struct pci_dev *pdev) 1708static void pch_spi_remove(struct pci_dev *pdev)
1709{ 1709{
1710 int i; 1710 int i;
1711 struct pch_pd_dev_save *pd_dev_save = pci_get_drvdata(pdev); 1711 struct pch_pd_dev_save *pd_dev_save = pci_get_drvdata(pdev);
@@ -1776,7 +1776,7 @@ static struct pci_driver pch_spi_pcidev_driver = {
1776 .name = "pch_spi", 1776 .name = "pch_spi",
1777 .id_table = pch_spi_pcidev_id, 1777 .id_table = pch_spi_pcidev_id,
1778 .probe = pch_spi_probe, 1778 .probe = pch_spi_probe,
1779 .remove = __devexit_p(pch_spi_remove), 1779 .remove = pch_spi_remove,
1780 .suspend = pch_spi_suspend, 1780 .suspend = pch_spi_suspend,
1781 .resume = pch_spi_resume, 1781 .resume = pch_spi_resume,
1782}; 1782};
diff --git a/drivers/spi/spi-xcomm.c b/drivers/spi/spi-xcomm.c
index 266a847e2992..4d3ec8b9f479 100644
--- a/drivers/spi/spi-xcomm.c
+++ b/drivers/spi/spi-xcomm.c
@@ -217,7 +217,7 @@ static int spi_xcomm_setup(struct spi_device *spi)
217 return 0; 217 return 0;
218} 218}
219 219
220static int __devinit spi_xcomm_probe(struct i2c_client *i2c, 220static int spi_xcomm_probe(struct i2c_client *i2c,
221 const struct i2c_device_id *id) 221 const struct i2c_device_id *id)
222{ 222{
223 struct spi_xcomm *spi_xcomm; 223 struct spi_xcomm *spi_xcomm;
@@ -246,7 +246,7 @@ static int __devinit spi_xcomm_probe(struct i2c_client *i2c,
246 return ret; 246 return ret;
247} 247}
248 248
249static int __devexit spi_xcomm_remove(struct i2c_client *i2c) 249static int spi_xcomm_remove(struct i2c_client *i2c)
250{ 250{
251 struct spi_master *master = i2c_get_clientdata(i2c); 251 struct spi_master *master = i2c_get_clientdata(i2c);
252 252
@@ -267,7 +267,7 @@ static struct i2c_driver spi_xcomm_driver = {
267 }, 267 },
268 .id_table = spi_xcomm_ids, 268 .id_table = spi_xcomm_ids,
269 .probe = spi_xcomm_probe, 269 .probe = spi_xcomm_probe,
270 .remove = __devexit_p(spi_xcomm_remove), 270 .remove = spi_xcomm_remove,
271}; 271};
272module_i2c_driver(spi_xcomm_driver); 272module_i2c_driver(spi_xcomm_driver);
273 273
diff --git a/drivers/spi/spi-xilinx.c b/drivers/spi/spi-xilinx.c
index 4c5a663b9fa8..e1d769607425 100644
--- a/drivers/spi/spi-xilinx.c
+++ b/drivers/spi/spi-xilinx.c
@@ -462,7 +462,7 @@ void xilinx_spi_deinit(struct spi_master *master)
462} 462}
463EXPORT_SYMBOL(xilinx_spi_deinit); 463EXPORT_SYMBOL(xilinx_spi_deinit);
464 464
465static int __devinit xilinx_spi_probe(struct platform_device *dev) 465static int xilinx_spi_probe(struct platform_device *dev)
466{ 466{
467 struct xspi_platform_data *pdata; 467 struct xspi_platform_data *pdata;
468 struct resource *r; 468 struct resource *r;
@@ -518,7 +518,7 @@ static int __devinit xilinx_spi_probe(struct platform_device *dev)
518 return 0; 518 return 0;
519} 519}
520 520
521static int __devexit xilinx_spi_remove(struct platform_device *dev) 521static int xilinx_spi_remove(struct platform_device *dev)
522{ 522{
523 xilinx_spi_deinit(platform_get_drvdata(dev)); 523 xilinx_spi_deinit(platform_get_drvdata(dev));
524 platform_set_drvdata(dev, 0); 524 platform_set_drvdata(dev, 0);
@@ -531,7 +531,7 @@ MODULE_ALIAS("platform:" XILINX_SPI_NAME);
531 531
532static struct platform_driver xilinx_spi_driver = { 532static struct platform_driver xilinx_spi_driver = {
533 .probe = xilinx_spi_probe, 533 .probe = xilinx_spi_probe,
534 .remove = __devexit_p(xilinx_spi_remove), 534 .remove = xilinx_spi_remove,
535 .driver = { 535 .driver = {
536 .name = XILINX_SPI_NAME, 536 .name = XILINX_SPI_NAME,
537 .owner = THIS_MODULE, 537 .owner = THIS_MODULE,
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index 2ca5f079ff01..689eaf7485af 100644
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -492,8 +492,7 @@ static void spi_match_master_to_boardinfo(struct spi_master *master,
492 * The board info passed can safely be __initdata ... but be careful of 492 * The board info passed can safely be __initdata ... but be careful of
493 * any embedded pointers (platform_data, etc), they're copied as-is. 493 * any embedded pointers (platform_data, etc), they're copied as-is.
494 */ 494 */
495int __devinit 495int spi_register_board_info(struct spi_board_info const *info, unsigned n)
496spi_register_board_info(struct spi_board_info const *info, unsigned n)
497{ 496{
498 struct boardinfo *bi; 497 struct boardinfo *bi;
499 int i; 498 int i;
diff --git a/drivers/spi/spidev.c b/drivers/spi/spidev.c
index e44abc96cd05..2e0655dbe070 100644
--- a/drivers/spi/spidev.c
+++ b/drivers/spi/spidev.c
@@ -573,7 +573,7 @@ static struct class *spidev_class;
573 573
574/*-------------------------------------------------------------------------*/ 574/*-------------------------------------------------------------------------*/
575 575
576static int __devinit spidev_probe(struct spi_device *spi) 576static int spidev_probe(struct spi_device *spi)
577{ 577{
578 struct spidev_data *spidev; 578 struct spidev_data *spidev;
579 int status; 579 int status;
@@ -622,7 +622,7 @@ static int __devinit spidev_probe(struct spi_device *spi)
622 return status; 622 return status;
623} 623}
624 624
625static int __devexit spidev_remove(struct spi_device *spi) 625static int spidev_remove(struct spi_device *spi)
626{ 626{
627 struct spidev_data *spidev = spi_get_drvdata(spi); 627 struct spidev_data *spidev = spi_get_drvdata(spi);
628 628
@@ -658,7 +658,7 @@ static struct spi_driver spidev_spi_driver = {
658 .of_match_table = of_match_ptr(spidev_dt_ids), 658 .of_match_table = of_match_ptr(spidev_dt_ids),
659 }, 659 },
660 .probe = spidev_probe, 660 .probe = spidev_probe,
661 .remove = __devexit_p(spidev_remove), 661 .remove = spidev_remove,
662 662
663 /* NOTE: suspend/resume methods are not necessary here. 663 /* NOTE: suspend/resume methods are not necessary here.
664 * We don't do anything except pass the requests to/from 664 * We don't do anything except pass the requests to/from
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-28 18:56:43 -0500