Skip to content

L
linux
Commit fd4a319b authored by Grant Likely's avatar Grant Likely
Browse files
Options

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: default avatarBill Pemberton <wfp5p@virginia.edu>
Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
parent 7730cba2
Hide whitespace changes
Inline Side-by-side
Showing with 153 additions and 158 deletions
drivers/spi/spi-altera.c
View file @ fd4a319b
...@@ -215,7 +215,7 @@ static irqreturn_t altera_spi_irq(int irq, void *dev) ...@@ -215,7 +215,7 @@ static irqreturn_t altera_spi_irq(int irq, void *dev)
return IRQ_HANDLED; return IRQ_HANDLED;
} }
static int __devinit altera_spi_probe(struct platform_device *pdev) static int altera_spi_probe(struct platform_device *pdev)
{ {
struct altera_spi_platform_data *platp = pdev->dev.platform_data; struct altera_spi_platform_data *platp = pdev->dev.platform_data;
struct altera_spi *hw; struct altera_spi *hw;
...@@ -290,7 +290,7 @@ static int __devinit altera_spi_probe(struct platform_device *pdev) ...@@ -290,7 +290,7 @@ static int __devinit altera_spi_probe(struct platform_device *pdev)
return err; return err;
} }
static int __devexit altera_spi_remove(struct platform_device *dev) static int altera_spi_remove(struct platform_device *dev)
{ {
struct altera_spi *hw = platform_get_drvdata(dev); struct altera_spi *hw = platform_get_drvdata(dev);
struct spi_master *master = hw->bitbang.master; struct spi_master *master = hw->bitbang.master;
...@@ -311,7 +311,7 @@ MODULE_DEVICE_TABLE(of, altera_spi_match); ...@@ -311,7 +311,7 @@ MODULE_DEVICE_TABLE(of, altera_spi_match);
static struct platform_driver altera_spi_driver = { static struct platform_driver altera_spi_driver = {
.probe = altera_spi_probe, .probe = altera_spi_probe,
.remove = __devexit_p(altera_spi_remove), .remove = altera_spi_remove,
.driver = { .driver = {
.name = DRV_NAME, .name = DRV_NAME,
.owner = THIS_MODULE, .owner = THIS_MODULE,
......
drivers/spi/spi-ath79.c
View file @ fd4a319b
...@@ -192,7 +192,7 @@ static u32 ath79_spi_txrx_mode0(struct spi_device *spi, unsigned nsecs, ...@@ -192,7 +192,7 @@ static u32 ath79_spi_txrx_mode0(struct spi_device *spi, unsigned nsecs,
return ath79_spi_rr(sp, AR71XX_SPI_REG_RDS); return ath79_spi_rr(sp, AR71XX_SPI_REG_RDS);
} }
static __devinit int ath79_spi_probe(struct platform_device *pdev) static int ath79_spi_probe(struct platform_device *pdev)
{ {
struct spi_master *master; struct spi_master *master;
struct ath79_spi *sp; struct ath79_spi *sp;
...@@ -251,7 +251,7 @@ static __devinit int ath79_spi_probe(struct platform_device *pdev) ...@@ -251,7 +251,7 @@ static __devinit int ath79_spi_probe(struct platform_device *pdev)
return ret; return ret;
} }
static __devexit int ath79_spi_remove(struct platform_device *pdev) static int ath79_spi_remove(struct platform_device *pdev)
{ {
struct ath79_spi *sp = platform_get_drvdata(pdev); struct ath79_spi *sp = platform_get_drvdata(pdev);
...@@ -265,7 +265,7 @@ static __devexit int ath79_spi_remove(struct platform_device *pdev) ...@@ -265,7 +265,7 @@ static __devexit int ath79_spi_remove(struct platform_device *pdev)
static struct platform_driver ath79_spi_driver = { static struct platform_driver ath79_spi_driver = {
.probe = ath79_spi_probe, .probe = ath79_spi_probe,
.remove = __devexit_p(ath79_spi_remove), .remove = ath79_spi_remove,
.driver = { .driver = {
.name = DRV_NAME, .name = DRV_NAME,
.owner = THIS_MODULE, .owner = THIS_MODULE,
......
drivers/spi/spi-atmel.c
View file @ fd4a319b
...@@ -907,7 +907,7 @@ static void atmel_spi_cleanup(struct spi_device *spi) ...@@ -907,7 +907,7 @@ static void atmel_spi_cleanup(struct spi_device *spi)
/*-------------------------------------------------------------------------*/ /*-------------------------------------------------------------------------*/
static int __devinit atmel_spi_probe(struct platform_device *pdev) static int atmel_spi_probe(struct platform_device *pdev)
{ {
struct resource *regs; struct resource *regs;
int irq; int irq;
...@@ -1003,7 +1003,7 @@ static int __devinit atmel_spi_probe(struct platform_device *pdev) ...@@ -1003,7 +1003,7 @@ static int __devinit atmel_spi_probe(struct platform_device *pdev)
return ret; return ret;
} }
static int __devexit atmel_spi_remove(struct platform_device *pdev) static int atmel_spi_remove(struct platform_device *pdev)
{ {
struct spi_master *master = platform_get_drvdata(pdev); struct spi_master *master = platform_get_drvdata(pdev);
struct atmel_spi *as = spi_master_get_devdata(master); struct atmel_spi *as = spi_master_get_devdata(master);
......
drivers/spi/spi-bcm63xx.c
View file @ fd4a319b
...@@ -329,7 +329,7 @@ static irqreturn_t bcm63xx_spi_interrupt(int irq, void *dev_id) ...@@ -329,7 +329,7 @@ static irqreturn_t bcm63xx_spi_interrupt(int irq, void *dev_id)
} }
static int __devinit bcm63xx_spi_probe(struct platform_device *pdev) static int bcm63xx_spi_probe(struct platform_device *pdev)
{ {
struct resource *r; struct resource *r;
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
...@@ -449,7 +449,7 @@ static int __devinit bcm63xx_spi_probe(struct platform_device *pdev) ...@@ -449,7 +449,7 @@ static int __devinit bcm63xx_spi_probe(struct platform_device *pdev)
return ret; return ret;
} }
static int __devexit bcm63xx_spi_remove(struct platform_device *pdev) static int bcm63xx_spi_remove(struct platform_device *pdev)
{ {
struct spi_master *master = spi_master_get(platform_get_drvdata(pdev)); struct spi_master *master = spi_master_get(platform_get_drvdata(pdev));
struct bcm63xx_spi *bs = spi_master_get_devdata(master); struct bcm63xx_spi *bs = spi_master_get_devdata(master);
...@@ -514,7 +514,7 @@ static struct platform_driver bcm63xx_spi_driver = { ...@@ -514,7 +514,7 @@ static struct platform_driver bcm63xx_spi_driver = {
.pm = BCM63XX_SPI_PM_OPS, .pm = BCM63XX_SPI_PM_OPS,
}, },
.probe = bcm63xx_spi_probe, .probe = bcm63xx_spi_probe,
.remove = __devexit_p(bcm63xx_spi_remove), .remove = bcm63xx_spi_remove,
}; };
module_platform_driver(bcm63xx_spi_driver); module_platform_driver(bcm63xx_spi_driver);
......
drivers/spi/spi-bfin-sport.c
View file @ fd4a319b
...@@ -755,8 +755,7 @@ bfin_sport_spi_destroy_queue(struct bfin_sport_spi_master_data *drv_data) ...@@ -755,8 +755,7 @@ bfin_sport_spi_destroy_queue(struct bfin_sport_spi_master_data *drv_data)
return 0; return 0;
} }
static int __devinit static int bfin_sport_spi_probe(struct platform_device *pdev)
bfin_sport_spi_probe(struct platform_device *pdev)
{ {
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
struct bfin5xx_spi_master *platform_info; struct bfin5xx_spi_master *platform_info;
...@@ -863,8 +862,7 @@ bfin_sport_spi_probe(struct platform_device *pdev) ...@@ -863,8 +862,7 @@ bfin_sport_spi_probe(struct platform_device *pdev)
} }
/* stop hardware and remove the driver */ /* stop hardware and remove the driver */
static int __devexit static int bfin_sport_spi_remove(struct platform_device *pdev)
bfin_sport_spi_remove(struct platform_device *pdev)
{ {
struct bfin_sport_spi_master_data *drv_data = platform_get_drvdata(pdev); struct bfin_sport_spi_master_data *drv_data = platform_get_drvdata(pdev);
int status = 0; int status = 0;
...@@ -935,7 +933,7 @@ static struct platform_driver bfin_sport_spi_driver = { ...@@ -935,7 +933,7 @@ static struct platform_driver bfin_sport_spi_driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
.probe = bfin_sport_spi_probe, .probe = bfin_sport_spi_probe,
.remove = __devexit_p(bfin_sport_spi_remove), .remove = bfin_sport_spi_remove,
.suspend = bfin_sport_spi_suspend, .suspend = bfin_sport_spi_suspend,
.resume = bfin_sport_spi_resume, .resume = bfin_sport_spi_resume,
}; };
......
drivers/spi/spi-bfin5xx.c
View file @ fd4a319b
...@@ -1387,7 +1387,7 @@ static int __init bfin_spi_probe(struct platform_device *pdev) ...@@ -1387,7 +1387,7 @@ static int __init bfin_spi_probe(struct platform_device *pdev)
} }
/* stop hardware and remove the driver */ /* stop hardware and remove the driver */
static int __devexit bfin_spi_remove(struct platform_device *pdev) static int bfin_spi_remove(struct platform_device *pdev)
{ {
struct bfin_spi_master_data *drv_data = platform_get_drvdata(pdev); struct bfin_spi_master_data *drv_data = platform_get_drvdata(pdev);
int status = 0; int status = 0;
...@@ -1477,7 +1477,7 @@ static struct platform_driver bfin_spi_driver = { ...@@ -1477,7 +1477,7 @@ static struct platform_driver bfin_spi_driver = {
}, },
.suspend = bfin_spi_suspend, .suspend = bfin_spi_suspend,
.resume = bfin_spi_resume, .resume = bfin_spi_resume,
.remove = __devexit_p(bfin_spi_remove), .remove = bfin_spi_remove,
}; };
static int __init bfin_spi_init(void) static int __init bfin_spi_init(void)
......
drivers/spi/spi-clps711x.c
View file @ fd4a319b
...@@ -163,7 +163,7 @@ static irqreturn_t spi_clps711x_isr(int irq, void *dev_id) ...@@ -163,7 +163,7 @@ static irqreturn_t spi_clps711x_isr(int irq, void *dev_id)
return IRQ_HANDLED; return IRQ_HANDLED;
} }
static int __devinit spi_clps711x_probe(struct platform_device *pdev) static int spi_clps711x_probe(struct platform_device *pdev)
{ {
int i, ret; int i, ret;
struct spi_master *master; struct spi_master *master;
...@@ -261,7 +261,7 @@ static int __devinit spi_clps711x_probe(struct platform_device *pdev) ...@@ -261,7 +261,7 @@ static int __devinit spi_clps711x_probe(struct platform_device *pdev)
return ret; return ret;
} }
static int __devexit spi_clps711x_remove(struct platform_device *pdev) static int spi_clps711x_remove(struct platform_device *pdev)
{ {
int i; int i;
struct spi_master *master = platform_get_drvdata(pdev); struct spi_master *master = platform_get_drvdata(pdev);
...@@ -287,7 +287,7 @@ static struct platform_driver clps711x_spi_driver = { ...@@ -287,7 +287,7 @@ static struct platform_driver clps711x_spi_driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
.probe = spi_clps711x_probe, .probe = spi_clps711x_probe,
.remove = __devexit_p(spi_clps711x_remove), .remove = spi_clps711x_remove,
}; };
module_platform_driver(clps711x_spi_driver); module_platform_driver(clps711x_spi_driver);
......
drivers/spi/spi-coldfire-qspi.c
View file @ fd4a319b
...@@ -401,7 +401,7 @@ static int mcfqspi_setup(struct spi_device *spi) ...@@ -401,7 +401,7 @@ static int mcfqspi_setup(struct spi_device *spi)
return 0; return 0;
} }
static int __devinit mcfqspi_probe(struct platform_device *pdev) static int mcfqspi_probe(struct platform_device *pdev)
{ {
struct spi_master *master; struct spi_master *master;
struct mcfqspi *mcfqspi; struct mcfqspi *mcfqspi;
...@@ -515,7 +515,7 @@ static int __devinit mcfqspi_probe(struct platform_device *pdev) ...@@ -515,7 +515,7 @@ static int __devinit mcfqspi_probe(struct platform_device *pdev)
return status; return status;
} }
static int __devexit mcfqspi_remove(struct platform_device *pdev) static int mcfqspi_remove(struct platform_device *pdev)
{ {
struct spi_master *master = platform_get_drvdata(pdev); struct spi_master *master = platform_get_drvdata(pdev);
struct mcfqspi *mcfqspi = spi_master_get_devdata(master); struct mcfqspi *mcfqspi = spi_master_get_devdata(master);
...@@ -594,7 +594,7 @@ static struct platform_driver mcfqspi_driver = { ...@@ -594,7 +594,7 @@ static struct platform_driver mcfqspi_driver = {
.driver.owner = THIS_MODULE, .driver.owner = THIS_MODULE,
.driver.pm = &mcfqspi_pm, .driver.pm = &mcfqspi_pm,
.probe = mcfqspi_probe, .probe = mcfqspi_probe,
.remove = __devexit_p(mcfqspi_remove), .remove = mcfqspi_remove,
}; };
module_platform_driver(mcfqspi_driver); module_platform_driver(mcfqspi_driver);
......
drivers/spi/spi-davinci.c
View file @ fd4a319b
...@@ -769,7 +769,7 @@ static int davinci_spi_request_dma(struct davinci_spi *dspi) ...@@ -769,7 +769,7 @@ static int davinci_spi_request_dma(struct davinci_spi *dspi)
* It will invoke spi_bitbang_start to create work queue so that client driver * It will invoke spi_bitbang_start to create work queue so that client driver
* can register transfer method to work queue. * can register transfer method to work queue.
*/ */
static int __devinit davinci_spi_probe(struct platform_device *pdev) static int davinci_spi_probe(struct platform_device *pdev)
{ {
struct spi_master *master; struct spi_master *master;
struct davinci_spi *dspi; struct davinci_spi *dspi;
...@@ -952,7 +952,7 @@ static int __devinit davinci_spi_probe(struct platform_device *pdev) ...@@ -952,7 +952,7 @@ static int __devinit davinci_spi_probe(struct platform_device *pdev)
* It will also call spi_bitbang_stop to destroy the work queue which was * It will also call spi_bitbang_stop to destroy the work queue which was
* created by spi_bitbang_start. * created by spi_bitbang_start.
*/ */
static int __devexit davinci_spi_remove(struct platform_device *pdev) static int davinci_spi_remove(struct platform_device *pdev)
{ {
struct davinci_spi *dspi; struct davinci_spi *dspi;
struct spi_master *master; struct spi_master *master;
...@@ -980,7 +980,7 @@ static struct platform_driver davinci_spi_driver = { ...@@ -980,7 +980,7 @@ static struct platform_driver davinci_spi_driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
.probe = davinci_spi_probe, .probe = davinci_spi_probe,
.remove = __devexit_p(davinci_spi_remove), .remove = davinci_spi_remove,
}; };
module_platform_driver(davinci_spi_driver); module_platform_driver(davinci_spi_driver);
......
drivers/spi/spi-dw-mmio.c
View file @ fd4a319b
...@@ -26,7 +26,7 @@ struct dw_spi_mmio { ...@@ -26,7 +26,7 @@ struct dw_spi_mmio {
struct clk *clk; struct clk *clk;
}; };
static int __devinit dw_spi_mmio_probe(struct platform_device *pdev) static int dw_spi_mmio_probe(struct platform_device *pdev)
{ {
struct dw_spi_mmio *dwsmmio; struct dw_spi_mmio *dwsmmio;
struct dw_spi *dws; struct dw_spi *dws;
...@@ -106,7 +106,7 @@ static int __devinit dw_spi_mmio_probe(struct platform_device *pdev) ...@@ -106,7 +106,7 @@ static int __devinit dw_spi_mmio_probe(struct platform_device *pdev)
return ret; return ret;
} }
static int __devexit dw_spi_mmio_remove(struct platform_device *pdev) static int dw_spi_mmio_remove(struct platform_device *pdev)
{ {
struct dw_spi_mmio *dwsmmio = platform_get_drvdata(pdev); struct dw_spi_mmio *dwsmmio = platform_get_drvdata(pdev);
struct resource *mem; struct resource *mem;
...@@ -129,7 +129,7 @@ static int __devexit dw_spi_mmio_remove(struct platform_device *pdev) ...@@ -129,7 +129,7 @@ static int __devexit dw_spi_mmio_remove(struct platform_device *pdev)
static struct platform_driver dw_spi_mmio_driver = { static struct platform_driver dw_spi_mmio_driver = {
.probe = dw_spi_mmio_probe, .probe = dw_spi_mmio_probe,
.remove = __devexit_p(dw_spi_mmio_remove), .remove = dw_spi_mmio_remove,
.driver = { .driver = {
.name = DRIVER_NAME, .name = DRIVER_NAME,
.owner = THIS_MODULE, .owner = THIS_MODULE,
......
drivers/spi/spi-dw-pci.c
View file @ fd4a319b
...@@ -32,7 +32,7 @@ struct dw_spi_pci { ...@@ -32,7 +32,7 @@ struct dw_spi_pci {
struct dw_spi dws; struct dw_spi dws;
}; };
static int __devinit spi_pci_probe(struct pci_dev *pdev, static int spi_pci_probe(struct pci_dev *pdev,
const struct pci_device_id *ent) const struct pci_device_id *ent)
{ {
struct dw_spi_pci *dwpci; struct dw_spi_pci *dwpci;
...@@ -105,7 +105,7 @@ static int __devinit spi_pci_probe(struct pci_dev *pdev, ...@@ -105,7 +105,7 @@ static int __devinit spi_pci_probe(struct pci_dev *pdev,
return ret; return ret;
} }
static void __devexit spi_pci_remove(struct pci_dev *pdev) static void spi_pci_remove(struct pci_dev *pdev)
{ {
struct dw_spi_pci *dwpci = pci_get_drvdata(pdev); struct dw_spi_pci *dwpci = pci_get_drvdata(pdev);
...@@ -159,7 +159,7 @@ static struct pci_driver dw_spi_driver = { ...@@ -159,7 +159,7 @@ static struct pci_driver dw_spi_driver = {
.name = DRIVER_NAME, .name = DRIVER_NAME,
.id_table = pci_ids, .id_table = pci_ids,
.probe = spi_pci_probe, .probe = spi_pci_probe,
.remove = __devexit_p(spi_pci_remove), .remove = spi_pci_remove,
.suspend = spi_suspend, .suspend = spi_suspend,
.resume = spi_resume, .resume = spi_resume,
}; };
......
drivers/spi/spi-dw.c
View file @ fd4a319b
...@@ -696,7 +696,7 @@ static void dw_spi_cleanup(struct spi_device *spi) ...@@ -696,7 +696,7 @@ static void dw_spi_cleanup(struct spi_device *spi)
kfree(chip); kfree(chip);
} }
static int __devinit init_queue(struct dw_spi *dws) static int init_queue(struct dw_spi *dws)
{ {
INIT_LIST_HEAD(&dws->queue); INIT_LIST_HEAD(&dws->queue);
spin_lock_init(&dws->lock); spin_lock_init(&dws->lock);
...@@ -795,7 +795,7 @@ static void spi_hw_init(struct dw_spi *dws) ...@@ -795,7 +795,7 @@ static void spi_hw_init(struct dw_spi *dws)
} }
} }
int __devinit dw_spi_add_host(struct dw_spi *dws) int dw_spi_add_host(struct dw_spi *dws)
{ {
struct spi_master *master; struct spi_master *master;
int ret; int ret;
...@@ -877,7 +877,7 @@ int __devinit dw_spi_add_host(struct dw_spi *dws) ...@@ -877,7 +877,7 @@ int __devinit dw_spi_add_host(struct dw_spi *dws)
} }
EXPORT_SYMBOL_GPL(dw_spi_add_host); EXPORT_SYMBOL_GPL(dw_spi_add_host);
void __devexit dw_spi_remove_host(struct dw_spi *dws) void dw_spi_remove_host(struct dw_spi *dws)
{ {
int status = 0; int status = 0;
......
drivers/spi/spi-ep93xx.c
View file @ fd4a319b
...@@ -1023,7 +1023,7 @@ static void ep93xx_spi_release_dma(struct ep93xx_spi *espi) ...@@ -1023,7 +1023,7 @@ static void ep93xx_spi_release_dma(struct ep93xx_spi *espi)
free_page((unsigned long)espi->zeropage); free_page((unsigned long)espi->zeropage);
} }
static int __devinit ep93xx_spi_probe(struct platform_device *pdev) static int ep93xx_spi_probe(struct platform_device *pdev)
{ {
struct spi_master *master; struct spi_master *master;
struct ep93xx_spi_info *info; struct ep93xx_spi_info *info;
...@@ -1138,7 +1138,7 @@ static int __devinit ep93xx_spi_probe(struct platform_device *pdev) ...@@ -1138,7 +1138,7 @@ static int __devinit ep93xx_spi_probe(struct platform_device *pdev)
return error; return error;
} }
static int __devexit ep93xx_spi_remove(struct platform_device *pdev) static int ep93xx_spi_remove(struct platform_device *pdev)
{ {
struct spi_master *master = platform_get_drvdata(pdev); struct spi_master *master = platform_get_drvdata(pdev);
struct ep93xx_spi *espi = spi_master_get_devdata(master); struct ep93xx_spi *espi = spi_master_get_devdata(master);
...@@ -1180,7 +1180,7 @@ static struct platform_driver ep93xx_spi_driver = { ...@@ -1180,7 +1180,7 @@ static struct platform_driver ep93xx_spi_driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
.probe = ep93xx_spi_probe, .probe = ep93xx_spi_probe,
.remove = __devexit_p(ep93xx_spi_remove), .remove = ep93xx_spi_remove,
}; };
module_platform_driver(ep93xx_spi_driver); module_platform_driver(ep93xx_spi_driver);
......
drivers/spi/spi-falcon.c
View file @ fd4a319b
...@@ -403,7 +403,7 @@ static int falcon_sflash_xfer_one(struct spi_master *master, ...@@ -403,7 +403,7 @@ static int falcon_sflash_xfer_one(struct spi_master *master,
return 0; return 0;
} }
static int __devinit falcon_sflash_probe(struct platform_device *pdev) static int falcon_sflash_probe(struct platform_device *pdev)
{ {
struct falcon_sflash *priv; struct falcon_sflash *priv;
struct spi_master *master; struct spi_master *master;
...@@ -438,7 +438,7 @@ static int __devinit falcon_sflash_probe(struct platform_device *pdev) ...@@ -438,7 +438,7 @@ static int __devinit falcon_sflash_probe(struct platform_device *pdev)
return ret; return ret;
} }
static int __devexit falcon_sflash_remove(struct platform_device *pdev) static int falcon_sflash_remove(struct platform_device *pdev)
{ {
struct falcon_sflash *priv = platform_get_drvdata(pdev); struct falcon_sflash *priv = platform_get_drvdata(pdev);
...@@ -455,7 +455,7 @@ MODULE_DEVICE_TABLE(of, falcon_sflash_match); ...@@ -455,7 +455,7 @@ MODULE_DEVICE_TABLE(of, falcon_sflash_match);
static struct platform_driver falcon_sflash_driver = { static struct platform_driver falcon_sflash_driver = {
.probe = falcon_sflash_probe, .probe = falcon_sflash_probe,
.remove = __devexit_p(falcon_sflash_remove), .remove = falcon_sflash_remove,
.driver = { .driver = {
.name = DRV_NAME, .name = DRV_NAME,
.owner = THIS_MODULE, .owner = THIS_MODULE,
......
drivers/spi/spi-fsl-espi.c
View file @ fd4a319b
...@@ -587,7 +587,7 @@ static void fsl_espi_remove(struct mpc8xxx_spi *mspi) ...@@ -587,7 +587,7 @@ static void fsl_espi_remove(struct mpc8xxx_spi *mspi)
iounmap(mspi->reg_base); iounmap(mspi->reg_base);
} }
static struct spi_master * __devinit fsl_espi_probe(struct device *dev, static struct spi_master * fsl_espi_probe(struct device *dev,
struct resource *mem, unsigned int irq) struct resource *mem, unsigned int irq)
{ {
struct fsl_spi_platform_data *pdata = dev->platform_data; struct fsl_spi_platform_data *pdata = dev->platform_data;
...@@ -686,7 +686,7 @@ static int of_fsl_espi_get_chipselects(struct device *dev) ...@@ -686,7 +686,7 @@ static int of_fsl_espi_get_chipselects(struct device *dev)
return 0; return 0;
} }
static int __devinit of_fsl_espi_probe(struct platform_device *ofdev) static int of_fsl_espi_probe(struct platform_device *ofdev)
{ {
struct device *dev = &ofdev->dev; struct device *dev = &ofdev->dev;
struct device_node *np = ofdev->dev.of_node; struct device_node *np = ofdev->dev.of_node;
...@@ -725,7 +725,7 @@ static int __devinit of_fsl_espi_probe(struct platform_device *ofdev) ...@@ -725,7 +725,7 @@ static int __devinit of_fsl_espi_probe(struct platform_device *ofdev)
return ret; return ret;
} }
static int __devexit of_fsl_espi_remove(struct platform_device *dev) static int of_fsl_espi_remove(struct platform_device *dev)
{ {
return mpc8xxx_spi_remove(&dev->dev); return mpc8xxx_spi_remove(&dev->dev);
} }
...@@ -743,7 +743,7 @@ static struct platform_driver fsl_espi_driver = { ...@@ -743,7 +743,7 @@ static struct platform_driver fsl_espi_driver = {
.of_match_table = of_fsl_espi_match, .of_match_table = of_fsl_espi_match,
}, },
.probe = of_fsl_espi_probe, .probe = of_fsl_espi_probe,
.remove = __devexit_p(of_fsl_espi_remove), .remove = of_fsl_espi_remove,
}; };
module_platform_driver(fsl_espi_driver); module_platform_driver(fsl_espi_driver);
......
drivers/spi/spi-fsl-lib.c
View file @ fd4a319b
...@@ -169,7 +169,7 @@ int mpc8xxx_spi_probe(struct device *dev, struct resource *mem, ...@@ -169,7 +169,7 @@ int mpc8xxx_spi_probe(struct device *dev, struct resource *mem,
return ret; return ret;
} }
int __devexit mpc8xxx_spi_remove(struct device *dev) int mpc8xxx_spi_remove(struct device *dev)
{ {
struct mpc8xxx_spi *mpc8xxx_spi; struct mpc8xxx_spi *mpc8xxx_spi;
struct spi_master *master; struct spi_master *master;
...@@ -189,7 +189,7 @@ int __devexit mpc8xxx_spi_remove(struct device *dev) ...@@ -189,7 +189,7 @@ int __devexit mpc8xxx_spi_remove(struct device *dev)
return 0; return 0;
} }
int __devinit of_mpc8xxx_spi_probe(struct platform_device *ofdev) int of_mpc8xxx_spi_probe(struct platform_device *ofdev)
{ {
struct device *dev = &ofdev->dev; struct device *dev = &ofdev->dev;
struct device_node *np = ofdev->dev.of_node; struct device_node *np = ofdev->dev.of_node;
......
drivers/spi/spi-fsl-spi.c
View file @ fd4a319b
...@@ -843,7 +843,7 @@ static void fsl_spi_remove(struct mpc8xxx_spi *mspi) ...@@ -843,7 +843,7 @@ static void fsl_spi_remove(struct mpc8xxx_spi *mspi)
fsl_spi_cpm_free(mspi); fsl_spi_cpm_free(mspi);
} }
static struct spi_master * __devinit fsl_spi_probe(struct device *dev, static struct spi_master * fsl_spi_probe(struct device *dev,
struct resource *mem, unsigned int irq) struct resource *mem, unsigned int irq)
{ {
struct fsl_spi_platform_data *pdata = dev->platform_data; struct fsl_spi_platform_data *pdata = dev->platform_data;
...@@ -1041,7 +1041,7 @@ static int of_fsl_spi_free_chipselects(struct device *dev) ...@@ -1041,7 +1041,7 @@ static int of_fsl_spi_free_chipselects(struct device *dev)
return 0; return 0;
} }
static int __devinit of_fsl_spi_probe(struct platform_device *ofdev) static int of_fsl_spi_probe(struct platform_device *ofdev)
{ {
struct device *dev = &ofdev->dev; struct device *dev = &ofdev->dev;
struct device_node *np = ofdev->dev.of_node; struct device_node *np = ofdev->dev.of_node;
...@@ -1081,7 +1081,7 @@ static int __devinit of_fsl_spi_probe(struct platform_device *ofdev) ...@@ -1081,7 +1081,7 @@ static int __devinit of_fsl_spi_probe(struct platform_device *ofdev)
return ret; return ret;
} }
static int __devexit of_fsl_spi_remove(struct platform_device *ofdev) static int of_fsl_spi_remove(struct platform_device *ofdev)
{ {
int ret; int ret;
...@@ -1105,7 +1105,7 @@ static struct platform_driver of_fsl_spi_driver = { ...@@ -1105,7 +1105,7 @@ static struct platform_driver of_fsl_spi_driver = {
.of_match_table = of_fsl_spi_match, .of_match_table = of_fsl_spi_match,
}, },
.probe = of_fsl_spi_probe, .probe = of_fsl_spi_probe,
.remove = __devexit_p(of_fsl_spi_remove), .remove = of_fsl_spi_remove,
}; };
#ifdef CONFIG_MPC832x_RDB #ifdef CONFIG_MPC832x_RDB
...@@ -1116,7 +1116,7 @@ static struct platform_driver of_fsl_spi_driver = { ...@@ -1116,7 +1116,7 @@ static struct platform_driver of_fsl_spi_driver = {
* tree can work with OpenFirmware driver. But for now we support old trees * tree can work with OpenFirmware driver. But for now we support old trees
* as well. * as well.
*/ */
static int __devinit plat_mpc8xxx_spi_probe(struct platform_device *pdev) static int plat_mpc8xxx_spi_probe(struct platform_device *pdev)
{ {
struct resource *mem; struct resource *mem;
int irq; int irq;
...@@ -1139,7 +1139,7 @@ static int __devinit plat_mpc8xxx_spi_probe(struct platform_device *pdev) ...@@ -1139,7 +1139,7 @@ static int __devinit plat_mpc8xxx_spi_probe(struct platform_device *pdev)
return 0; return 0;
} }
static int __devexit plat_mpc8xxx_spi_remove(struct platform_device *pdev) static int plat_mpc8xxx_spi_remove(struct platform_device *pdev)
{ {
return mpc8xxx_spi_remove(&pdev->dev); return mpc8xxx_spi_remove(&pdev->dev);
} }
...@@ -1147,7 +1147,7 @@ static int __devexit plat_mpc8xxx_spi_remove(struct platform_device *pdev) ...@@ -1147,7 +1147,7 @@ static int __devexit plat_mpc8xxx_spi_remove(struct platform_device *pdev)
MODULE_ALIAS("platform:mpc8xxx_spi"); MODULE_ALIAS("platform:mpc8xxx_spi");
static struct platform_driver mpc8xxx_spi_driver = { static struct platform_driver mpc8xxx_spi_driver = {
.probe = plat_mpc8xxx_spi_probe, .probe = plat_mpc8xxx_spi_probe,
.remove = __devexit_p(plat_mpc8xxx_spi_remove), .remove = plat_mpc8xxx_spi_remove,
.driver = { .driver = {
.name = "mpc8xxx_spi", .name = "mpc8xxx_spi",
.owner = THIS_MODULE, .owner = THIS_MODULE,
......
drivers/spi/spi-gpio.c
View file @ fd4a319b
...@@ -287,7 +287,7 @@ static void spi_gpio_cleanup(struct spi_device *spi) ...@@ -287,7 +287,7 @@ static void spi_gpio_cleanup(struct spi_device *spi)
spi_bitbang_cleanup(spi); spi_bitbang_cleanup(spi);
} }
static int __devinit spi_gpio_alloc(unsigned pin, const char *label, bool is_in) static int spi_gpio_alloc(unsigned pin, const char *label, bool is_in)
{ {
int value; int value;
...@@ -301,9 +301,8 @@ static int __devinit spi_gpio_alloc(unsigned pin, const char *label, bool is_in) ...@@ -301,9 +301,8 @@ static int __devinit spi_gpio_alloc(unsigned pin, const char *label, bool is_in)
return value; return value;
} }
static int __devinit static int spi_gpio_request(struct spi_gpio_platform_data *pdata,
spi_gpio_request(struct spi_gpio_platform_data *pdata, const char *label, const char *label, u16 *res_flags)
u16 *res_flags)
{ {
int value; int value;
...@@ -392,7 +391,7 @@ static inline int spi_gpio_probe_dt(struct platform_device *pdev) ...@@ -392,7 +391,7 @@ static inline int spi_gpio_probe_dt(struct platform_device *pdev)
} }
#endif #endif
static int __devinit spi_gpio_probe(struct platform_device *pdev) static int spi_gpio_probe(struct platform_device *pdev)
{ {
int status; int status;
struct spi_master *master; struct spi_master *master;
...@@ -485,7 +484,7 @@ static int __devinit spi_gpio_probe(struct platform_device *pdev) ...@@ -485,7 +484,7 @@ static int __devinit spi_gpio_probe(struct platform_device *pdev)
return status; return status;
} }
static int __devexit spi_gpio_remove(struct platform_device *pdev) static int spi_gpio_remove(struct platform_device *pdev)
{ {
struct spi_gpio *spi_gpio; struct spi_gpio *spi_gpio;
struct spi_gpio_platform_data *pdata; struct spi_gpio_platform_data *pdata;
...@@ -518,7 +517,7 @@ static struct platform_driver spi_gpio_driver = { ...@@ -518,7 +517,7 @@ static struct platform_driver spi_gpio_driver = {
.of_match_table = of_match_ptr(spi_gpio_dt_ids), .of_match_table = of_match_ptr(spi_gpio_dt_ids),
}, },
.probe = spi_gpio_probe, .probe = spi_gpio_probe,
.remove = __devexit_p(spi_gpio_remove), .remove = spi_gpio_remove,
}; };
module_platform_driver(spi_gpio_driver); module_platform_driver(spi_gpio_driver);
......
drivers/spi/spi-imx.c
View file @ fd4a319b
...@@ -750,7 +750,7 @@ static void spi_imx_cleanup(struct spi_device *spi) ...@@ -750,7 +750,7 @@ static void spi_imx_cleanup(struct spi_device *spi)
{ {
} }
static int __devinit spi_imx_probe(struct platform_device *pdev) static int spi_imx_probe(struct platform_device *pdev)
{ {
struct device_node *np = pdev->dev.of_node; struct device_node *np = pdev->dev.of_node;
const struct of_device_id *of_id = const struct of_device_id *of_id =
...@@ -906,7 +906,7 @@ static int __devinit spi_imx_probe(struct platform_device *pdev) ...@@ -906,7 +906,7 @@ static int __devinit spi_imx_probe(struct platform_device *pdev)
return ret; return ret;
} }
static int __devexit spi_imx_remove(struct platform_device *pdev) static int spi_imx_remove(struct platform_device *pdev)
{ {
struct spi_master *master = platform_get_drvdata(pdev); struct spi_master *master = platform_get_drvdata(pdev);
struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0); struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
...@@ -942,7 +942,7 @@ static struct platform_driver spi_imx_driver = { ...@@ -942,7 +942,7 @@ static struct platform_driver spi_imx_driver = {
}, },
.id_table = spi_imx_devtype, .id_table = spi_imx_devtype,
.probe = spi_imx_probe, .probe = spi_imx_probe,
.remove = __devexit_p(spi_imx_remove), .remove = spi_imx_remove,
}; };
module_platform_driver(spi_imx_driver); module_platform_driver(spi_imx_driver);
......
drivers/spi/spi-mpc512x-psc.c
View file @ fd4a319b
...@@ -406,7 +406,7 @@ static irqreturn_t mpc512x_psc_spi_isr(int irq, void *dev_id) ...@@ -406,7 +406,7 @@ static irqreturn_t mpc512x_psc_spi_isr(int irq, void *dev_id)
} }
/* bus_num is used only for the case dev->platform_data == NULL */ /* bus_num is used only for the case dev->platform_data == NULL */
static int __devinit mpc512x_psc_spi_do_probe(struct device *dev, u32 regaddr, static int mpc512x_psc_spi_do_probe(struct device *dev, u32 regaddr,
u32 size, unsigned int irq, u32 size, unsigned int irq,
s16 bus_num) s16 bus_num)
{ {
...@@ -492,7 +492,7 @@ static int __devinit mpc512x_psc_spi_do_probe(struct device *dev, u32 regaddr, ...@@ -492,7 +492,7 @@ static int __devinit mpc512x_psc_spi_do_probe(struct device *dev, u32 regaddr,
return ret; return ret;
} }
static int __devexit mpc512x_psc_spi_do_remove(struct device *dev) static int mpc512x_psc_spi_do_remove(struct device *dev)
{ {
struct spi_master *master = spi_master_get(dev_get_drvdata(dev)); struct spi_master *master = spi_master_get(dev_get_drvdata(dev));
struct mpc512x_psc_spi *mps = spi_master_get_devdata(master); 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,7 +508,7 @@ static int __devexit mpc512x_psc_spi_do_remove(struct device *dev)
return 0; return 0;
} }
static int __devinit mpc512x_psc_spi_of_probe(struct platform_device *op) static int mpc512x_psc_spi_of_probe(struct platform_device *op)
{ {
const u32 *regaddr_p; const u32 *regaddr_p;
u64 regaddr64, size64; u64 regaddr64, size64;
...@@ -539,7 +539,7 @@ static int __devinit mpc512x_psc_spi_of_probe(struct platform_device *op) ...@@ -539,7 +539,7 @@ static int __devinit mpc512x_psc_spi_of_probe(struct platform_device *op)
irq_of_parse_and_map(op->dev.of_node, 0), id); irq_of_parse_and_map(op->dev.of_node, 0), id);
} }
static int __devexit mpc512x_psc_spi_of_remove(struct platform_device *op) static int mpc512x_psc_spi_of_remove(struct platform_device *op)
{ {
return mpc512x_psc_spi_do_remove(&op->dev); return mpc512x_psc_spi_do_remove(&op->dev);
} }
...@@ -553,7 +553,7 @@ MODULE_DEVICE_TABLE(of, mpc512x_psc_spi_of_match); ...@@ -553,7 +553,7 @@ MODULE_DEVICE_TABLE(of, mpc512x_psc_spi_of_match);
static struct platform_driver mpc512x_psc_spi_of_driver = { static struct platform_driver mpc512x_psc_spi_of_driver = {
.probe = mpc512x_psc_spi_of_probe, .probe = mpc512x_psc_spi_of_probe,
.remove = __devexit_p(mpc512x_psc_spi_of_remove), .remove = mpc512x_psc_spi_of_remove,
.driver = { .driver = {
.name = "mpc512x-psc-spi", .name = "mpc512x-psc-spi",
.owner = THIS_MODULE, .owner = THIS_MODULE,
......
drivers/spi/spi-mpc52xx-psc.c
View file @ fd4a319b
...@@ -363,7 +363,7 @@ static irqreturn_t mpc52xx_psc_spi_isr(int irq, void *dev_id) ...@@ -363,7 +363,7 @@ static irqreturn_t mpc52xx_psc_spi_isr(int irq, void *dev_id)
} }
/* bus_num is used only for the case dev->platform_data == NULL */ /* bus_num is used only for the case dev->platform_data == NULL */
static int __devinit mpc52xx_psc_spi_do_probe(struct device *dev, u32 regaddr, static int mpc52xx_psc_spi_do_probe(struct device *dev, u32 regaddr,
u32 size, unsigned int irq, s16 bus_num) u32 size, unsigned int irq, s16 bus_num)
{ {
struct fsl_spi_platform_data *pdata = dev->platform_data; struct fsl_spi_platform_data *pdata = dev->platform_data;
...@@ -450,7 +450,7 @@ static int __devinit mpc52xx_psc_spi_do_probe(struct device *dev, u32 regaddr, ...@@ -450,7 +450,7 @@ static int __devinit mpc52xx_psc_spi_do_probe(struct device *dev, u32 regaddr,
return ret; return ret;
} }
static int __devinit mpc52xx_psc_spi_of_probe(struct platform_device *op) static int mpc52xx_psc_spi_of_probe(struct platform_device *op)
{ {
const u32 *regaddr_p; const u32 *regaddr_p;
u64 regaddr64, size64; u64 regaddr64, size64;
...@@ -479,7 +479,7 @@ static int __devinit mpc52xx_psc_spi_of_probe(struct platform_device *op) ...@@ -479,7 +479,7 @@ static int __devinit mpc52xx_psc_spi_of_probe(struct platform_device *op)
irq_of_parse_and_map(op->dev.of_node, 0), id); irq_of_parse_and_map(op->dev.of_node, 0), id);
} }
static int __devexit mpc52xx_psc_spi_of_remove(struct platform_device *op) static int mpc52xx_psc_spi_of_remove(struct platform_device *op)
{ {
struct spi_master *master = spi_master_get(dev_get_drvdata(&op->dev)); struct spi_master *master = spi_master_get(dev_get_drvdata(&op->dev));
struct mpc52xx_psc_spi *mps = spi_master_get_devdata(master); struct mpc52xx_psc_spi *mps = spi_master_get_devdata(master);
...@@ -505,7 +505,7 @@ MODULE_DEVICE_TABLE(of, mpc52xx_psc_spi_of_match); ...@@ -505,7 +505,7 @@ MODULE_DEVICE_TABLE(of, mpc52xx_psc_spi_of_match);
static struct platform_driver mpc52xx_psc_spi_of_driver = { static struct platform_driver mpc52xx_psc_spi_of_driver = {
.probe = mpc52xx_psc_spi_of_probe, .probe = mpc52xx_psc_spi_of_probe,
.remove = __devexit_p(mpc52xx_psc_spi_of_remove), .remove = mpc52xx_psc_spi_of_remove,
.driver = { .driver = {
.name = "mpc52xx-psc-spi", .name = "mpc52xx-psc-spi",
.owner = THIS_MODULE, .owner = THIS_MODULE,
......
drivers/spi/spi-mpc52xx.c
View file @ fd4a319b
...@@ -390,7 +390,7 @@ static int mpc52xx_spi_transfer(struct spi_device *spi, struct spi_message *m) ...@@ -390,7 +390,7 @@ static int mpc52xx_spi_transfer(struct spi_device *spi, struct spi_message *m)
/* /*
* OF Platform Bus Binding * OF Platform Bus Binding
*/ */
static int __devinit mpc52xx_spi_probe(struct platform_device *op) static int mpc52xx_spi_probe(struct platform_device *op)
{ {
struct spi_master *master; struct spi_master *master;
struct mpc52xx_spi *ms; struct mpc52xx_spi *ms;
...@@ -527,7 +527,7 @@ static int __devinit mpc52xx_spi_probe(struct platform_device *op) ...@@ -527,7 +527,7 @@ static int __devinit mpc52xx_spi_probe(struct platform_device *op)
return rc; return rc;
} }
static int __devexit mpc52xx_spi_remove(struct platform_device *op) static int mpc52xx_spi_remove(struct platform_device *op)
{ {
struct spi_master *master = spi_master_get(dev_get_drvdata(&op->dev)); struct spi_master *master = spi_master_get(dev_get_drvdata(&op->dev));
struct mpc52xx_spi *ms = spi_master_get_devdata(master); struct mpc52xx_spi *ms = spi_master_get_devdata(master);
...@@ -547,7 +547,7 @@ static int __devexit mpc52xx_spi_remove(struct platform_device *op) ...@@ -547,7 +547,7 @@ static int __devexit mpc52xx_spi_remove(struct platform_device *op)
return 0; return 0;
} }
static const struct of_device_id mpc52xx_spi_match[] __devinitconst = { static const struct of_device_id mpc52xx_spi_match[] = {
{ .compatible = "fsl,mpc5200-spi", }, { .compatible = "fsl,mpc5200-spi", },
{} {}
}; };
...@@ -560,6 +560,6 @@ static struct platform_driver mpc52xx_spi_of_driver = { ...@@ -560,6 +560,6 @@ static struct platform_driver mpc52xx_spi_of_driver = {
.of_match_table = mpc52xx_spi_match, .of_match_table = mpc52xx_spi_match,
}, },
.probe = mpc52xx_spi_probe, .probe = mpc52xx_spi_probe,
.remove = __devexit_p(mpc52xx_spi_remove), .remove = mpc52xx_spi_remove,
}; };
module_platform_driver(mpc52xx_spi_of_driver); module_platform_driver(mpc52xx_spi_of_driver);
drivers/spi/spi-mxs.c
View file @ fd4a319b
...@@ -509,7 +509,7 @@ static const struct of_device_id mxs_spi_dt_ids[] = { ...@@ -509,7 +509,7 @@ static const struct of_device_id mxs_spi_dt_ids[] = {
}; };
MODULE_DEVICE_TABLE(of, mxs_spi_dt_ids); MODULE_DEVICE_TABLE(of, mxs_spi_dt_ids);
static int __devinit mxs_spi_probe(struct platform_device *pdev) static int mxs_spi_probe(struct platform_device *pdev)
{ {
const struct of_device_id *of_id = const struct of_device_id *of_id =
of_match_device(mxs_spi_dt_ids, &pdev->dev); of_match_device(mxs_spi_dt_ids, &pdev->dev);
...@@ -636,7 +636,7 @@ static int __devinit mxs_spi_probe(struct platform_device *pdev) ...@@ -636,7 +636,7 @@ static int __devinit mxs_spi_probe(struct platform_device *pdev)
return ret; return ret;
} }
static int __devexit mxs_spi_remove(struct platform_device *pdev) static int mxs_spi_remove(struct platform_device *pdev)
{ {
struct spi_master *master; struct spi_master *master;
struct mxs_spi *spi; struct mxs_spi *spi;
...@@ -659,7 +659,7 @@ static int __devexit mxs_spi_remove(struct platform_device *pdev) ...@@ -659,7 +659,7 @@ static int __devexit mxs_spi_remove(struct platform_device *pdev)
static struct platform_driver mxs_spi_driver = { static struct platform_driver mxs_spi_driver = {
.probe = mxs_spi_probe, .probe = mxs_spi_probe,
.remove = __devexit_p(mxs_spi_remove), .remove = mxs_spi_remove,
.driver = { .driver = {
.name = DRIVER_NAME, .name = DRIVER_NAME,
.owner = THIS_MODULE, .owner = THIS_MODULE,
......
drivers/spi/spi-nuc900.c
View file @ fd4a319b
...@@ -346,7 +346,7 @@ static void nuc900_init_spi(struct nuc900_spi *hw) ...@@ -346,7 +346,7 @@ static void nuc900_init_spi(struct nuc900_spi *hw)
nuc900_enable_int(hw); nuc900_enable_int(hw);
} }
static int __devinit nuc900_spi_probe(struct platform_device *pdev) static int nuc900_spi_probe(struct platform_device *pdev)
{ {
struct nuc900_spi *hw; struct nuc900_spi *hw;
struct spi_master *master; struct spi_master *master;
...@@ -453,7 +453,7 @@ static int __devinit nuc900_spi_probe(struct platform_device *pdev) ...@@ -453,7 +453,7 @@ static int __devinit nuc900_spi_probe(struct platform_device *pdev)
return err; return err;
} }
static int __devexit nuc900_spi_remove(struct platform_device *dev) static int nuc900_spi_remove(struct platform_device *dev)
{ {
struct nuc900_spi *hw = platform_get_drvdata(dev); struct nuc900_spi *hw = platform_get_drvdata(dev);
...@@ -477,7 +477,7 @@ static int __devexit nuc900_spi_remove(struct platform_device *dev) ...@@ -477,7 +477,7 @@ static int __devexit nuc900_spi_remove(struct platform_device *dev)
static struct platform_driver nuc900_spi_driver = { static struct platform_driver nuc900_spi_driver = {
.probe = nuc900_spi_probe, .probe = nuc900_spi_probe,
.remove = __devexit_p(nuc900_spi_remove), .remove = nuc900_spi_remove,
.driver = { .driver = {
.name = "nuc900-spi", .name = "nuc900-spi",
.owner = THIS_MODULE, .owner = THIS_MODULE,
......
drivers/spi/spi-oc-tiny.c
View file @ fd4a319b
...@@ -243,7 +243,7 @@ static irqreturn_t tiny_spi_irq(int irq, void *dev) ...@@ -243,7 +243,7 @@ static irqreturn_t tiny_spi_irq(int irq, void *dev)
#ifdef CONFIG_OF #ifdef CONFIG_OF
#include <linux/of_gpio.h> #include <linux/of_gpio.h>
static int __devinit tiny_spi_of_probe(struct platform_device *pdev) static int tiny_spi_of_probe(struct platform_device *pdev)
{ {
struct tiny_spi *hw = platform_get_drvdata(pdev); struct tiny_spi *hw = platform_get_drvdata(pdev);
struct device_node *np = pdev->dev.of_node; struct device_node *np = pdev->dev.of_node;
...@@ -277,13 +277,13 @@ static int __devinit tiny_spi_of_probe(struct platform_device *pdev) ...@@ -277,13 +277,13 @@ static int __devinit tiny_spi_of_probe(struct platform_device *pdev)
return 0; return 0;
} }
#else /* !CONFIG_OF */ #else /* !CONFIG_OF */
static int __devinit tiny_spi_of_probe(struct platform_device *pdev) static int tiny_spi_of_probe(struct platform_device *pdev)
{ {
return 0; return 0;
} }
#endif /* CONFIG_OF */ #endif /* CONFIG_OF */
static int __devinit tiny_spi_probe(struct platform_device *pdev) static int tiny_spi_probe(struct platform_device *pdev)
{ {
struct tiny_spi_platform_data *platp = pdev->dev.platform_data; struct tiny_spi_platform_data *platp = pdev->dev.platform_data;
struct tiny_spi *hw; struct tiny_spi *hw;
...@@ -373,7 +373,7 @@ static int __devinit tiny_spi_probe(struct platform_device *pdev) ...@@ -373,7 +373,7 @@ static int __devinit tiny_spi_probe(struct platform_device *pdev)
return err; return err;
} }
static int __devexit tiny_spi_remove(struct platform_device *pdev) static int tiny_spi_remove(struct platform_device *pdev)
{ {
struct tiny_spi *hw = platform_get_drvdata(pdev); struct tiny_spi *hw = platform_get_drvdata(pdev);
struct spi_master *master = hw->bitbang.master; struct spi_master *master = hw->bitbang.master;
...@@ -399,7 +399,7 @@ MODULE_DEVICE_TABLE(of, tiny_spi_match); ...@@ -399,7 +399,7 @@ MODULE_DEVICE_TABLE(of, tiny_spi_match);
static struct platform_driver tiny_spi_driver = { static struct platform_driver tiny_spi_driver = {
.probe = tiny_spi_probe, .probe = tiny_spi_probe,
.remove = __devexit_p(tiny_spi_remove), .remove = tiny_spi_remove,
.driver = { .driver = {
.name = DRV_NAME, .name = DRV_NAME,
.owner = THIS_MODULE, .owner = THIS_MODULE,
......
drivers/spi/spi-octeon.c
View file @ fd4a319b
...@@ -266,7 +266,7 @@ static int octeon_spi_nop_transfer_hardware(struct spi_master *master) ...@@ -266,7 +266,7 @@ static int octeon_spi_nop_transfer_hardware(struct spi_master *master)
return 0; return 0;
} }
static int __devinit octeon_spi_probe(struct platform_device *pdev) static int octeon_spi_probe(struct platform_device *pdev)
{ {
struct resource *res_mem; struct resource *res_mem;
...@@ -326,7 +326,7 @@ static int __devinit octeon_spi_probe(struct platform_device *pdev) ...@@ -326,7 +326,7 @@ static int __devinit octeon_spi_probe(struct platform_device *pdev)
return err; return err;
} }
static int __devexit octeon_spi_remove(struct platform_device *pdev) static int octeon_spi_remove(struct platform_device *pdev)
{ {
struct octeon_spi *p = platform_get_drvdata(pdev); struct octeon_spi *p = platform_get_drvdata(pdev);
u64 register_base = p->register_base; u64 register_base = p->register_base;
...@@ -352,7 +352,7 @@ static struct platform_driver octeon_spi_driver = { ...@@ -352,7 +352,7 @@ static struct platform_driver octeon_spi_driver = {
.of_match_table = octeon_spi_match, .of_match_table = octeon_spi_match,
}, },
.probe = octeon_spi_probe, .probe = octeon_spi_probe,
.remove = __devexit_p(octeon_spi_remove), .remove = octeon_spi_remove,
}; };
module_platform_driver(octeon_spi_driver); module_platform_driver(octeon_spi_driver);
......
drivers/spi/spi-omap-100k.c
View file @ fd4a319b
...@@ -486,7 +486,7 @@ static int __init omap1_spi100k_reset(struct omap1_spi100k *spi100k) ...@@ -486,7 +486,7 @@ static int __init omap1_spi100k_reset(struct omap1_spi100k *spi100k)
return 0; return 0;
} }
static int __devinit omap1_spi100k_probe(struct platform_device *pdev) static int omap1_spi100k_probe(struct platform_device *pdev)
{ {
struct spi_master *master; struct spi_master *master;
struct omap1_spi100k *spi100k; struct omap1_spi100k *spi100k;
......
drivers/spi/spi-omap2-mcspi.c
View file @ fd4a319b
...@@ -1088,7 +1088,7 @@ static int omap2_mcspi_transfer_one_message(struct spi_master *master, ...@@ -1088,7 +1088,7 @@ static int omap2_mcspi_transfer_one_message(struct spi_master *master,
return 0; return 0;
} }
static int __devinit omap2_mcspi_master_setup(struct omap2_mcspi *mcspi) static int omap2_mcspi_master_setup(struct omap2_mcspi *mcspi)
{ {
struct spi_master *master = mcspi->master; struct spi_master *master = mcspi->master;
struct omap2_mcspi_regs *ctx = &mcspi->ctx; struct omap2_mcspi_regs *ctx = &mcspi->ctx;
...@@ -1141,7 +1141,7 @@ static const struct of_device_id omap_mcspi_of_match[] = { ...@@ -1141,7 +1141,7 @@ static const struct of_device_id omap_mcspi_of_match[] = {
}; };
MODULE_DEVICE_TABLE(of, omap_mcspi_of_match); MODULE_DEVICE_TABLE(of, omap_mcspi_of_match);
static int __devinit omap2_mcspi_probe(struct platform_device *pdev) static int omap2_mcspi_probe(struct platform_device *pdev)
{ {
struct spi_master *master; struct spi_master *master;
const struct omap2_mcspi_platform_config *pdata; const struct omap2_mcspi_platform_config *pdata;
...@@ -1278,7 +1278,7 @@ static int __devinit omap2_mcspi_probe(struct platform_device *pdev) ...@@ -1278,7 +1278,7 @@ static int __devinit omap2_mcspi_probe(struct platform_device *pdev)
return status; return status;
} }
static int __devexit omap2_mcspi_remove(struct platform_device *pdev) static int omap2_mcspi_remove(struct platform_device *pdev)
{ {
struct spi_master *master; struct spi_master *master;
struct omap2_mcspi *mcspi; struct omap2_mcspi *mcspi;
...@@ -1347,7 +1347,7 @@ static struct platform_driver omap2_mcspi_driver = { ...@@ -1347,7 +1347,7 @@ static struct platform_driver omap2_mcspi_driver = {
.of_match_table = omap_mcspi_of_match, .of_match_table = omap_mcspi_of_match,
}, },
.probe = omap2_mcspi_probe, .probe = omap2_mcspi_probe,
.remove = __devexit_p(omap2_mcspi_remove), .remove = omap2_mcspi_remove,
}; };
module_platform_driver(omap2_mcspi_driver); module_platform_driver(omap2_mcspi_driver);
......
drivers/spi/spi-orion.c
View file @ fd4a319b
...@@ -501,7 +501,7 @@ static int __exit orion_spi_remove(struct platform_device *pdev) ...@@ -501,7 +501,7 @@ static int __exit orion_spi_remove(struct platform_device *pdev)
MODULE_ALIAS("platform:" DRIVER_NAME); MODULE_ALIAS("platform:" DRIVER_NAME);
static const struct of_device_id orion_spi_of_match_table[] __devinitdata = { static const struct of_device_id orion_spi_of_match_table[] = {
{ .compatible = "marvell,orion-spi", }, { .compatible = "marvell,orion-spi", },
{} {}
}; };
......
drivers/spi/spi-pl022.c
View file @ fd4a319b
...@@ -1089,7 +1089,7 @@ static int configure_dma(struct pl022 *pl022) ...@@ -1089,7 +1089,7 @@ static int configure_dma(struct pl022 *pl022)
return -ENOMEM; return -ENOMEM;
} }
static int __devinit pl022_dma_probe(struct pl022 *pl022) static int pl022_dma_probe(struct pl022 *pl022)
{ {
dma_cap_mask_t mask; dma_cap_mask_t mask;
...@@ -2058,8 +2058,7 @@ pl022_platform_data_dt_get(struct device *dev) ...@@ -2058,8 +2058,7 @@ pl022_platform_data_dt_get(struct device *dev)
return pd; return pd;
} }
static int __devinit static int pl022_probe(struct amba_device *adev, const struct amba_id *id)
pl022_probe(struct amba_device *adev, const struct amba_id *id)
{ {
struct device *dev = &adev->dev; struct device *dev = &adev->dev;
struct pl022_ssp_controller *platform_info = adev->dev.platform_data; 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,7 +2274,7 @@ pl022_probe(struct amba_device *adev, const struct amba_id *id)
return status; return status;
} }
static int __devexit static int
pl022_remove(struct amba_device *adev) pl022_remove(struct amba_device *adev)
{ {
struct pl022 *pl022 = amba_get_drvdata(adev); struct pl022 *pl022 = amba_get_drvdata(adev);
...@@ -2484,7 +2483,7 @@ static struct amba_driver pl022_driver = { ...@@ -2484,7 +2483,7 @@ static struct amba_driver pl022_driver = {
}, },
.id_table = pl022_ids, .id_table = pl022_ids,
.probe = pl022_probe, .probe = pl022_probe,
.remove = __devexit_p(pl022_remove), .remove = pl022_remove,
}; };
static int __init pl022_init(void) static int __init pl022_init(void)
......
drivers/spi/spi-pxa2xx-pci.c
View file @ fd4a319b
...@@ -51,7 +51,7 @@ void pxa_ssp_free(struct ssp_device *ssp) ...@@ -51,7 +51,7 @@ void pxa_ssp_free(struct ssp_device *ssp)
} }
EXPORT_SYMBOL_GPL(pxa_ssp_free); EXPORT_SYMBOL_GPL(pxa_ssp_free);
static int __devinit ce4100_spi_probe(struct pci_dev *dev, static int ce4100_spi_probe(struct pci_dev *dev,
const struct pci_device_id *ent) const struct pci_device_id *ent)
{ {
int ret; int ret;
...@@ -129,7 +129,7 @@ static int __devinit ce4100_spi_probe(struct pci_dev *dev, ...@@ -129,7 +129,7 @@ static int __devinit ce4100_spi_probe(struct pci_dev *dev,
return ret; return ret;
} }
static void __devexit ce4100_spi_remove(struct pci_dev *dev) static void ce4100_spi_remove(struct pci_dev *dev)
{ {
struct ce4100_info *spi_info; struct ce4100_info *spi_info;
struct ssp_device *ssp; struct ssp_device *ssp;
...@@ -161,7 +161,7 @@ static struct pci_driver ce4100_spi_driver = { ...@@ -161,7 +161,7 @@ static struct pci_driver ce4100_spi_driver = {
.name = "ce4100_spi", .name = "ce4100_spi",
.id_table = ce4100_spi_devices, .id_table = ce4100_spi_devices,
.probe = ce4100_spi_probe, .probe = ce4100_spi_probe,
.remove = __devexit_p(ce4100_spi_remove), .remove = ce4100_spi_remove,
}; };
module_pci_driver(ce4100_spi_driver); module_pci_driver(ce4100_spi_driver);
......
drivers/spi/spi-pxa2xx.c
View file @ fd4a319b
...@@ -1438,7 +1438,7 @@ static void cleanup(struct spi_device *spi) ...@@ -1438,7 +1438,7 @@ static void cleanup(struct spi_device *spi)
kfree(chip); kfree(chip);
} }
static int __devinit init_queue(struct driver_data *drv_data) static int init_queue(struct driver_data *drv_data)
{ {
INIT_LIST_HEAD(&drv_data->queue); INIT_LIST_HEAD(&drv_data->queue);
spin_lock_init(&drv_data->lock); spin_lock_init(&drv_data->lock);
...@@ -1526,7 +1526,7 @@ static int destroy_queue(struct driver_data *drv_data) ...@@ -1526,7 +1526,7 @@ static int destroy_queue(struct driver_data *drv_data)
return 0; return 0;
} }
static int __devinit pxa2xx_spi_probe(struct platform_device *pdev) static int pxa2xx_spi_probe(struct platform_device *pdev)
{ {
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
struct pxa2xx_spi_master *platform_info; struct pxa2xx_spi_master *platform_info;
......
drivers/spi/spi-rspi.c
View file @ fd4a319b
...@@ -661,7 +661,7 @@ static irqreturn_t rspi_irq(int irq, void *_sr) ...@@ -661,7 +661,7 @@ static irqreturn_t rspi_irq(int irq, void *_sr)
return ret; return ret;
} }
static int __devinit rspi_request_dma(struct rspi_data *rspi, static int rspi_request_dma(struct rspi_data *rspi,
struct platform_device *pdev) struct platform_device *pdev)
{ {
struct rspi_plat_data *rspi_pd = pdev->dev.platform_data; 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,7 +709,7 @@ static int __devinit rspi_request_dma(struct rspi_data *rspi,
return 0; return 0;
} }
static void __devexit rspi_release_dma(struct rspi_data *rspi) static void rspi_release_dma(struct rspi_data *rspi)
{ {
if (rspi->chan_tx) if (rspi->chan_tx)
dma_release_channel(rspi->chan_tx); dma_release_channel(rspi->chan_tx);
...@@ -717,7 +717,7 @@ static void __devexit rspi_release_dma(struct rspi_data *rspi) ...@@ -717,7 +717,7 @@ static void __devexit rspi_release_dma(struct rspi_data *rspi)
dma_release_channel(rspi->chan_rx); dma_release_channel(rspi->chan_rx);
} }
static int __devexit rspi_remove(struct platform_device *pdev) static int rspi_remove(struct platform_device *pdev)
{ {
struct rspi_data *rspi = dev_get_drvdata(&pdev->dev); struct rspi_data *rspi = dev_get_drvdata(&pdev->dev);
...@@ -731,7 +731,7 @@ static int __devexit rspi_remove(struct platform_device *pdev) ...@@ -731,7 +731,7 @@ static int __devexit rspi_remove(struct platform_device *pdev)
return 0; return 0;
} }
static int __devinit rspi_probe(struct platform_device *pdev) static int rspi_probe(struct platform_device *pdev)
{ {
struct resource *res; struct resource *res;
struct spi_master *master; struct spi_master *master;
...@@ -827,7 +827,7 @@ static int __devinit rspi_probe(struct platform_device *pdev) ...@@ -827,7 +827,7 @@ static int __devinit rspi_probe(struct platform_device *pdev)
static struct platform_driver rspi_driver = { static struct platform_driver rspi_driver = {
.probe = rspi_probe, .probe = rspi_probe,
.remove = __devexit_p(rspi_remove), .remove = rspi_remove,
.driver = { .driver = {
.name = "rspi", .name = "rspi",
.owner = THIS_MODULE, .owner = THIS_MODULE,
......
drivers/spi/spi-s3c24xx.c
View file @ fd4a319b
...@@ -506,7 +506,7 @@ static void s3c24xx_spi_initialsetup(struct s3c24xx_spi *hw) ...@@ -506,7 +506,7 @@ static void s3c24xx_spi_initialsetup(struct s3c24xx_spi *hw)
} }
} }
static int __devinit s3c24xx_spi_probe(struct platform_device *pdev) static int s3c24xx_spi_probe(struct platform_device *pdev)
{ {
struct s3c2410_spi_info *pdata; struct s3c2410_spi_info *pdata;
struct s3c24xx_spi *hw; struct s3c24xx_spi *hw;
...@@ -663,7 +663,7 @@ static int __devinit s3c24xx_spi_probe(struct platform_device *pdev) ...@@ -663,7 +663,7 @@ static int __devinit s3c24xx_spi_probe(struct platform_device *pdev)
return err; return err;
} }
static int __devexit s3c24xx_spi_remove(struct platform_device *dev) static int s3c24xx_spi_remove(struct platform_device *dev)
{ {
struct s3c24xx_spi *hw = platform_get_drvdata(dev); struct s3c24xx_spi *hw = platform_get_drvdata(dev);
...@@ -722,7 +722,7 @@ static const struct dev_pm_ops s3c24xx_spi_pmops = { ...@@ -722,7 +722,7 @@ static const struct dev_pm_ops s3c24xx_spi_pmops = {
MODULE_ALIAS("platform:s3c2410-spi"); MODULE_ALIAS("platform:s3c2410-spi");
static struct platform_driver s3c24xx_spi_driver = { static struct platform_driver s3c24xx_spi_driver = {
.probe = s3c24xx_spi_probe, .probe = s3c24xx_spi_probe,
.remove = __devexit_p(s3c24xx_spi_remove), .remove = s3c24xx_spi_remove,
.driver = { .driver = {
.name = "s3c2410-spi", .name = "s3c2410-spi",
.owner = THIS_MODULE, .owner = THIS_MODULE,
......
drivers/spi/spi-s3c64xx.c
View file @ fd4a319b
...@@ -1056,7 +1056,7 @@ static void s3c64xx_spi_hwinit(struct s3c64xx_spi_driver_data *sdd, int channel) ...@@ -1056,7 +1056,7 @@ static void s3c64xx_spi_hwinit(struct s3c64xx_spi_driver_data *sdd, int channel)
flush_fifo(sdd); flush_fifo(sdd);
} }
static int __devinit s3c64xx_spi_get_dmares( static int s3c64xx_spi_get_dmares(
struct s3c64xx_spi_driver_data *sdd, bool tx) struct s3c64xx_spi_driver_data *sdd, bool tx)
{ {
struct platform_device *pdev = sdd->pdev; struct platform_device *pdev = sdd->pdev;
...@@ -1135,7 +1135,7 @@ static void s3c64xx_spi_dt_gpio_free(struct s3c64xx_spi_driver_data *sdd) ...@@ -1135,7 +1135,7 @@ static void s3c64xx_spi_dt_gpio_free(struct s3c64xx_spi_driver_data *sdd)
gpio_free(sdd->gpios[idx]); gpio_free(sdd->gpios[idx]);
} }
static struct __devinit s3c64xx_spi_info * s3c64xx_spi_parse_dt( static struct s3c64xx_spi_info * s3c64xx_spi_parse_dt(
struct device *dev) struct device *dev)
{ {
struct s3c64xx_spi_info *sci; struct s3c64xx_spi_info *sci;
......
drivers/spi/spi-sh-hspi.c
View file @ fd4a319b
...@@ -268,7 +268,7 @@ static void hspi_cleanup(struct spi_device *spi) ...@@ -268,7 +268,7 @@ static void hspi_cleanup(struct spi_device *spi)
dev_dbg(dev, "%s cleanup\n", spi->modalias); dev_dbg(dev, "%s cleanup\n", spi->modalias);
} }
static int __devinit hspi_probe(struct platform_device *pdev) static int hspi_probe(struct platform_device *pdev)
{ {
struct resource *res; struct resource *res;
struct spi_master *master; struct spi_master *master;
...@@ -339,7 +339,7 @@ static int __devinit hspi_probe(struct platform_device *pdev) ...@@ -339,7 +339,7 @@ static int __devinit hspi_probe(struct platform_device *pdev)
return ret; return ret;
} }
static int __devexit hspi_remove(struct platform_device *pdev) static int hspi_remove(struct platform_device *pdev)
{ {
struct hspi_priv *hspi = dev_get_drvdata(&pdev->dev); struct hspi_priv *hspi = dev_get_drvdata(&pdev->dev);
...@@ -353,7 +353,7 @@ static int __devexit hspi_remove(struct platform_device *pdev) ...@@ -353,7 +353,7 @@ static int __devexit hspi_remove(struct platform_device *pdev)
static struct platform_driver hspi_driver = { static struct platform_driver hspi_driver = {
.probe = hspi_probe, .probe = hspi_probe,
.remove = __devexit_p(hspi_remove), .remove = hspi_remove,
.driver = { .driver = {
.name = "sh-hspi", .name = "sh-hspi",
.owner = THIS_MODULE, .owner = THIS_MODULE,
......
drivers/spi/spi-sh.c
View file @ fd4a319b
...@@ -432,7 +432,7 @@ static irqreturn_t spi_sh_irq(int irq, void *_ss) ...@@ -432,7 +432,7 @@ static irqreturn_t spi_sh_irq(int irq, void *_ss)
return IRQ_HANDLED; return IRQ_HANDLED;
} }
static int __devexit spi_sh_remove(struct platform_device *pdev) static int spi_sh_remove(struct platform_device *pdev)
{ {
struct spi_sh_data *ss = dev_get_drvdata(&pdev->dev); struct spi_sh_data *ss = dev_get_drvdata(&pdev->dev);
...@@ -444,7 +444,7 @@ static int __devexit spi_sh_remove(struct platform_device *pdev) ...@@ -444,7 +444,7 @@ static int __devexit spi_sh_remove(struct platform_device *pdev)
return 0; return 0;
} }
static int __devinit spi_sh_probe(struct platform_device *pdev) static int spi_sh_probe(struct platform_device *pdev)
{ {
struct resource *res; struct resource *res;
struct spi_master *master; struct spi_master *master;
...@@ -539,7 +539,7 @@ static int __devinit spi_sh_probe(struct platform_device *pdev) ...@@ -539,7 +539,7 @@ static int __devinit spi_sh_probe(struct platform_device *pdev)
static struct platform_driver spi_sh_driver = { static struct platform_driver spi_sh_driver = {
.probe = spi_sh_probe, .probe = spi_sh_probe,
.remove = __devexit_p(spi_sh_remove), .remove = spi_sh_remove,
.driver = { .driver = {
.name = "sh_spi", .name = "sh_spi",
.owner = THIS_MODULE, .owner = THIS_MODULE,
......
drivers/spi/spi-sirf.c
View file @ fd4a319b
...@@ -479,7 +479,7 @@ static int spi_sirfsoc_setup(struct spi_device *spi) ...@@ -479,7 +479,7 @@ static int spi_sirfsoc_setup(struct spi_device *spi)
return spi_sirfsoc_setup_transfer(spi, NULL); return spi_sirfsoc_setup_transfer(spi, NULL);
} }
static int __devinit spi_sirfsoc_probe(struct platform_device *pdev) static int spi_sirfsoc_probe(struct platform_device *pdev)
{ {
struct sirfsoc_spi *sspi; struct sirfsoc_spi *sspi;
struct spi_master *master; struct spi_master *master;
...@@ -604,7 +604,7 @@ static int __devinit spi_sirfsoc_probe(struct platform_device *pdev) ...@@ -604,7 +604,7 @@ static int __devinit spi_sirfsoc_probe(struct platform_device *pdev)
return ret; return ret;
} }
static int __devexit spi_sirfsoc_remove(struct platform_device *pdev) static int spi_sirfsoc_remove(struct platform_device *pdev)
{ {
struct spi_master *master; struct spi_master *master;
struct sirfsoc_spi *sspi; struct sirfsoc_spi *sspi;
...@@ -673,7 +673,7 @@ static struct platform_driver spi_sirfsoc_driver = { ...@@ -673,7 +673,7 @@ static struct platform_driver spi_sirfsoc_driver = {
.of_match_table = spi_sirfsoc_of_match, .of_match_table = spi_sirfsoc_of_match,
}, },
.probe = spi_sirfsoc_probe, .probe = spi_sirfsoc_probe,
.remove = __devexit_p(spi_sirfsoc_remove), .remove = spi_sirfsoc_remove,
}; };
module_platform_driver(spi_sirfsoc_driver); module_platform_driver(spi_sirfsoc_driver);
......
drivers/spi/spi-tegra20-sflash.c
View file @ fd4a319b
...@@ -451,13 +451,13 @@ static struct tegra_spi_platform_data *tegra_sflash_parse_dt( ...@@ -451,13 +451,13 @@ static struct tegra_spi_platform_data *tegra_sflash_parse_dt(
return pdata; return pdata;
} }
static struct of_device_id tegra_sflash_of_match[] __devinitconst = { static struct of_device_id tegra_sflash_of_match[] = {
{ .compatible = "nvidia,tegra20-sflash", }, { .compatible = "nvidia,tegra20-sflash", },
{} {}
}; };
MODULE_DEVICE_TABLE(of, tegra_sflash_of_match); MODULE_DEVICE_TABLE(of, tegra_sflash_of_match);
static int __devinit tegra_sflash_probe(struct platform_device *pdev) static int tegra_sflash_probe(struct platform_device *pdev)
{ {
struct spi_master *master; struct spi_master *master;
struct tegra_sflash_data *tsd; struct tegra_sflash_data *tsd;
...@@ -575,7 +575,7 @@ static int __devinit tegra_sflash_probe(struct platform_device *pdev) ...@@ -575,7 +575,7 @@ static int __devinit tegra_sflash_probe(struct platform_device *pdev)
return ret; return ret;
} }
static int __devexit tegra_sflash_remove(struct platform_device *pdev) static int tegra_sflash_remove(struct platform_device *pdev)
{ {
struct spi_master *master = dev_get_drvdata(&pdev->dev); struct spi_master *master = dev_get_drvdata(&pdev->dev);
struct tegra_sflash_data *tsd = spi_master_get_devdata(master); struct tegra_sflash_data *tsd = spi_master_get_devdata(master);
...@@ -655,7 +655,7 @@ static struct platform_driver tegra_sflash_driver = { ...@@ -655,7 +655,7 @@ static struct platform_driver tegra_sflash_driver = {
.of_match_table = of_match_ptr(tegra_sflash_of_match), .of_match_table = of_match_ptr(tegra_sflash_of_match),
}, },
.probe = tegra_sflash_probe, .probe = tegra_sflash_probe,
.remove = __devexit_p(tegra_sflash_remove), .remove = tegra_sflash_remove,
}; };
module_platform_driver(tegra_sflash_driver); module_platform_driver(tegra_sflash_driver);
......
drivers/spi/spi-tegra20-slink.c
View file @ fd4a319b
...@@ -1108,14 +1108,14 @@ const struct tegra_slink_chip_data tegra20_spi_cdata = { ...@@ -1108,14 +1108,14 @@ const struct tegra_slink_chip_data tegra20_spi_cdata = {
.cs_hold_time = false, .cs_hold_time = false,
}; };
static struct of_device_id tegra_slink_of_match[] __devinitconst = { static struct of_device_id tegra_slink_of_match[] = {
{ .compatible = "nvidia,tegra30-slink", .data = &tegra30_spi_cdata, }, { .compatible = "nvidia,tegra30-slink", .data = &tegra30_spi_cdata, },
{ .compatible = "nvidia,tegra20-slink", .data = &tegra20_spi_cdata, }, { .compatible = "nvidia,tegra20-slink", .data = &tegra20_spi_cdata, },
{} {}
}; };
MODULE_DEVICE_TABLE(of, tegra_slink_of_match); MODULE_DEVICE_TABLE(of, tegra_slink_of_match);
static int __devinit tegra_slink_probe(struct platform_device *pdev) static int tegra_slink_probe(struct platform_device *pdev)
{ {
struct spi_master *master; struct spi_master *master;
struct tegra_slink_data *tspi; struct tegra_slink_data *tspi;
...@@ -1261,7 +1261,7 @@ static int __devinit tegra_slink_probe(struct platform_device *pdev) ...@@ -1261,7 +1261,7 @@ static int __devinit tegra_slink_probe(struct platform_device *pdev)
return ret; return ret;
} }
static int __devexit tegra_slink_remove(struct platform_device *pdev) static int tegra_slink_remove(struct platform_device *pdev)
{ {
struct spi_master *master = dev_get_drvdata(&pdev->dev); struct spi_master *master = dev_get_drvdata(&pdev->dev);
struct tegra_slink_data *tspi = spi_master_get_devdata(master); struct tegra_slink_data *tspi = spi_master_get_devdata(master);
...@@ -1348,7 +1348,7 @@ static struct platform_driver tegra_slink_driver = { ...@@ -1348,7 +1348,7 @@ static struct platform_driver tegra_slink_driver = {
.of_match_table = of_match_ptr(tegra_slink_of_match), .of_match_table = of_match_ptr(tegra_slink_of_match),
}, },
.probe = tegra_slink_probe, .probe = tegra_slink_probe,
.remove = __devexit_p(tegra_slink_remove), .remove = tegra_slink_remove,
}; };
module_platform_driver(tegra_slink_driver); module_platform_driver(tegra_slink_driver);
......
drivers/spi/spi-ti-ssp.c
View file @ fd4a319b
...@@ -289,7 +289,7 @@ static int ti_ssp_spi_transfer(struct spi_device *spi, struct spi_message *m) ...@@ -289,7 +289,7 @@ static int ti_ssp_spi_transfer(struct spi_device *spi, struct spi_message *m)
return error; return error;
} }
static int __devinit ti_ssp_spi_probe(struct platform_device *pdev) static int ti_ssp_spi_probe(struct platform_device *pdev)
{ {
const struct ti_ssp_spi_data *pdata; const struct ti_ssp_spi_data *pdata;
struct ti_ssp_spi *hw; struct ti_ssp_spi *hw;
...@@ -357,7 +357,7 @@ static int __devinit ti_ssp_spi_probe(struct platform_device *pdev) ...@@ -357,7 +357,7 @@ static int __devinit ti_ssp_spi_probe(struct platform_device *pdev)
return error; return error;
} }
static int __devexit ti_ssp_spi_remove(struct platform_device *pdev) static int ti_ssp_spi_remove(struct platform_device *pdev)
{ {
struct ti_ssp_spi *hw = platform_get_drvdata(pdev); struct ti_ssp_spi *hw = platform_get_drvdata(pdev);
int error; int error;
...@@ -378,7 +378,7 @@ static int __devexit ti_ssp_spi_remove(struct platform_device *pdev) ...@@ -378,7 +378,7 @@ static int __devexit ti_ssp_spi_remove(struct platform_device *pdev)
static struct platform_driver ti_ssp_spi_driver = { static struct platform_driver ti_ssp_spi_driver = {
.probe = ti_ssp_spi_probe, .probe = ti_ssp_spi_probe,
.remove = __devexit_p(ti_ssp_spi_remove), .remove = ti_ssp_spi_remove,
.driver = { .driver = {
.name = "ti-ssp-spi", .name = "ti-ssp-spi",
.owner = THIS_MODULE, .owner = THIS_MODULE,
......
drivers/spi/spi-tle62x0.c
View file @ fd4a319b
...@@ -240,7 +240,7 @@ static int to_gpio_num(struct device_attribute *attr) ...@@ -240,7 +240,7 @@ static int to_gpio_num(struct device_attribute *attr)
return -1; return -1;
} }
static int __devinit tle62x0_probe(struct spi_device *spi) static int tle62x0_probe(struct spi_device *spi)
{ {
struct tle62x0_state *st; struct tle62x0_state *st;
struct tle62x0_pdata *pdata; struct tle62x0_pdata *pdata;
...@@ -294,7 +294,7 @@ static int __devinit tle62x0_probe(struct spi_device *spi) ...@@ -294,7 +294,7 @@ static int __devinit tle62x0_probe(struct spi_device *spi)
return ret; return ret;
} }
static int __devexit tle62x0_remove(struct spi_device *spi) static int tle62x0_remove(struct spi_device *spi)
{ {
struct tle62x0_state *st = spi_get_drvdata(spi); struct tle62x0_state *st = spi_get_drvdata(spi);
int ptr; int ptr;
...@@ -313,7 +313,7 @@ static struct spi_driver tle62x0_driver = { ...@@ -313,7 +313,7 @@ static struct spi_driver tle62x0_driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
.probe = tle62x0_probe, .probe = tle62x0_probe,
.remove = __devexit_p(tle62x0_remove), .remove = tle62x0_remove,
}; };
module_spi_driver(tle62x0_driver); module_spi_driver(tle62x0_driver);
......
drivers/spi/spi-topcliff-pch.c
View file @ fd4a319b
...@@ -1401,7 +1401,7 @@ static void pch_alloc_dma_buf(struct pch_spi_board_data *board_dat, ...@@ -1401,7 +1401,7 @@ static void pch_alloc_dma_buf(struct pch_spi_board_data *board_dat,
PCH_BUF_SIZE, &dma->rx_buf_dma, GFP_KERNEL); PCH_BUF_SIZE, &dma->rx_buf_dma, GFP_KERNEL);
} }
static int __devinit pch_spi_pd_probe(struct platform_device *plat_dev) static int pch_spi_pd_probe(struct platform_device *plat_dev)
{ {
int ret; int ret;
struct spi_master *master; struct spi_master *master;
...@@ -1498,7 +1498,7 @@ static int __devinit pch_spi_pd_probe(struct platform_device *plat_dev) ...@@ -1498,7 +1498,7 @@ static int __devinit pch_spi_pd_probe(struct platform_device *plat_dev)
return ret; return ret;
} }
static int __devexit pch_spi_pd_remove(struct platform_device *plat_dev) static int pch_spi_pd_remove(struct platform_device *plat_dev)
{ {
struct pch_spi_board_data *board_dat = dev_get_platdata(&plat_dev->dev); struct pch_spi_board_data *board_dat = dev_get_platdata(&plat_dev->dev);
struct pch_spi_data *data = platform_get_drvdata(plat_dev); struct pch_spi_data *data = platform_get_drvdata(plat_dev);
...@@ -1619,12 +1619,12 @@ static struct platform_driver pch_spi_pd_driver = { ...@@ -1619,12 +1619,12 @@ static struct platform_driver pch_spi_pd_driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
.probe = pch_spi_pd_probe, .probe = pch_spi_pd_probe,
.remove = __devexit_p(pch_spi_pd_remove), .remove = pch_spi_pd_remove,
.suspend = pch_spi_pd_suspend, .suspend = pch_spi_pd_suspend,
.resume = pch_spi_pd_resume .resume = pch_spi_pd_resume
}; };
static int __devinit pch_spi_probe(struct pci_dev *pdev, static int pch_spi_probe(struct pci_dev *pdev,
const struct pci_device_id *id) const struct pci_device_id *id)
{ {
struct pch_spi_board_data *board_dat; struct pch_spi_board_data *board_dat;
...@@ -1705,7 +1705,7 @@ static int __devinit pch_spi_probe(struct pci_dev *pdev, ...@@ -1705,7 +1705,7 @@ static int __devinit pch_spi_probe(struct pci_dev *pdev,
return retval; return retval;
} }
static void __devexit pch_spi_remove(struct pci_dev *pdev) static void pch_spi_remove(struct pci_dev *pdev)
{ {
int i; int i;
struct pch_pd_dev_save *pd_dev_save = pci_get_drvdata(pdev); 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,7 +1776,7 @@ static struct pci_driver pch_spi_pcidev_driver = {
.name = "pch_spi", .name = "pch_spi",
.id_table = pch_spi_pcidev_id, .id_table = pch_spi_pcidev_id,
.probe = pch_spi_probe, .probe = pch_spi_probe,
.remove = __devexit_p(pch_spi_remove), .remove = pch_spi_remove,
.suspend = pch_spi_suspend, .suspend = pch_spi_suspend,
.resume = pch_spi_resume, .resume = pch_spi_resume,
}; };
......
drivers/spi/spi-xcomm.c
View file @ fd4a319b
...@@ -217,7 +217,7 @@ static int spi_xcomm_setup(struct spi_device *spi) ...@@ -217,7 +217,7 @@ static int spi_xcomm_setup(struct spi_device *spi)
return 0; return 0;
} }
static int __devinit spi_xcomm_probe(struct i2c_client *i2c, static int spi_xcomm_probe(struct i2c_client *i2c,
const struct i2c_device_id *id) const struct i2c_device_id *id)
{ {
struct spi_xcomm *spi_xcomm; struct spi_xcomm *spi_xcomm;
...@@ -246,7 +246,7 @@ static int __devinit spi_xcomm_probe(struct i2c_client *i2c, ...@@ -246,7 +246,7 @@ static int __devinit spi_xcomm_probe(struct i2c_client *i2c,
return ret; return ret;
} }
static int __devexit spi_xcomm_remove(struct i2c_client *i2c) static int spi_xcomm_remove(struct i2c_client *i2c)
{ {
struct spi_master *master = i2c_get_clientdata(i2c); struct spi_master *master = i2c_get_clientdata(i2c);
...@@ -267,7 +267,7 @@ static struct i2c_driver spi_xcomm_driver = { ...@@ -267,7 +267,7 @@ static struct i2c_driver spi_xcomm_driver = {
}, },
.id_table = spi_xcomm_ids, .id_table = spi_xcomm_ids,
.probe = spi_xcomm_probe, .probe = spi_xcomm_probe,
.remove = __devexit_p(spi_xcomm_remove), .remove = spi_xcomm_remove,
}; };
module_i2c_driver(spi_xcomm_driver); module_i2c_driver(spi_xcomm_driver);
......
drivers/spi/spi-xilinx.c
View file @ fd4a319b
...@@ -462,7 +462,7 @@ void xilinx_spi_deinit(struct spi_master *master) ...@@ -462,7 +462,7 @@ void xilinx_spi_deinit(struct spi_master *master)
} }
EXPORT_SYMBOL(xilinx_spi_deinit); EXPORT_SYMBOL(xilinx_spi_deinit);
static int __devinit xilinx_spi_probe(struct platform_device *dev) static int xilinx_spi_probe(struct platform_device *dev)
{ {
struct xspi_platform_data *pdata; struct xspi_platform_data *pdata;
struct resource *r; struct resource *r;
...@@ -518,7 +518,7 @@ static int __devinit xilinx_spi_probe(struct platform_device *dev) ...@@ -518,7 +518,7 @@ static int __devinit xilinx_spi_probe(struct platform_device *dev)
return 0; return 0;
} }
static int __devexit xilinx_spi_remove(struct platform_device *dev) static int xilinx_spi_remove(struct platform_device *dev)
{ {
xilinx_spi_deinit(platform_get_drvdata(dev)); xilinx_spi_deinit(platform_get_drvdata(dev));
platform_set_drvdata(dev, 0); platform_set_drvdata(dev, 0);
...@@ -531,7 +531,7 @@ MODULE_ALIAS("platform:" XILINX_SPI_NAME); ...@@ -531,7 +531,7 @@ MODULE_ALIAS("platform:" XILINX_SPI_NAME);
static struct platform_driver xilinx_spi_driver = { static struct platform_driver xilinx_spi_driver = {
.probe = xilinx_spi_probe, .probe = xilinx_spi_probe,
.remove = __devexit_p(xilinx_spi_remove), .remove = xilinx_spi_remove,
.driver = { .driver = {
.name = XILINX_SPI_NAME, .name = XILINX_SPI_NAME,
.owner = THIS_MODULE, .owner = THIS_MODULE,
......
drivers/spi/spi.c
View file @ fd4a319b
...@@ -492,8 +492,7 @@ static void spi_match_master_to_boardinfo(struct spi_master *master, ...@@ -492,8 +492,7 @@ static void spi_match_master_to_boardinfo(struct spi_master *master,
* The board info passed can safely be __initdata ... but be careful of * The board info passed can safely be __initdata ... but be careful of
* any embedded pointers (platform_data, etc), they're copied as-is. * any embedded pointers (platform_data, etc), they're copied as-is.
*/ */
int __devinit int spi_register_board_info(struct spi_board_info const *info, unsigned n)
spi_register_board_info(struct spi_board_info const *info, unsigned n)
{ {
struct boardinfo *bi; struct boardinfo *bi;
int i; int i;
......
drivers/spi/spidev.c
View file @ fd4a319b
...@@ -573,7 +573,7 @@ static struct class *spidev_class; ...@@ -573,7 +573,7 @@ static struct class *spidev_class;
/*-------------------------------------------------------------------------*/ /*-------------------------------------------------------------------------*/
static int __devinit spidev_probe(struct spi_device *spi) static int spidev_probe(struct spi_device *spi)
{ {
struct spidev_data *spidev; struct spidev_data *spidev;
int status; int status;
...@@ -622,7 +622,7 @@ static int __devinit spidev_probe(struct spi_device *spi) ...@@ -622,7 +622,7 @@ static int __devinit spidev_probe(struct spi_device *spi)
return status; return status;
} }
static int __devexit spidev_remove(struct spi_device *spi) static int spidev_remove(struct spi_device *spi)
{ {
struct spidev_data *spidev = spi_get_drvdata(spi); struct spidev_data *spidev = spi_get_drvdata(spi);
...@@ -658,7 +658,7 @@ static struct spi_driver spidev_spi_driver = { ...@@ -658,7 +658,7 @@ static struct spi_driver spidev_spi_driver = {
.of_match_table = of_match_ptr(spidev_dt_ids), .of_match_table = of_match_ptr(spidev_dt_ids),
}, },
.probe = spidev_probe, .probe = spidev_probe,
.remove = __devexit_p(spidev_remove), .remove = spidev_remove,
/* NOTE: suspend/resume methods are not necessary here. /* NOTE: suspend/resume methods are not necessary here.
* We don't do anything except pass the requests to/from * We don't do anything except pass the requests to/from
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7