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

Commit bdf602bd authored by Russell King's avatar Russell King Committed by Russell King
Browse files

[ARM] fix lots of ARM __devexit sillyness 



`iop_adma_remove' referenced in section `.data' of drivers/built-in.o: defined in discarded section `.devexit.text' of drivers/built-in.o
`mv_xor_remove' referenced in section `.data' of drivers/built-in.o: defined in discarded section `.devexit.text' of drivers/built-in.o
`mv64xxx_i2c_unmap_regs' referenced in section `.devinit.text' of drivers/built-in.o: defined in discarded section `.devexit.text' of drivers/built-in.o
`mv64xxx_i2c_remove' referenced in section `.data' of drivers/built-in.o: defined in discarded section `.devexit.text' of drivers/built-in.o
`orion_nand_remove' referenced in section `.data' of drivers/built-in.o: defined in discarded section `.devexit.text' of drivers/built-in.o
`pxafb_remove' referenced in section `.data' of drivers/built-in.o: defined in discarded section `.devexit.text' of drivers/built-in.o

Acked-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent b57ee99f

drivers/dma/iop-adma.c

+1 −1
Original line number Diff line number Diff line
@@ -1401,7 +1401,7 @@ MODULE_ALIAS("platform:iop-adma"); 


static struct platform_driver iop_adma_driver = {

	.probe		= iop_adma_probe,

	.remove		= iop_adma_remove,

	.remove		= __devexit_p(iop_adma_remove),

	.driver		= {

		.owner	= THIS_MODULE,

		.name	= "iop-adma",

drivers/dma/mv_xor.c

+1 −1
Original line number Diff line number Diff line
@@ -1287,7 +1287,7 @@ mv_xor_conf_mbus_windows(struct mv_xor_shared_private *msp, 


static struct platform_driver mv_xor_driver = {

	.probe		= mv_xor_probe,

	.remove		= mv_xor_remove,

	.remove		= __devexit_p(mv_xor_remove),

	.driver		= {

		.owner	= THIS_MODULE,

		.name	= MV_XOR_NAME,

drivers/i2c/busses/i2c-mv64xxx.c

+2 −2
Original line number Diff line number Diff line
@@ -482,7 +482,7 @@ mv64xxx_i2c_map_regs(struct platform_device *pd, 
	return 0;

}



static void __devexit

static void

mv64xxx_i2c_unmap_regs(struct mv64xxx_i2c_data *drv_data)

{

	if (drv_data->reg_base) {
@@ -577,7 +577,7 @@ mv64xxx_i2c_remove(struct platform_device *dev) 


static struct platform_driver mv64xxx_i2c_driver = {

	.probe	= mv64xxx_i2c_probe,

	.remove	= mv64xxx_i2c_remove,

	.remove	= __devexit_p(mv64xxx_i2c_remove),

	.driver	= {

		.owner	= THIS_MODULE,

		.name	= MV64XXX_I2C_CTLR_NAME,

drivers/mtd/nand/orion_nand.c

+1 −1
Original line number Diff line number Diff line
@@ -149,7 +149,7 @@ static int __devexit orion_nand_remove(struct platform_device *pdev) 


static struct platform_driver orion_nand_driver = {

	.probe		= orion_nand_probe,

	.remove		= orion_nand_remove,

	.remove		= __devexit_p(orion_nand_remove),

	.driver		= {

		.name	= "orion_nand",

		.owner	= THIS_MODULE,

drivers/video/pxafb.c

+1 −1
Original line number Diff line number Diff line
@@ -2230,7 +2230,7 @@ static int __devexit pxafb_remove(struct platform_device *dev) 


static struct platform_driver pxafb_driver = {

	.probe		= pxafb_probe,

	.remove 	= pxafb_remove,

	.remove 	= __devexit_p(pxafb_remove),

	.suspend	= pxafb_suspend,

	.resume		= pxafb_resume,

	.driver		= {