2009-11-24 21:07:46

by Uwe Kleine-König

[permalink] [raw]
Subject: [PATCH 01/38] move asic3_remove to .devexit.text

The function asic3_remove is used only wrapped by __devexit_p so define
it using __devexit.

Signed-off-by: Uwe Kleine-König <[email protected]>
Acked-by: Sam Ravnborg <[email protected]>
Cc: Samuel Ortiz <[email protected]>
Cc: Philipp Zabel <[email protected]>
Cc: Yinghai Lu <[email protected]>
Cc: Russell King <[email protected]>
Cc: [email protected]
---
drivers/mfd/asic3.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/mfd/asic3.c b/drivers/mfd/asic3.c
index 63a2a66..e22128c 100644
--- a/drivers/mfd/asic3.c
+++ b/drivers/mfd/asic3.c
@@ -908,7 +908,7 @@ static int __init asic3_probe(struct platform_device *pdev)
return ret;
}

-static int asic3_remove(struct platform_device *pdev)
+static int __devexit asic3_remove(struct platform_device *pdev)
{
int ret;
struct asic3 *asic = platform_get_drvdata(pdev);
--
1.6.5.2


2009-11-24 21:15:27

by Uwe Kleine-König

[permalink] [raw]
Subject: [PATCH 02/38] move atp870u_remove to .devexit.text

The function atp870u_remove is used only wrapped by __devexit_p so define
it using __devexit.

Signed-off-by: Uwe Kleine-König <[email protected]>
Acked-by: Sam Ravnborg <[email protected]>
Cc: James E.J. Bottomley <[email protected]>
Cc: Yang Hongyang <[email protected]>
Cc: James Bottomley <[email protected]>
Cc: Andrew Morton <[email protected]>
Cc: Alan Cox <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: Alan Cox <[email protected]>
---
drivers/scsi/atp870u.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/scsi/atp870u.c b/drivers/scsi/atp870u.c
index b137e56..1059167 100644
--- a/drivers/scsi/atp870u.c
+++ b/drivers/scsi/atp870u.c
@@ -3143,7 +3143,7 @@ static int atp870u_biosparam(struct scsi_device *disk, struct block_device *dev,
return 0;
}

-static void atp870u_remove (struct pci_dev *pdev)
+static void __devexit atp870u_remove (struct pci_dev *pdev)
{
struct atp_unit *devext = pci_get_drvdata(pdev);
struct Scsi_Host *pshost = devext->host;
--
1.6.5.2

2009-11-24 21:08:17

by Uwe Kleine-König

[permalink] [raw]
Subject: [PATCH 03/38] move excite_nand_remove to .devexit.text

The function excite_nand_remove is used only wrapped by __devexit_p so
define it using __devexit.

Signed-off-by: Uwe Kleine-König <[email protected]>
Cc: Ming Lei <[email protected]>
Cc: Henrique de Moraes Holschuh <[email protected]>
Cc: Greg Kroah-Hartman <[email protected]>
Cc: David Brownell <[email protected]>
Cc: [email protected]
Cc: David Woodhouse <[email protected]>
Cc: [email protected]
---
drivers/mtd/nand/excite_nandflash.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/mtd/nand/excite_nandflash.c b/drivers/mtd/nand/excite_nandflash.c
index 72446fb..af6a6a5 100644
--- a/drivers/mtd/nand/excite_nandflash.c
+++ b/drivers/mtd/nand/excite_nandflash.c
@@ -128,7 +128,7 @@ static int excite_nand_devready(struct mtd_info *mtd)
* The binding to the mtd and all allocated
* resources are released.
*/
-static int __exit excite_nand_remove(struct platform_device *dev)
+static int __devexit excite_nand_remove(struct platform_device *dev)
{
struct excite_nand_drvdata * const this = platform_get_drvdata(dev);

--
1.6.5.2

2009-11-24 21:07:45

by Uwe Kleine-König

[permalink] [raw]
Subject: [PATCH 04/38] move ilo_remove to .devexit.text

The function ilo_remove is used only wrapped by __devexit_p so define it
using __devexit.

Signed-off-by: Uwe Kleine-König <[email protected]>
Acked-by: Sam Ravnborg <[email protected]>
Acked-by: David Altobelli <[email protected]>
Cc: Andrew Morton <[email protected]>
Cc: Greg Kroah-Hartman <[email protected]>
Cc: [email protected]
Cc: Alexey Dobriyan <[email protected]>
---
drivers/misc/hpilo.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/misc/hpilo.c b/drivers/misc/hpilo.c
index a92a3a7..487e603 100644
--- a/drivers/misc/hpilo.c
+++ b/drivers/misc/hpilo.c
@@ -716,7 +716,7 @@ out:
return error;
}

-static void ilo_remove(struct pci_dev *pdev)
+static void __devexit ilo_remove(struct pci_dev *pdev)
{
int i, minor;
struct ilo_hwinfo *ilo_hw = pci_get_drvdata(pdev);
--
1.6.5.2

2009-11-24 21:16:44

by Uwe Kleine-König

[permalink] [raw]
Subject: [PATCH 05/38] move initio_remove_one to .devexit.text

The function initio_remove_one is used only wrapped by __devexit_p so
define it using __devexit.

Signed-off-by: Uwe Kleine-König <[email protected]>
Cc: James E.J. Bottomley <[email protected]>
Cc: Yang Hongyang <[email protected]>
Cc: James Bottomley <[email protected]>
Cc: Andrew Morton <[email protected]>
Cc: Alan Cox <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: Alan Cox <[email protected]>
---
drivers/scsi/initio.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/scsi/initio.c b/drivers/scsi/initio.c
index 89a5948..8bbfd99 100644
--- a/drivers/scsi/initio.c
+++ b/drivers/scsi/initio.c
@@ -2964,7 +2964,7 @@ out_disable_device:
* finished being used.
*/

-static void initio_remove_one(struct pci_dev *pdev)
+static void __devexit initio_remove_one(struct pci_dev *pdev)
{
struct Scsi_Host *host = pci_get_drvdata(pdev);
struct initio_host *s = (struct initio_host *)host->hostdata;
--
1.6.5.2

2009-11-24 21:08:04

by Uwe Kleine-König

[permalink] [raw]
Subject: [PATCH 06/38] move iodev_remove to .devexit.text

The function iodev_remove is used only wrapped by __devexit_p so define
it using __devexit.

Signed-off-by: Uwe Kleine-König <[email protected]>
Cc: Ming Lei <[email protected]>
Cc: Henrique de Moraes Holschuh <[email protected]>
Cc: Greg Kroah-Hartman <[email protected]>
Cc: David Brownell <[email protected]>
Cc: [email protected]
Cc: Ralf Baechle <[email protected]>
Cc: [email protected]
---
arch/mips/basler/excite/excite_iodev.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/mips/basler/excite/excite_iodev.c b/arch/mips/basler/excite/excite_iodev.c
index 938b1d0..733b242 100644
--- a/arch/mips/basler/excite/excite_iodev.c
+++ b/arch/mips/basler/excite/excite_iodev.c
@@ -34,7 +34,7 @@

static const struct resource *iodev_get_resource(struct platform_device *, const char *, unsigned int);
static int __init iodev_probe(struct platform_device *);
-static int __exit iodev_remove(struct platform_device *);
+static int __devexit iodev_remove(struct platform_device *);
static int iodev_open(struct inode *, struct file *);
static int iodev_release(struct inode *, struct file *);
static ssize_t iodev_read(struct file *, char __user *, size_t s, loff_t *);
@@ -103,7 +103,7 @@ static int __init iodev_probe(struct platform_device *dev)



-static int __exit iodev_remove(struct platform_device *dev)
+static int __devexit iodev_remove(struct platform_device *dev)
{
return misc_deregister(&miscdev);
}
--
1.6.5.2

2009-11-24 21:09:56

by Uwe Kleine-König

[permalink] [raw]
Subject: [PATCH 07/38] move lasi700_driver_remove to .devexit.text

The function lasi700_driver_remove is used only wrapped by __devexit_p
so define it using __devexit.

Signed-off-by: Uwe Kleine-König <[email protected]>
Cc: James E.J. Bottomley <[email protected]>
Cc: Yang Hongyang <[email protected]>
Cc: Kyle McMartin <[email protected]>
Cc: Kay Sievers <[email protected]>
Cc: James Bottomley <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: Andrew Morton <[email protected]>
Cc: Helge Deller <[email protected]>
---
drivers/scsi/lasi700.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/scsi/lasi700.c b/drivers/scsi/lasi700.c
index b3d3131..a192914 100644
--- a/drivers/scsi/lasi700.c
+++ b/drivers/scsi/lasi700.c
@@ -147,7 +147,7 @@ lasi700_probe(struct parisc_device *dev)
return -ENODEV;
}

-static int __exit
+static int __devexit
lasi700_driver_remove(struct parisc_device *dev)
{
struct Scsi_Host *host = dev_get_drvdata(&dev->dev);
--
1.6.5.2

2009-11-24 21:12:40

by Uwe Kleine-König

[permalink] [raw]
Subject: [PATCH 08/38] move mcf_remove to .devexit.text

The function mcf_remove is used only wrapped by __devexit_p so define it
using __devexit.

Signed-off-by: Uwe Kleine-König <[email protected]>
Cc: Greg Ungerer <[email protected]>
Cc: Len Sorensen <[email protected]>
Cc: Greg Kroah-Hartman <[email protected]>
Cc: Alan Cox <[email protected]>
Cc: [email protected]
---
drivers/serial/mcf.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/serial/mcf.c b/drivers/serial/mcf.c
index b443824..7bb5fee 100644
--- a/drivers/serial/mcf.c
+++ b/drivers/serial/mcf.c
@@ -602,7 +602,7 @@ static int __devinit mcf_probe(struct platform_device *pdev)

/****************************************************************************/

-static int mcf_remove(struct platform_device *pdev)
+static int __devexit mcf_remove(struct platform_device *pdev)
{
struct uart_port *port;
int i;
--
1.6.5.2

2009-11-24 21:09:40

by Uwe Kleine-König

[permalink] [raw]
Subject: [PATCH 09/38] move megaraid_detach_one to .devexit.text

The function megaraid_detach_one is used only wrapped by __devexit_p so
define it using __devexit.

Signed-off-by: Uwe Kleine-König <[email protected]>
Acked-by: Sam Ravnborg <[email protected]>
Cc: Neela Syam Kolli <[email protected]>
Cc: James E.J. Bottomley <[email protected]>
Cc: Yang Hongyang <[email protected]>
Cc: Andrew Morton <[email protected]>
Cc: [email protected]
Cc: [email protected]
---
drivers/scsi/megaraid/megaraid_mbox.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/scsi/megaraid/megaraid_mbox.c b/drivers/scsi/megaraid/megaraid_mbox.c
index 234f0b7..9fc9cf7 100644
--- a/drivers/scsi/megaraid/megaraid_mbox.c
+++ b/drivers/scsi/megaraid/megaraid_mbox.c
@@ -76,7 +76,7 @@ static int megaraid_init(void);
static void megaraid_exit(void);

static int megaraid_probe_one(struct pci_dev*, const struct pci_device_id *);
-static void megaraid_detach_one(struct pci_dev *);
+static void __devexit megaraid_detach_one(struct pci_dev *);
static void megaraid_mbox_shutdown(struct pci_dev *);

static int megaraid_io_attach(adapter_t *);
@@ -551,7 +551,7 @@ out_probe_one:
*
* This routine is also called from the PCI hotplug system.
*/
-static void
+static void __devexit
megaraid_detach_one(struct pci_dev *pdev)
{
adapter_t *adapter;
--
1.6.5.2

2009-11-24 21:14:00

by Uwe Kleine-König

[permalink] [raw]
Subject: [PATCH 10/38] don't wrap mlx4_remove_one in __devexit_p

The function mlx4_remove_one is defined in .text, so there is no need to
wrap it with __devexit_p.

Signed-off-by: Uwe Kleine-König <[email protected]>
Cc: Roland Dreier <[email protected]>
Cc: Yevgeny Petrilin <[email protected]>
Cc: Yang Hongyang <[email protected]>
Cc: Jack Morgenstein <[email protected]>
Cc: Eli Cohen <[email protected]>
Cc: [email protected]
Cc: Andrew Morton <[email protected]>
Cc: [email protected]
---
drivers/net/mlx4/main.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/net/mlx4/main.c b/drivers/net/mlx4/main.c
index 291a505..a581860 100644
--- a/drivers/net/mlx4/main.c
+++ b/drivers/net/mlx4/main.c
@@ -1293,7 +1293,7 @@ static struct pci_driver mlx4_driver = {
.name = DRV_NAME,
.id_table = mlx4_pci_table,
.probe = mlx4_init_one,
- .remove = __devexit_p(mlx4_remove_one)
+ .remove = mlx4_remove_one
};

static int __init mlx4_verify_params(void)
--
1.6.5.2

2009-11-24 21:11:38

by Uwe Kleine-König

[permalink] [raw]
Subject: [PATCH 11/38] move mpc85xx_pci_err_remove to .devexit.text

The function mpc85xx_pci_err_remove is used only wrapped by __devexit_p
so define it using __devexit.

Signed-off-by: Uwe Kleine-König <[email protected]>
Acked-by: Sam Ravnborg <[email protected]>
Cc: Andrew Morton <[email protected]>
Cc: Doug Thompson <[email protected]>
Cc: Dave Jiang <[email protected]>
Cc: Kumar Gala <[email protected]>
Cc: Yang Shi <[email protected]>
Cc: [email protected]
Cc: Ira W. Snyder <[email protected]>
---
drivers/edac/mpc85xx_edac.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/edac/mpc85xx_edac.c b/drivers/edac/mpc85xx_edac.c
index cf27402..72b06c0 100644
--- a/drivers/edac/mpc85xx_edac.c
+++ b/drivers/edac/mpc85xx_edac.c
@@ -306,7 +306,7 @@ err:
return res;
}

-static int mpc85xx_pci_err_remove(struct of_device *op)
+static int __devexit mpc85xx_pci_err_remove(struct of_device *op)
{
struct edac_pci_ctl_info *pci = dev_get_drvdata(&op->dev);
struct mpc85xx_pci_pdata *pdata = pci->pvt_info;
--
1.6.5.2

2009-11-24 21:08:28

by Uwe Kleine-König

[permalink] [raw]
Subject: [PATCH 12/38] move mv64x60_pci_err_remove to .devexit.text

The function mv64x60_pci_err_remove is used only wrapped by __devexit_p
so define it using __devexit.

Signed-off-by: Uwe Kleine-König <[email protected]>
Acked-by: Sam Ravnborg <[email protected]>
Cc: Kay Sievers <[email protected]>
Cc: Greg Kroah-Hartman <[email protected]>
Cc: [email protected]
Cc: Doug Thompson <[email protected]>
Cc: Andrew Morton <[email protected]>
Cc: Julia Lawall <[email protected]>
---
drivers/edac/mv64x60_edac.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/edac/mv64x60_edac.c b/drivers/edac/mv64x60_edac.c
index a6b9fec..ed25d73 100644
--- a/drivers/edac/mv64x60_edac.c
+++ b/drivers/edac/mv64x60_edac.c
@@ -206,7 +206,7 @@ err:
return res;
}

-static int mv64x60_pci_err_remove(struct platform_device *pdev)
+static int __devexit mv64x60_pci_err_remove(struct platform_device *pdev)
{
struct edac_pci_ctl_info *pci = platform_get_drvdata(pdev);

--
1.6.5.2

2009-11-24 21:13:44

by Uwe Kleine-König

[permalink] [raw]
Subject: [PATCH 13/38] don't use __exit_p to wrap mxcnd_remove

The function mxcnd_remove is defined using __devexit, so don't use
__exit_p but __devexit_p to wrap it.

Signed-off-by: Uwe Kleine-König <[email protected]>
Cc: David Woodhouse <[email protected]>
Cc: David Woodhouse <[email protected]>
Cc: Artem Bityutskiy <[email protected]>
Cc: Sascha Hauer <[email protected]>
Cc: Vladimir Barinov <[email protected]>
Cc: Vladimir Barinov <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: Eric Benard <[email protected]>
---
drivers/mtd/nand/mxc_nand.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/mtd/nand/mxc_nand.c b/drivers/mtd/nand/mxc_nand.c
index 65b26d5..661d46a 100644
--- a/drivers/mtd/nand/mxc_nand.c
+++ b/drivers/mtd/nand/mxc_nand.c
@@ -1113,7 +1113,7 @@ static struct platform_driver mxcnd_driver = {
.driver = {
.name = DRIVER_NAME,
},
- .remove = __exit_p(mxcnd_remove),
+ .remove = __devexit_p(mxcnd_remove),
.suspend = mxcnd_suspend,
.resume = mxcnd_resume,
};
--
1.6.5.2

2009-11-24 21:08:49

by Uwe Kleine-König

[permalink] [raw]
Subject: [PATCH 14/38] move NCR_Q720_remove to .devexit.text

The function NCR_Q720_remove is used only wrapped by __devexit_p so
define it using __devexit.

Signed-off-by: Uwe Kleine-König <[email protected]>
Cc: James E.J. Bottomley <[email protected]>
Cc: [email protected]
Cc: [email protected]
---
drivers/scsi/NCR_Q720.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/scsi/NCR_Q720.c b/drivers/scsi/NCR_Q720.c
index a8bbdc2..1a398a8 100644
--- a/drivers/scsi/NCR_Q720.c
+++ b/drivers/scsi/NCR_Q720.c
@@ -325,7 +325,7 @@ NCR_Q720_remove_one(struct Scsi_Host *host)
ncr53c8xx_release(host);
}

-static int __exit
+static int __devexit
NCR_Q720_remove(struct device *dev)
{
struct NCR_Q720_private *p = dev_get_drvdata(dev);
--
1.6.5.2

2009-11-24 21:11:22

by Uwe Kleine-König

[permalink] [raw]
Subject: [PATCH 15/38] move s3c_adc_remove to .devexit.text

The function s3c_adc_remove is used only wrapped by __devexit_p so define
it using __devexit.

Signed-off-by: Uwe Kleine-König <[email protected]>
Acked-by: Sam Ravnborg <[email protected]>
Cc: Russell King <[email protected]>
Acked-By: Ben Dooks <[email protected]>
Cc: Ramax Lo <[email protected]>
Cc: Nelson Castillo <[email protected]>
Cc: [email protected]
Cc: Ben Dooks <[email protected]>
Cc: Alexey Dobriyan <[email protected]>
Cc: Ryan Mallon <[email protected]>
Cc: [email protected]
---
arch/arm/plat-s3c24xx/adc.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/arm/plat-s3c24xx/adc.c b/arch/arm/plat-s3c24xx/adc.c
index df47322..ce47627 100644
--- a/arch/arm/plat-s3c24xx/adc.c
+++ b/arch/arm/plat-s3c24xx/adc.c
@@ -365,7 +365,7 @@ static int s3c_adc_probe(struct platform_device *pdev)
return ret;
}

-static int s3c_adc_remove(struct platform_device *pdev)
+static int __devexit s3c_adc_remove(struct platform_device *pdev)
{
struct adc_device *adc = platform_get_drvdata(pdev);

--
1.6.5.2

2009-11-24 21:08:24

by Uwe Kleine-König

[permalink] [raw]
Subject: [PATCH 16/38] move s3c_pwm_remove to .devexit.text

The function s3c_pwm_remove is used only wrapped by __devexit_p so define
it using __devexit.

Signed-off-by: Uwe Kleine-König <[email protected]>
Acked-by: Sam Ravnborg <[email protected]>
Cc: Russell King <[email protected]>
Cc: Ben Dooks <[email protected]>
Cc: Peter Korsgaard <[email protected]>
Cc: [email protected]
Cc: [email protected]
---
arch/arm/plat-s3c/pwm.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/arm/plat-s3c/pwm.c b/arch/arm/plat-s3c/pwm.c
index 4fdc5b3..ef019f2 100644
--- a/arch/arm/plat-s3c/pwm.c
+++ b/arch/arm/plat-s3c/pwm.c
@@ -368,7 +368,7 @@ static int s3c_pwm_probe(struct platform_device *pdev)
return ret;
}

-static int s3c_pwm_remove(struct platform_device *pdev)
+static int __devexit s3c_pwm_remove(struct platform_device *pdev)
{
struct pwm_device *pwm = platform_get_drvdata(pdev);

--
1.6.5.2

2009-11-24 21:12:17

by Uwe Kleine-König

[permalink] [raw]
Subject: [PATCH 17/38] move sc26xx_driver_remove to .devexit.text

The function sc26xx_driver_remove is used only wrapped by __devexit_p so
define it using __devexit.

Signed-off-by: Uwe Kleine-König <[email protected]>
Cc: Greg Kroah-Hartman <[email protected]>
Cc: Alan Cox <[email protected]>
Cc: [email protected]
---
drivers/serial/sc26xx.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/serial/sc26xx.c b/drivers/serial/sc26xx.c
index 75038ad..ca9bddc 100644
--- a/drivers/serial/sc26xx.c
+++ b/drivers/serial/sc26xx.c
@@ -709,7 +709,7 @@ out_free_port:
}


-static int __exit sc26xx_driver_remove(struct platform_device *dev)
+static int __devexit sc26xx_driver_remove(struct platform_device *dev)
{
struct uart_sc26xx_port *up = dev_get_drvdata(&dev->dev);

--
1.6.5.2

2009-11-24 21:13:21

by Uwe Kleine-König

[permalink] [raw]
Subject: [PATCH 18/38] move sgiwd93_remove to .devexit.text

The function sgiwd93_remove is used only wrapped by __devexit_p so
define it using __devexit.

Signed-off-by: Uwe Kleine-König <[email protected]>
Cc: James E.J. Bottomley <[email protected]>
Cc: James Bottomley <[email protected]>
Cc: Dmitri Vorobiev <[email protected]>
Cc: [email protected]
Cc: [email protected]
---
drivers/scsi/sgiwd93.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/scsi/sgiwd93.c b/drivers/scsi/sgiwd93.c
index 0807b26..4f33f7a 100644
--- a/drivers/scsi/sgiwd93.c
+++ b/drivers/scsi/sgiwd93.c
@@ -297,7 +297,7 @@ out:
return err;
}

-static int __exit sgiwd93_remove(struct platform_device *pdev)
+static int __devexit sgiwd93_remove(struct platform_device *pdev)
{
struct Scsi_Host *host = platform_get_drvdata(pdev);
struct ip22_hostdata *hdata = (struct ip22_hostdata *) host->hostdata;
--
1.6.5.2

2009-11-24 21:08:55

by Uwe Kleine-König

[permalink] [raw]
Subject: [PATCH 19/38] move snirm710_driver_remove to .devexit.text

The function snirm710_driver_remove is used only wrapped by __devexit_p
so define it using __devexit.

Signed-off-by: Uwe Kleine-König <[email protected]>
Cc: James E.J. Bottomley <[email protected]>
Cc: Yang Hongyang <[email protected]>
Cc: Kay Sievers <[email protected]>
Cc: James Bottomley <[email protected]>
Cc: Greg Kroah-Hartman <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: Andrew Morton <[email protected]>
---
drivers/scsi/sni_53c710.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/scsi/sni_53c710.c b/drivers/scsi/sni_53c710.c
index 37b3359..c941a00 100644
--- a/drivers/scsi/sni_53c710.c
+++ b/drivers/scsi/sni_53c710.c
@@ -116,7 +116,7 @@ static int __init snirm710_probe(struct platform_device *dev)
return -ENODEV;
}

-static int __exit snirm710_driver_remove(struct platform_device *dev)
+static int __devexit snirm710_driver_remove(struct platform_device *dev)
{
struct Scsi_Host *host = dev_get_drvdata(&dev->dev);
struct NCR_700_Host_Parameters *hostdata =
--
1.6.5.2

2009-11-24 21:16:58

by Uwe Kleine-König

[permalink] [raw]
Subject: [PATCH 20/38] move spidev_remove to .devexit.text

The function spidev_remove is used only wrapped by __devexit_p so define
it using __devexit.

Signed-off-by: Uwe Kleine-König <[email protected]>
Acked-by: Sam Ravnborg <[email protected]>
Cc: David Brownell <[email protected]>
Cc: Andrew Morton <[email protected]>
Cc: Wolfgang Ocker <[email protected]>
Cc: Greg Kroah-Hartman <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: Mike Frysinger <[email protected]>
Cc: Alexey Dobriyan <[email protected]>
---
drivers/spi/spidev.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/spi/spidev.c b/drivers/spi/spidev.c
index 5d23983..5471bfc 100644
--- a/drivers/spi/spidev.c
+++ b/drivers/spi/spidev.c
@@ -610,7 +610,7 @@ static int spidev_probe(struct spi_device *spi)
return status;
}

-static int spidev_remove(struct spi_device *spi)
+static int __devexit spidev_remove(struct spi_device *spi)
{
struct spidev_data *spidev = spi_get_drvdata(spi);

--
1.6.5.2

2009-11-24 21:11:46

by Uwe Kleine-König

[permalink] [raw]
Subject: [PATCH 21/38] move stex_remove to .devexit.text

The function stex_remove is used only wrapped by __devexit_p so define
it using __devexit.

Signed-off-by: Uwe Kleine-König <[email protected]>
Acked-by: Sam Ravnborg <[email protected]>
Cc: Willem Riede <[email protected]>
Cc: James E.J. Bottomley <[email protected]>
Cc: "Kai Mäkisara" <[email protected]>
Cc: James Bottomley <[email protected]>
Cc: Ed Lin <[email protected]>
Cc: Yang Hongyang <[email protected]>
Cc: Andrew Morton <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
---
drivers/scsi/stex.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/scsi/stex.c b/drivers/scsi/stex.c
index 09fa886..09ee386 100644
--- a/drivers/scsi/stex.c
+++ b/drivers/scsi/stex.c
@@ -1679,7 +1679,7 @@ static void stex_hba_free(struct st_hba *hba)
hba->dma_mem, hba->dma_handle);
}

-static void stex_remove(struct pci_dev *pdev)
+static void __devexit stex_remove(struct pci_dev *pdev)
{
struct st_hba *hba = pci_get_drvdata(pdev);

--
1.6.5.2

2009-11-24 21:13:45

by Uwe Kleine-König

[permalink] [raw]
Subject: [PATCH 22/38] move vhci_hcd_remove to .devexit.text

The function vhci_hcd_remove is used only wrapped by __devexit_p so define
it using __devexit.

Signed-off-by: Uwe Kleine-König <[email protected]>
Acked-by: Sam Ravnborg <[email protected]>
Cc: Greg Kroah-Hartman <[email protected]>
Cc: Brian G. Merrell <[email protected]>
Cc: Shan Wei <[email protected]>
Cc: Kay Sievers <[email protected]>
Cc: [email protected]
Cc: [email protected]
---
drivers/staging/usbip/vhci_hcd.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/staging/usbip/vhci_hcd.c b/drivers/staging/usbip/vhci_hcd.c
index 6e91fc2..22b1c6c 100644
--- a/drivers/staging/usbip/vhci_hcd.c
+++ b/drivers/staging/usbip/vhci_hcd.c
@@ -1131,7 +1131,7 @@ static int vhci_hcd_probe(struct platform_device *pdev)
}


-static int vhci_hcd_remove(struct platform_device *pdev)
+static int __devexit vhci_hcd_remove(struct platform_device *pdev)
{
struct usb_hcd *hcd;

--
1.6.5.2

2009-11-24 21:12:00

by Uwe Kleine-König

[permalink] [raw]
Subject: [PATCH 23/38] move zalon_remove to .devexit.text

The function zalon_remove is used only wrapped by __devexit_p so define
it using __devexit.

Signed-off-by: Uwe Kleine-König <[email protected]>
Cc: James E.J. Bottomley <[email protected]>
Cc: James Bottomley <[email protected]>
Cc: Kyle McMartin <[email protected]>
Cc: Kay Sievers <[email protected]>
Cc: Helge Deller <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: Greg Kroah-Hartman <[email protected]>
---
drivers/scsi/zalon.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/scsi/zalon.c b/drivers/scsi/zalon.c
index 27e84e4..1f8c03d 100644
--- a/drivers/scsi/zalon.c
+++ b/drivers/scsi/zalon.c
@@ -167,7 +167,7 @@ static struct parisc_device_id zalon_tbl[] = {

MODULE_DEVICE_TABLE(parisc, zalon_tbl);

-static int __exit zalon_remove(struct parisc_device *dev)
+static int __devexit zalon_remove(struct parisc_device *dev)
{
struct Scsi_Host *host = dev_get_drvdata(&dev->dev);

--
1.6.5.2

2009-11-24 21:08:45

by Uwe Kleine-König

[permalink] [raw]
Subject: [PATCH 24/38] move lis3l02dq_remove to .devexit.text

The function lis3l02dq_remove is used only wrapped by __devexit_p so
define it using __devexit.

Signed-off-by: Uwe Kleine-König <[email protected]>
Acked-by: Jonathan Cameron <[email protected]>
Cc: Greg Kroah-Hartman <[email protected]>
Cc: [email protected]
Cc: [email protected]
---
drivers/staging/iio/accel/lis3l02dq_core.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/staging/iio/accel/lis3l02dq_core.c b/drivers/staging/iio/accel/lis3l02dq_core.c
index f008837..80e89a6 100644
--- a/drivers/staging/iio/accel/lis3l02dq_core.c
+++ b/drivers/staging/iio/accel/lis3l02dq_core.c
@@ -871,7 +871,7 @@ err_ret:
}

/* fixme, confirm ordering in this function */
-static int lis3l02dq_remove(struct spi_device *spi)
+static int __devexit lis3l02dq_remove(struct spi_device *spi)
{
int ret;
struct lis3l02dq_state *st = spi_get_drvdata(spi);
--
1.6.5.2

2009-11-24 21:14:52

by Uwe Kleine-König

[permalink] [raw]
Subject: [PATCH 25/38] move sca3000_remove to .devexit.text

The function sca3000_remove is used only wrapped by __devexit_p so define
it using __devexit.

Signed-off-by: Uwe Kleine-König <[email protected]>
Acked-by: Jonathan Cameron <[email protected]>
Cc: Greg Kroah-Hartman <[email protected]>
Cc: [email protected]
Cc: [email protected]
---
drivers/staging/iio/accel/sca3000_core.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/staging/iio/accel/sca3000_core.c b/drivers/staging/iio/accel/sca3000_core.c
index e27e3b7..5ea736a 100644
--- a/drivers/staging/iio/accel/sca3000_core.c
+++ b/drivers/staging/iio/accel/sca3000_core.c
@@ -1393,7 +1393,7 @@ error_ret:

}

-static int sca3000_remove(struct spi_device *spi)
+static int __devexit sca3000_remove(struct spi_device *spi)
{
struct sca3000_state *st = spi_get_drvdata(spi);
struct iio_dev *indio_dev = st->indio_dev;
--
1.6.5.2

2009-11-24 21:10:31

by Uwe Kleine-König

[permalink] [raw]
Subject: [PATCH 26/38] move vlynq_remove to .devexit.text

The function vlynq_remove is used only wrapped by __devexit_p so define
it using __devexit.

Signed-off-by: Uwe Kleine-König <[email protected]>
Cc: Andrew Morton <[email protected]>
Cc: Florian Fainelli <[email protected]>
Cc: Eugene Konev <[email protected]>
Cc: Julia Lawall <[email protected]>
Cc: Robert P. J. Day <[email protected]>
Cc: [email protected]
Cc: [email protected]
---
drivers/vlynq/vlynq.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/vlynq/vlynq.c b/drivers/vlynq/vlynq.c
index 9554ad5..3ae6e86 100644
--- a/drivers/vlynq/vlynq.c
+++ b/drivers/vlynq/vlynq.c
@@ -756,7 +756,7 @@ fail_request:
return result;
}

-static int vlynq_remove(struct platform_device *pdev)
+static int __devexit vlynq_remove(struct platform_device *pdev)
{
struct vlynq_device *dev = platform_get_drvdata(pdev);

--
1.6.5.2

2009-11-24 21:16:01

by Uwe Kleine-König

[permalink] [raw]
Subject: [PATCH 27/38] move bfad_pci_remove to .devexit.text

The function bfad_pci_remove is used only wrapped by __devexit_p so define
it using __devexit.

Signed-off-by: Uwe Kleine-König <[email protected]>
Cc: Jing Huang <[email protected]>
Cc: James Bottomley <[email protected]>
Cc: [email protected]
Cc: James E.J. Bottomley <[email protected]>
Cc: [email protected]
---
drivers/scsi/bfa/bfad.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/scsi/bfa/bfad.c b/drivers/scsi/bfa/bfad.c
index 6f2be5a..c4d3c91 100644
--- a/drivers/scsi/bfa/bfad.c
+++ b/drivers/scsi/bfa/bfad.c
@@ -1000,7 +1000,7 @@ out:
/**
* PCI remove entry.
*/
-void
+void __devexit
bfad_pci_remove(struct pci_dev *pdev)
{
struct bfad_s *bfad = pci_get_drvdata(pdev);
--
1.6.5.2

2009-11-24 21:08:36

by Uwe Kleine-König

[permalink] [raw]
Subject: [PATCH 28/38] don't use __exit_p to wrap ds1302_rtc_remove

The function ds1302_rtc_remove is defined using __devexit, so don't use
__exit_p but __devexit_p to wrap it.

Signed-off-by: Uwe Kleine-König <[email protected]>
Cc: Paul Mundt <[email protected]>
Cc: Alessandro Zummo <[email protected]>
Cc: [email protected]
Cc: Paul Gortmaker <[email protected]>
Cc: [email protected]
---
drivers/rtc/rtc-ds1302.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/rtc/rtc-ds1302.c b/drivers/rtc/rtc-ds1302.c
index d490628..1e73c8f 100644
--- a/drivers/rtc/rtc-ds1302.c
+++ b/drivers/rtc/rtc-ds1302.c
@@ -201,7 +201,7 @@ static struct platform_driver ds1302_platform_driver = {
.name = DRV_NAME,
.owner = THIS_MODULE,
},
- .remove = __exit_p(ds1302_rtc_remove),
+ .remove = __devexit_p(ds1302_rtc_remove),
};

static int __init ds1302_rtc_init(void)
--
1.6.5.2

2009-11-24 21:08:39

by Uwe Kleine-König

[permalink] [raw]
Subject: [PATCH 29/38] move mc33880_remove to .devexit.text

The function mc33880_remove is used only wrapped by __devexit_p so define
it using __devexit.

Signed-off-by: Uwe Kleine-König <[email protected]>
Cc: Andrew Morton <[email protected]>
Cc: "Richard Röjfors" <[email protected]>
Cc: [email protected]
---
drivers/gpio/mc33880.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/gpio/mc33880.c b/drivers/gpio/mc33880.c
index e7d01bd..6e82bc6 100644
--- a/drivers/gpio/mc33880.c
+++ b/drivers/gpio/mc33880.c
@@ -145,7 +145,7 @@ exit_destroy:
return ret;
}

-static int mc33880_remove(struct spi_device *spi)
+static int __devexit mc33880_remove(struct spi_device *spi)
{
struct mc33880 *mc;
int ret;
--
1.6.5.2

2009-11-24 21:12:37

by Uwe Kleine-König

[permalink] [raw]
Subject: [PATCH 30/38] move mipid_spi_remove to .devexit.text

The function mipid_spi_remove is used only wrapped by __devexit_p so
define it using __devexit.

Signed-off-by: Uwe Kleine-König <[email protected]>
Cc: Arnaud Patard <[email protected]>
Cc: Andrew Morton <[email protected]>
Cc: Mike Wege <[email protected]>
Cc: Imre Deak <[email protected]>
Cc: Hiroshi DOYU <[email protected]>
Cc: [email protected]
Cc: Imre Deak <[email protected]>
Cc: [email protected]
Cc: [email protected]
---
drivers/video/omap/lcd_mipid.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/video/omap/lcd_mipid.c b/drivers/video/omap/lcd_mipid.c
index 918ee89..24889ca 100644
--- a/drivers/video/omap/lcd_mipid.c
+++ b/drivers/video/omap/lcd_mipid.c
@@ -587,7 +587,7 @@ static int mipid_spi_probe(struct spi_device *spi)
return 0;
}

-static int mipid_spi_remove(struct spi_device *spi)
+static int __devexit mipid_spi_remove(struct spi_device *spi)
{
struct mipid_device *md = dev_get_drvdata(&spi->dev);

--
1.6.5.2

2009-11-24 21:14:51

by Uwe Kleine-König

[permalink] [raw]
Subject: [PATCH 31/38] move pcf2123_remove to .devexit.text

The function pcf2123_remove is used only wrapped by __devexit_p so define
it using __devexit.

Signed-off-by: Uwe Kleine-König <[email protected]>
Cc: Andrew Morton <[email protected]>
Cc: Christian Pellegrin <[email protected]>
Cc: Chris Verges <[email protected]>
Cc: [email protected]
Cc: Alessandro Zummo <[email protected]>
Cc: Paul Gortmaker <[email protected]>
Cc: [email protected]
---
drivers/rtc/rtc-pcf2123.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/rtc/rtc-pcf2123.c b/drivers/rtc/rtc-pcf2123.c
index e75df9d..2ceb365 100644
--- a/drivers/rtc/rtc-pcf2123.c
+++ b/drivers/rtc/rtc-pcf2123.c
@@ -315,7 +315,7 @@ kfree_exit:
return ret;
}

-static int pcf2123_remove(struct spi_device *spi)
+static int __devexit pcf2123_remove(struct spi_device *spi)
{
struct pcf2123_plat_data *pdata = spi->dev.platform_data;
int i;
--
1.6.5.2

2009-11-24 21:08:26

by Uwe Kleine-König

[permalink] [raw]
Subject: [PATCH 32/38] don't use __exit_p to wrap plat_mpc8xxx_spi_remove

The function plat_mpc8xxx_spi_remove is defined using __devexit, so don't
use __exit_p but __devexit_p to wrap it.

Signed-off-by: Uwe Kleine-König <[email protected]>
Cc: Andrew Morton <[email protected]>
Cc: Kumar Gala <[email protected]>
Cc: Anton Vorontsov <[email protected]>
Cc: Grant Likely <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: David Brownell <[email protected]>
Cc: [email protected]
---
drivers/spi/spi_mpc8xxx.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/spi/spi_mpc8xxx.c b/drivers/spi/spi_mpc8xxx.c
index 0fd0ec4..1d98be9 100644
--- a/drivers/spi/spi_mpc8xxx.c
+++ b/drivers/spi/spi_mpc8xxx.c
@@ -900,7 +900,7 @@ static int __devexit plat_mpc8xxx_spi_remove(struct platform_device *pdev)
MODULE_ALIAS("platform:mpc8xxx_spi");
static struct platform_driver mpc8xxx_spi_driver = {
.probe = plat_mpc8xxx_spi_probe,
- .remove = __exit_p(plat_mpc8xxx_spi_remove),
+ .remove = __devexit_p(plat_mpc8xxx_spi_remove),
.driver = {
.name = "mpc8xxx_spi",
.owner = THIS_MODULE,
--
1.6.5.2

2009-11-24 21:09:04

by Uwe Kleine-König

[permalink] [raw]
Subject: [PATCH 33/38] don't use __exit_p to wrap sh_mobile_ceu_remove

The function sh_mobile_ceu_remove is defined using __devexit, so don't
use __exit_p but __devexit_p to wrap it.

Signed-off-by: Uwe Kleine-König <[email protected]>
Cc: Mauro Carvalho Chehab <[email protected]>
Cc: Guennadi Liakhovetski <[email protected]>
Cc: Magnus Damm <[email protected]>
Cc: Kuninori Morimoto <[email protected]>
Cc: [email protected]
Cc: Mauro Carvalho Chehab <[email protected]>
Cc: [email protected]
---
drivers/media/video/sh_mobile_ceu_camera.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/media/video/sh_mobile_ceu_camera.c b/drivers/media/video/sh_mobile_ceu_camera.c
index 2f78b4f..e3e1ef2 100644
--- a/drivers/media/video/sh_mobile_ceu_camera.c
+++ b/drivers/media/video/sh_mobile_ceu_camera.c
@@ -1778,7 +1778,7 @@ static struct platform_driver sh_mobile_ceu_driver = {
.pm = &sh_mobile_ceu_dev_pm_ops,
},
.probe = sh_mobile_ceu_probe,
- .remove = __exit_p(sh_mobile_ceu_remove),
+ .remove = __devexit_p(sh_mobile_ceu_remove),
};

static int __init sh_mobile_ceu_init(void)
--
1.6.5.2

2009-11-24 21:08:50

by Uwe Kleine-König

[permalink] [raw]
Subject: [PATCH 34/38] move vpfe_remove to .devexit.text

The function vpfe_remove is used only wrapped by __devexit_p so define
it using __devexit.

Signed-off-by: Uwe Kleine-König <[email protected]>
Cc: Laurent Pinchart <[email protected]>
Cc: Alexey Klimov <[email protected]>
Cc: Muralidharan Karicheri <[email protected]>
Cc: Mauro Carvalho Chehab <[email protected]>
Cc: Hans Verkuil <[email protected]>
Cc: [email protected]
Cc: Mauro Carvalho Chehab <[email protected]>
Cc: [email protected]
---
drivers/media/video/davinci/vpfe_capture.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/media/video/davinci/vpfe_capture.c b/drivers/media/video/davinci/vpfe_capture.c
index 402ce43..902c59c 100644
--- a/drivers/media/video/davinci/vpfe_capture.c
+++ b/drivers/media/video/davinci/vpfe_capture.c
@@ -2054,7 +2054,7 @@ probe_free_dev_mem:
/*
* vpfe_remove : It un-register device from V4L2 driver
*/
-static int vpfe_remove(struct platform_device *pdev)
+static int __devexit vpfe_remove(struct platform_device *pdev)
{
struct vpfe_device *vpfe_dev = platform_get_drvdata(pdev);
struct resource *res;
--
1.6.5.2

2009-11-24 21:08:52

by Uwe Kleine-König

[permalink] [raw]
Subject: [PATCH 35/38] move vpif_remove to .devexit.text

The function vpif_remove is used only wrapped by __devexit_p so define
it using __devexit.

Signed-off-by: Uwe Kleine-König <[email protected]>
Cc: Mauro Carvalho Chehab <[email protected]>
Cc: Hans Verkuil <[email protected]>
Cc: Manjunath Hadli <[email protected]>
Cc: Chaithrika U S <[email protected]>
Cc: Muralidharan Karicheri <[email protected]>
Cc: [email protected]
Cc: Mauro Carvalho Chehab <[email protected]>
Cc: [email protected]
---
drivers/media/video/davinci/vpif.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/media/video/davinci/vpif.c b/drivers/media/video/davinci/vpif.c
index 3b8eac3..1f532e3 100644
--- a/drivers/media/video/davinci/vpif.c
+++ b/drivers/media/video/davinci/vpif.c
@@ -266,7 +266,7 @@ fail:
return status;
}

-static int vpif_remove(struct platform_device *pdev)
+static int __devexit vpif_remove(struct platform_device *pdev)
{
iounmap(vpif_base);
release_mem_region(res->start, res_len);
--
1.6.5.2

2009-11-24 21:08:56

by Uwe Kleine-König

[permalink] [raw]
Subject: [PATCH 36/38] move vpss_remove to .devexit.text

The function vpss_remove is used only wrapped by __devexit_p so define
it using __devexit.

Signed-off-by: Uwe Kleine-König <[email protected]>
Cc: Hans Verkuil <[email protected]>
Cc: Laurent Pinchart <[email protected]>
Cc: Alexey Klimov <[email protected]>
Cc: Muralidharan Karicheri <[email protected]>
Cc: Mauro Carvalho Chehab <[email protected]>
Cc: [email protected]
Cc: Mauro Carvalho Chehab <[email protected]>
Cc: [email protected]
---
drivers/media/video/davinci/vpss.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/media/video/davinci/vpss.c b/drivers/media/video/davinci/vpss.c
index 6d709ca..ed0472f 100644
--- a/drivers/media/video/davinci/vpss.c
+++ b/drivers/media/video/davinci/vpss.c
@@ -268,7 +268,7 @@ fail1:
return status;
}

-static int vpss_remove(struct platform_device *pdev)
+static int __devexit vpss_remove(struct platform_device *pdev)
{
iounmap(oper_cfg.vpss_bl_regs_base);
release_mem_region(oper_cfg.r1->start, oper_cfg.len1);
--
1.6.5.2

2009-11-24 21:08:19

by Uwe Kleine-König

[permalink] [raw]
Subject: [PATCH 37/38] don't use __devexit_p to wrap sci_remove

The function sci_remove is defined without any section modifier, so
don't use __devexit_p to wrap it.

Signed-off-by: Uwe Kleine-König <[email protected]>
Cc: Paul Mundt <[email protected]>
Cc: Magnus Damm <[email protected]>
Cc: [email protected]
---
drivers/serial/sh-sci.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/serial/sh-sci.c b/drivers/serial/sh-sci.c
index 6498bd1..89421fa 100644
--- a/drivers/serial/sh-sci.c
+++ b/drivers/serial/sh-sci.c
@@ -1370,7 +1370,7 @@ static struct dev_pm_ops sci_dev_pm_ops = {

static struct platform_driver sci_driver = {
.probe = sci_probe,
- .remove = __devexit_p(sci_remove),
+ .remove = sci_remove,
.driver = {
.name = "sh-sci",
.owner = THIS_MODULE,
--
1.6.5.2

2009-11-24 21:08:32

by Uwe Kleine-König

[permalink] [raw]
Subject: [PATCH 38/38] don't use __exit_p to wrap composite_unbind

The function composite_unbind is defined without any section modifier,
so don't use __exit_p to wrap it.

Signed-off-by: Uwe Kleine-König <[email protected]>
Cc: Greg Kroah-Hartman <[email protected]>
Cc: David Brownell <[email protected]>
Cc: Bryan Wu <[email protected]>
Cc: Andrew Morton <[email protected]>
Cc: Felipe Balbi <[email protected]>
Cc: [email protected]
Cc: [email protected]
---
drivers/usb/gadget/composite.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c
index d05397e..c9d6833 100644
--- a/drivers/usb/gadget/composite.c
+++ b/drivers/usb/gadget/composite.c
@@ -1054,7 +1054,7 @@ static struct usb_gadget_driver composite_driver = {
.speed = USB_SPEED_HIGH,

.bind = composite_bind,
- .unbind = __exit_p(composite_unbind),
+ .unbind = composite_unbind,

.setup = composite_setup,
.disconnect = composite_disconnect,
--
1.6.5.2

2009-11-24 21:22:49

by Mike Frysinger

[permalink] [raw]
Subject: Re: [PATCH 20/38] move spidev_remove to .devexit.text

2009/11/24 Uwe Kleine-König
> The function spidev_remove is used only wrapped by __devexit_p so define
> it using __devexit.

this doesnt go far enough to address actual section mismatch issues in
the driver. i posted a more complete one here:
http://lkml.org/lkml/2009/10/13/76

and akpm has picked that up
-mike

2009-11-24 21:38:22

by James Bottomley

[permalink] [raw]
Subject: Re: [PATCH 02/38] move atp870u_remove to .devexit.text

On Tue, 2009-11-24 at 22:06 +0100, Uwe Kleine-König wrote:
> The function atp870u_remove is used only wrapped by __devexit_p so define
> it using __devexit.

But there's really no point to this. HOTPLUG is always defined on SCSI
systems that have these drivers, which means that _devinit/exit are
nops. That makes the change purely cosmetic and not worth churning two
dozen drivers for.

Even for the EMBEDDED cases that should care about this, the maintainers
have indicated that the memory savings simply aren't worth the hassle of
tracking the sectional updates.

James

2009-11-24 21:42:38

by Grant Likely

[permalink] [raw]
Subject: Re: [PATCH 32/38] don't use __exit_p to wrap plat_mpc8xxx_spi_remove

2009/11/24 Uwe Kleine-K?nig <[email protected]>:
> The function plat_mpc8xxx_spi_remove is defined using __devexit, so don't
> use __exit_p but __devexit_p to wrap it.
>
> Signed-off-by: Uwe Kleine-K?nig <[email protected]>

Obviously correct.

Acked-by: Grant Likely <[email protected]>

g.

> Cc: Andrew Morton <[email protected]>
> Cc: Kumar Gala <[email protected]>
> Cc: Anton Vorontsov <[email protected]>
> Cc: Grant Likely <[email protected]>
> Cc: [email protected]
> Cc: [email protected]
> Cc: David Brownell <[email protected]>
> Cc: [email protected]
> ---
> ?drivers/spi/spi_mpc8xxx.c | ? ?2 +-
> ?1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/spi/spi_mpc8xxx.c b/drivers/spi/spi_mpc8xxx.c
> index 0fd0ec4..1d98be9 100644
> --- a/drivers/spi/spi_mpc8xxx.c
> +++ b/drivers/spi/spi_mpc8xxx.c
> @@ -900,7 +900,7 @@ static int __devexit plat_mpc8xxx_spi_remove(struct platform_device *pdev)
> ?MODULE_ALIAS("platform:mpc8xxx_spi");
> ?static struct platform_driver mpc8xxx_spi_driver = {
> ? ? ? ?.probe = plat_mpc8xxx_spi_probe,
> - ? ? ? .remove = __exit_p(plat_mpc8xxx_spi_remove),
> + ? ? ? .remove = __devexit_p(plat_mpc8xxx_spi_remove),
> ? ? ? ?.driver = {
> ? ? ? ? ? ? ? ?.name = "mpc8xxx_spi",
> ? ? ? ? ? ? ? ?.owner = THIS_MODULE,
> --
> 1.6.5.2
>
>



--
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.

2009-11-24 23:22:37

by Samuel Ortiz

[permalink] [raw]
Subject: Re: [PATCH 01/38] move asic3_remove to .devexit.text

Hi Uwe,

On Tue, Nov 24, 2009 at 10:06:56PM +0100, Uwe Kleine-K?nig wrote:
> The function asic3_remove is used only wrapped by __devexit_p so define
> it using __devexit.
This one was already applied to my for-next branch.

Cheers,
Samuel.


> Signed-off-by: Uwe Kleine-K?nig <[email protected]>
> Acked-by: Sam Ravnborg <[email protected]>
> Cc: Samuel Ortiz <[email protected]>
> Cc: Philipp Zabel <[email protected]>
> Cc: Yinghai Lu <[email protected]>
> Cc: Russell King <[email protected]>
> Cc: [email protected]
> ---
> drivers/mfd/asic3.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/mfd/asic3.c b/drivers/mfd/asic3.c
> index 63a2a66..e22128c 100644
> --- a/drivers/mfd/asic3.c
> +++ b/drivers/mfd/asic3.c
> @@ -908,7 +908,7 @@ static int __init asic3_probe(struct platform_device *pdev)
> return ret;
> }
>
> -static int asic3_remove(struct platform_device *pdev)
> +static int __devexit asic3_remove(struct platform_device *pdev)
> {
> int ret;
> struct asic3 *asic = platform_get_drvdata(pdev);
> --
> 1.6.5.2
>

--
Intel Open Source Technology Centre
http://oss.intel.com/

2009-11-25 01:21:01

by Greg Ungerer

[permalink] [raw]
Subject: Re: [PATCH 08/38] move mcf_remove to .devexit.text

Hi Uwe,

Uwe Kleine-König wrote:
> The function mcf_remove is used only wrapped by __devexit_p so define it
> using __devexit.
>
> Signed-off-by: Uwe Kleine-König <[email protected]>
> Cc: Greg Ungerer <[email protected]>
> Cc: Len Sorensen <[email protected]>
> Cc: Greg Kroah-Hartman <[email protected]>
> Cc: Alan Cox <[email protected]>
> Cc: [email protected]

I have this queued in the for-linus (and for-next) branches for
inclusion in 2.6.33 at:

git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git

Regards
Greg



> ---
> drivers/serial/mcf.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/serial/mcf.c b/drivers/serial/mcf.c
> index b443824..7bb5fee 100644
> --- a/drivers/serial/mcf.c
> +++ b/drivers/serial/mcf.c
> @@ -602,7 +602,7 @@ static int __devinit mcf_probe(struct platform_device *pdev)
>
> /****************************************************************************/
>
> -static int mcf_remove(struct platform_device *pdev)
> +static int __devexit mcf_remove(struct platform_device *pdev)
> {
> struct uart_port *port;
> int i;


--
------------------------------------------------------------------------
Greg Ungerer -- Principal Engineer EMAIL: [email protected]
SnapGear Group, McAfee PHONE: +61 7 3435 2888
8 Gardner Close FAX: +61 7 3217 5323
Milton, QLD, 4064, Australia WEB: http://www.SnapGear.com

2009-11-25 01:37:03

by Paul Mundt

[permalink] [raw]
Subject: Re: [PATCH 28/38] don't use __exit_p to wrap ds1302_rtc_remove

On Tue, Nov 24, 2009 at 10:07:23PM +0100, Uwe Kleine-K??nig wrote:
> The function ds1302_rtc_remove is defined using __devexit, so don't use
> __exit_p but __devexit_p to wrap it.
>
> Signed-off-by: Uwe Kleine-K??nig <[email protected]>
> Cc: Paul Mundt <[email protected]>
> Cc: Alessandro Zummo <[email protected]>
> Cc: [email protected]
> Cc: Paul Gortmaker <[email protected]>
> Cc: [email protected]

On Tue, Nov 24, 2009 at 10:07:32PM +0100, Uwe Kleine-K??nig wrote:
> The function sci_remove is defined without any section modifier, so
> don't use __devexit_p to wrap it.
>
> Signed-off-by: Uwe Kleine-K??nig <[email protected]>
> Cc: Paul Mundt <[email protected]>
> Cc: Magnus Damm <[email protected]>
> Cc: [email protected]

I've applied both of these, thanks.

2009-11-25 08:02:21

by Peter Korsgaard

[permalink] [raw]
Subject: Re: [PATCH 16/38] move s3c_pwm_remove to .devexit.text

>>>>> "Uwe" == Uwe Kleine-König <[email protected]> writes:

Uwe> The function s3c_pwm_remove is used only wrapped by __devexit_p so define
Uwe> it using __devexit.

Uwe> Signed-off-by: Uwe Kleine-König <[email protected]>
Uwe> Acked-by: Sam Ravnborg <[email protected]>

Acked-by: Peter Korsgaard <[email protected]>

--
Bye, Peter Korsgaard

2009-11-25 09:51:53

by Franco Fichtner

[permalink] [raw]
Subject: Re: [PATCH 10/38] don't wrap mlx4_remove_one in __devexit_p

Uwe Kleine-König wrote:
> diff --git a/drivers/net/mlx4/main.c b/drivers/net/mlx4/main.c
> index 291a505..a581860 100644
> --- a/drivers/net/mlx4/main.c
> +++ b/drivers/net/mlx4/main.c
> @@ -1293,7 +1293,7 @@ static struct pci_driver mlx4_driver = {
> .name = DRV_NAME,
> .id_table = mlx4_pci_table,
> .probe = mlx4_init_one,
> - .remove = __devexit_p(mlx4_remove_one)
> + .remove = mlx4_remove_one
>
You may want to add the trailing comma while you're at it...

> };
>
> static int __init mlx4_verify_params(void)
>

f

2009-11-25 09:29:10

by Uwe Kleine-König

[permalink] [raw]
Subject: [PATCH] don't wrap mlx4_remove_one in __devexit_p

The function mlx4_remove_one is defined in .text, so there is no need to
wrap it with __devexit_p.

While at it add a trailing comma to the section initializer.

Signed-off-by: Uwe Kleine-König <[email protected]>
Cc: Roland Dreier <[email protected]>
Cc: Yevgeny Petrilin <[email protected]>
Cc: Yang Hongyang <[email protected]>
Cc: Jack Morgenstein <[email protected]>
Cc: Eli Cohen <[email protected]>
Cc: [email protected]
Cc: Andrew Morton <[email protected]>
Cc: [email protected]
Cc: Franco Fichtner <[email protected]>
---
drivers/net/mlx4/main.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/net/mlx4/main.c b/drivers/net/mlx4/main.c
index 291a505..acc2878 100644
--- a/drivers/net/mlx4/main.c
+++ b/drivers/net/mlx4/main.c
@@ -1293,7 +1293,7 @@ static struct pci_driver mlx4_driver = {
.name = DRV_NAME,
.id_table = mlx4_pci_table,
.probe = mlx4_init_one,
- .remove = __devexit_p(mlx4_remove_one)
+ .remove = mlx4_remove_one,
};

static int __init mlx4_verify_params(void)

2009-11-25 09:27:01

by Uwe Kleine-König

[permalink] [raw]
Subject: Re: [PATCH 02/38] move atp870u_remove to .devexit.text

On Tue, Nov 24, 2009 at 03:38:16PM -0600, James Bottomley wrote:
> On Tue, 2009-11-24 at 22:06 +0100, Uwe Kleine-K?nig wrote:
> > The function atp870u_remove is used only wrapped by __devexit_p so define
> > it using __devexit.
>
> But there's really no point to this. HOTPLUG is always defined on SCSI
> systems that have these drivers, which means that _devinit/exit are
> nops. That makes the change purely cosmetic and not worth churning two
> dozen drivers for.
>
> Even for the EMBEDDED cases that should care about this, the maintainers
> have indicated that the memory savings simply aren't worth the hassle of
> tracking the sectional updates.
I think there are people that care. Anyhow, then the best thing you can
do is something like

find drivers/scsi -type f -print0 | xargs perl -p -i -e 's/\b__(dev)?exit(_p)?\b//'

Then my scripts will drop the scsi related patches.

Best regards
Uwe

--
Pengutronix e.K. | Uwe Kleine-K?nig |
Industrial Linux Solutions | http://www.pengutronix.de/ |

Subject: Re: [PATCH 02/38] move atp870u_remove to .devexit.text

On Tuesday 24 November 2009 10:38:16 pm James Bottomley wrote:
> On Tue, 2009-11-24 at 22:06 +0100, Uwe Kleine-König wrote:
> > The function atp870u_remove is used only wrapped by __devexit_p so define
> > it using __devexit.
>
> But there's really no point to this. HOTPLUG is always defined on SCSI
> systems that have these drivers, which means that _devinit/exit are
> nops. That makes the change purely cosmetic and not worth churning two
> dozen drivers for.

Looking at things from a bit different angle:

These tags still have some value as a documentation and help
in maintaining some level of the coherency between different
parts of a kernel (which is a Good Thing).

--
Bartlomiej Zolnierkiewicz

2009-11-26 08:55:58

by Richard Röjfors

[permalink] [raw]
Subject: Re: [PATCH 29/38] move mc33880_remove to .devexit.text

Uwe Kleine-K?nig wrote:
> The function mc33880_remove is used only wrapped by __devexit_p so define
> it using __devexit.
>
> Signed-off-by: Uwe Kleine-K?nig <[email protected]>

Acked-by: Richard R?jfors <[email protected]>

2009-11-27 08:17:31

by Ralf Baechle

[permalink] [raw]
Subject: Re: [PATCH 06/38] move iodev_remove to .devexit.text

On Tue, Nov 24, 2009 at 10:07:01PM +0100, Uwe Kleine-K?nig wrote:

> The function iodev_remove is used only wrapped by __devexit_p so define
> it using __devexit.

Thanks, queued for 2.6.33.

Ralf

2009-12-03 22:07:19

by Ben Dooks

[permalink] [raw]
Subject: Re: [PATCH 15/38] move s3c_adc_remove to .devexit.text

On Tue, Nov 24, 2009 at 10:07:10PM +0100, Uwe Kleine-K?nig wrote:
> The function s3c_adc_remove is used only wrapped by __devexit_p so define
> it using __devexit.

Shall I put these into my tree?

> Signed-off-by: Uwe Kleine-K?nig <[email protected]>
> Acked-by: Sam Ravnborg <[email protected]>
> Cc: Russell King <[email protected]>
> Acked-By: Ben Dooks <[email protected]>
> Cc: Ramax Lo <[email protected]>
> Cc: Nelson Castillo <[email protected]>
> Cc: [email protected]
> Cc: Ben Dooks <[email protected]>
> Cc: Alexey Dobriyan <[email protected]>
> Cc: Ryan Mallon <[email protected]>
> Cc: [email protected]
> ---
> arch/arm/plat-s3c24xx/adc.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/arch/arm/plat-s3c24xx/adc.c b/arch/arm/plat-s3c24xx/adc.c
> index df47322..ce47627 100644
> --- a/arch/arm/plat-s3c24xx/adc.c
> +++ b/arch/arm/plat-s3c24xx/adc.c
> @@ -365,7 +365,7 @@ static int s3c_adc_probe(struct platform_device *pdev)
> return ret;
> }
>
> -static int s3c_adc_remove(struct platform_device *pdev)
> +static int __devexit s3c_adc_remove(struct platform_device *pdev)
> {
> struct adc_device *adc = platform_get_drvdata(pdev);
>
> --
> 1.6.5.2
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> [email protected]
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

--
--
Ben

Q: What's a light-year?
A: One-third less calories than a regular year.

2009-12-03 22:10:21

by Uwe Kleine-König

[permalink] [raw]
Subject: Re: [PATCH 15/38] move s3c_adc_remove to .devexit.text

Hi Ben,

On Thu, Dec 03, 2009 at 10:07:18PM +0000, Ben Dooks wrote:
> On Tue, Nov 24, 2009 at 10:07:10PM +0100, Uwe Kleine-K?nig wrote:
> > The function s3c_adc_remove is used only wrapped by __devexit_p so define
> > it using __devexit.
>
> Shall I put these into my tree?
Yes, I think your's is the right one.

Thanks
Uwe

--
Pengutronix e.K. | Uwe Kleine-K?nig |
Industrial Linux Solutions | http://www.pengutronix.de/ |