Skip to content

Commit

Permalink
spi: Remove HOTPLUG section attributes
Browse files Browse the repository at this point in the history 
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>
  • Loading branch information
Grant Likely committed Dec 7, 2012
1 parent 7730cba commit fd4a319
Show file tree
Hide file tree
Showing 47 changed files with 153 additions and 158 deletions.
6 changes: 3 additions & 3 deletions drivers/spi/spi-altera.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ static irqreturn_t altera_spi_irq(int irq, void *dev)
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 *hw;
Expand Down Expand Up @@ -290,7 +290,7 @@ static int __devinit altera_spi_probe(struct platform_device *pdev)
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 spi_master *master = hw->bitbang.master;
Expand All @@ -311,7 +311,7 @@ MODULE_DEVICE_TABLE(of, altera_spi_match);

static struct platform_driver altera_spi_driver = {
.probe = altera_spi_probe,
.remove = __devexit_p(altera_spi_remove),
.remove = altera_spi_remove,
.driver = {
.name = DRV_NAME,
.owner = THIS_MODULE,
Expand Down
6 changes: 3 additions & 3 deletions drivers/spi/spi-ath79.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

static __devinit int ath79_spi_probe(struct platform_device *pdev)
static int ath79_spi_probe(struct platform_device *pdev)
{
struct spi_master *master;
struct ath79_spi *sp;
Expand Down Expand Up @@ -251,7 +251,7 @@ static __devinit int ath79_spi_probe(struct platform_device *pdev)
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);

Expand All @@ -265,7 +265,7 @@ static __devexit int ath79_spi_remove(struct platform_device *pdev)

static struct platform_driver ath79_spi_driver = {
.probe = ath79_spi_probe,
.remove = __devexit_p(ath79_spi_remove),
.remove = ath79_spi_remove,
.driver = {
.name = DRV_NAME,
.owner = THIS_MODULE,
Expand Down
4 changes: 2 additions & 2 deletions drivers/spi/spi-atmel.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
int irq;
Expand Down Expand Up @@ -1003,7 +1003,7 @@ static int __devinit atmel_spi_probe(struct platform_device *pdev)
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 atmel_spi *as = spi_master_get_devdata(master);
Expand Down
6 changes: 3 additions & 3 deletions drivers/spi/spi-bcm63xx.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 device *dev = &pdev->dev;
Expand Down Expand Up @@ -449,7 +449,7 @@ static int __devinit bcm63xx_spi_probe(struct platform_device *pdev)
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 bcm63xx_spi *bs = spi_master_get_devdata(master);
Expand Down Expand Up @@ -514,7 +514,7 @@ static struct platform_driver bcm63xx_spi_driver = {
.pm = BCM63XX_SPI_PM_OPS,
},
.probe = bcm63xx_spi_probe,
.remove = __devexit_p(bcm63xx_spi_remove),
.remove = bcm63xx_spi_remove,
};

module_platform_driver(bcm63xx_spi_driver);
Expand Down
8 changes: 3 additions & 5 deletions drivers/spi/spi-bfin-sport.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -755,8 +755,7 @@ bfin_sport_spi_destroy_queue(struct bfin_sport_spi_master_data *drv_data)
return 0;
}

static int __devinit
bfin_sport_spi_probe(struct platform_device *pdev)
static int bfin_sport_spi_probe(struct platform_device *pdev)
{
struct device *dev = &pdev->dev;
struct bfin5xx_spi_master *platform_info;
Expand Down Expand Up @@ -863,8 +862,7 @@ bfin_sport_spi_probe(struct platform_device *pdev)
}

/* stop hardware and remove the driver */
static int __devexit
bfin_sport_spi_remove(struct platform_device *pdev)
static int bfin_sport_spi_remove(struct platform_device *pdev)
{
struct bfin_sport_spi_master_data *drv_data = platform_get_drvdata(pdev);
int status = 0;
Expand Down Expand Up @@ -935,7 +933,7 @@ static struct platform_driver bfin_sport_spi_driver = {
.owner = THIS_MODULE,
},
.probe = bfin_sport_spi_probe,
.remove = __devexit_p(bfin_sport_spi_remove),
.remove = bfin_sport_spi_remove,
.suspend = bfin_sport_spi_suspend,
.resume = bfin_sport_spi_resume,
};
Expand Down
4 changes: 2 additions & 2 deletions drivers/spi/spi-bfin5xx.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1387,7 +1387,7 @@ static int __init bfin_spi_probe(struct platform_device *pdev)
}

/* 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);
int status = 0;
Expand Down Expand Up @@ -1477,7 +1477,7 @@ static struct platform_driver bfin_spi_driver = {
},
.suspend = bfin_spi_suspend,
.resume = bfin_spi_resume,
.remove = __devexit_p(bfin_spi_remove),
.remove = bfin_spi_remove,
};

static int __init bfin_spi_init(void)
Expand Down
6 changes: 3 additions & 3 deletions drivers/spi/spi-clps711x.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ static irqreturn_t spi_clps711x_isr(int irq, void *dev_id)
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;
struct spi_master *master;
Expand Down Expand Up @@ -261,7 +261,7 @@ static int __devinit spi_clps711x_probe(struct platform_device *pdev)
return ret;
}

static int __devexit spi_clps711x_remove(struct platform_device *pdev)
static int spi_clps711x_remove(struct platform_device *pdev)
{
int i;
struct spi_master *master = platform_get_drvdata(pdev);
Expand All @@ -287,7 +287,7 @@ static struct platform_driver clps711x_spi_driver = {
.owner = THIS_MODULE,
},
.probe = spi_clps711x_probe,
.remove = __devexit_p(spi_clps711x_remove),
.remove = spi_clps711x_remove,
};
module_platform_driver(clps711x_spi_driver);

Expand Down
6 changes: 3 additions & 3 deletions drivers/spi/spi-coldfire-qspi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -401,7 +401,7 @@ static int mcfqspi_setup(struct spi_device *spi)
return 0;
}

static int __devinit mcfqspi_probe(struct platform_device *pdev)
static int mcfqspi_probe(struct platform_device *pdev)
{
struct spi_master *master;
struct mcfqspi *mcfqspi;
Expand Down Expand Up @@ -515,7 +515,7 @@ static int __devinit mcfqspi_probe(struct platform_device *pdev)
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 mcfqspi *mcfqspi = spi_master_get_devdata(master);
Expand Down Expand Up @@ -594,7 +594,7 @@ static struct platform_driver mcfqspi_driver = {
.driver.owner = THIS_MODULE,
.driver.pm = &mcfqspi_pm,
.probe = mcfqspi_probe,
.remove = __devexit_p(mcfqspi_remove),
.remove = mcfqspi_remove,
};
module_platform_driver(mcfqspi_driver);

Expand Down
6 changes: 3 additions & 3 deletions drivers/spi/spi-davinci.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
* 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 davinci_spi *dspi;
Expand Down Expand Up @@ -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
* 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 spi_master *master;
Expand Down Expand Up @@ -980,7 +980,7 @@ static struct platform_driver davinci_spi_driver = {
.owner = THIS_MODULE,
},
.probe = davinci_spi_probe,
.remove = __devexit_p(davinci_spi_remove),
.remove = davinci_spi_remove,
};
module_platform_driver(davinci_spi_driver);

Expand Down
6 changes: 3 additions & 3 deletions drivers/spi/spi-dw-mmio.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ struct dw_spi_mmio {
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 *dws;
Expand Down Expand Up @@ -106,7 +106,7 @@ static int __devinit dw_spi_mmio_probe(struct platform_device *pdev)
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 resource *mem;
Expand All @@ -129,7 +129,7 @@ static int __devexit dw_spi_mmio_remove(struct platform_device *pdev)

static struct platform_driver dw_spi_mmio_driver = {
.probe = dw_spi_mmio_probe,
.remove = __devexit_p(dw_spi_mmio_remove),
.remove = dw_spi_mmio_remove,
.driver = {
.name = DRIVER_NAME,
.owner = THIS_MODULE,
Expand Down
6 changes: 3 additions & 3 deletions drivers/spi/spi-dw-pci.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ struct dw_spi_pci {
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)
{
struct dw_spi_pci *dwpci;
Expand Down Expand Up @@ -105,7 +105,7 @@ static int __devinit spi_pci_probe(struct pci_dev *pdev,
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);

Expand Down Expand Up @@ -159,7 +159,7 @@ static struct pci_driver dw_spi_driver = {
.name = DRIVER_NAME,
.id_table = pci_ids,
.probe = spi_pci_probe,
.remove = __devexit_p(spi_pci_remove),
.remove = spi_pci_remove,
.suspend = spi_suspend,
.resume = spi_resume,
};
Expand Down
6 changes: 3 additions & 3 deletions drivers/spi/spi-dw.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -696,7 +696,7 @@ static void dw_spi_cleanup(struct spi_device *spi)
kfree(chip);
}

static int __devinit init_queue(struct dw_spi *dws)
static int init_queue(struct dw_spi *dws)
{
INIT_LIST_HEAD(&dws->queue);
spin_lock_init(&dws->lock);
Expand Down Expand Up @@ -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;
int ret;
Expand Down Expand Up @@ -877,7 +877,7 @@ int __devinit dw_spi_add_host(struct dw_spi *dws)
}
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;

Expand Down
6 changes: 3 additions & 3 deletions drivers/spi/spi-ep93xx.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1023,7 +1023,7 @@ static void ep93xx_spi_release_dma(struct ep93xx_spi *espi)
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 ep93xx_spi_info *info;
Expand Down Expand Up @@ -1138,7 +1138,7 @@ static int __devinit ep93xx_spi_probe(struct platform_device *pdev)
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 ep93xx_spi *espi = spi_master_get_devdata(master);
Expand Down Expand Up @@ -1180,7 +1180,7 @@ static struct platform_driver ep93xx_spi_driver = {
.owner = THIS_MODULE,
},
.probe = ep93xx_spi_probe,
.remove = __devexit_p(ep93xx_spi_remove),
.remove = ep93xx_spi_remove,
};
module_platform_driver(ep93xx_spi_driver);

Expand Down
6 changes: 3 additions & 3 deletions drivers/spi/spi-falcon.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,7 @@ static int falcon_sflash_xfer_one(struct spi_master *master,
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 spi_master *master;
Expand Down Expand Up @@ -438,7 +438,7 @@ static int __devinit falcon_sflash_probe(struct platform_device *pdev)
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);

Expand All @@ -455,7 +455,7 @@ MODULE_DEVICE_TABLE(of, falcon_sflash_match);

static struct platform_driver falcon_sflash_driver = {
.probe = falcon_sflash_probe,
.remove = __devexit_p(falcon_sflash_remove),
.remove = falcon_sflash_remove,
.driver = {
.name = DRV_NAME,
.owner = THIS_MODULE,
Expand Down
8 changes: 4 additions & 4 deletions drivers/spi/spi-fsl-espi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -587,7 +587,7 @@ static void fsl_espi_remove(struct mpc8xxx_spi *mspi)
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 fsl_spi_platform_data *pdata = dev->platform_data;
Expand Down Expand Up @@ -686,7 +686,7 @@ static int of_fsl_espi_get_chipselects(struct device *dev)
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_node *np = ofdev->dev.of_node;
Expand Down Expand Up @@ -725,7 +725,7 @@ static int __devinit of_fsl_espi_probe(struct platform_device *ofdev)
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);
}
Expand All @@ -743,7 +743,7 @@ static struct platform_driver fsl_espi_driver = {
.of_match_table = of_fsl_espi_match,
},
.probe = of_fsl_espi_probe,
.remove = __devexit_p(of_fsl_espi_remove),
.remove = of_fsl_espi_remove,
};
module_platform_driver(fsl_espi_driver);

Expand Down
Loading

0 comments on commit fd4a319

Please sign in to comment.