Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fd4a319b authored by Grant Likely's avatar Grant Likely
Browse files

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

drivers/spi/spi-altera.c

+3 −3
Original line number Diff line number Diff line
@@ -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;
@@ -290,7 +290,7 @@ exit: 
	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;
@@ -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,

drivers/spi/spi-ath79.c

+3 −3
Original line number Diff line number Diff line
@@ -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;
@@ -251,7 +251,7 @@ err_put_master: 
	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);
@@ -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,

drivers/spi/spi-atmel.c

+2 −2
Original line number Diff line number Diff line
@@ -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;
@@ -1003,7 +1003,7 @@ out_free: 
	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);

drivers/spi/spi-bcm63xx.c

+3 −3
Original line number Diff line number Diff line
@@ -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;
@@ -449,7 +449,7 @@ out: 
	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);
@@ -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);

drivers/spi/spi-bfin-sport.c

+3 −5
Original line number Diff line number Diff line
@@ -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;
@@ -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;
@@ -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,

};