[PATCH 29/38] move mc33880_remove to .devexit.text
Uwe Kleine-König
it using __devexit.
Signed-off-by: Uwe Kleine-König <u.klein...@pengutronix.de>
Cc: Andrew Morton <ak...@linux-foundation.org>
Cc: "Richard Röjfors" <richard.r...@mocean-labs.com>
Cc: linux-...@vger.kernel.org
---
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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majo...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Uwe Kleine-König
so define it using __devexit.
Signed-off-by: Uwe Kleine-König <u.klein...@pengutronix.de>
Acked-by: Sam Ravnborg <s...@ravnborg.org>
Cc: Kay Sievers <kay.s...@vrfy.org>
Cc: Greg Kroah-Hartman <gre...@suse.de>
Cc: linux-...@vger.kernel.org
Cc: Doug Thompson <dougth...@xmission.com>
Cc: Andrew Morton <ak...@linux-foundation.org>
Cc: Julia Lawall <ju...@diku.dk>
---
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);
Uwe Kleine-König
it using __devexit.
Signed-off-by: Uwe Kleine-König <u.klein...@pengutronix.de>
Cc: Ming Lei <tom.l...@gmail.com>
Cc: Henrique de Moraes Holschuh <h...@hmh.eng.br>
Cc: Greg Kroah-Hartman <gre...@suse.de>
Cc: David Brownell <dbro...@users.sourceforge.net>
Cc: linux-...@vger.kernel.org
Cc: Ralf Baechle <ra...@linux-mips.org>
Cc: linux...@linux-mips.org
---
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);
Uwe Kleine-König
using __devexit.
Signed-off-by: Uwe Kleine-König <u.klein...@pengutronix.de>
Acked-by: Sam Ravnborg <s...@ravnborg.org>
Acked-by: David Altobelli <david.a...@hp.com>
Cc: Andrew Morton <ak...@linux-foundation.org>
Cc: Greg Kroah-Hartman <gre...@suse.de>
Cc: linux-...@vger.kernel.org
Cc: Alexey Dobriyan <adob...@gmail.com>
---
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);
Uwe Kleine-König
__exit_p but __devexit_p to wrap it.
Signed-off-by: Uwe Kleine-König <u.klein...@pengutronix.de>
Cc: Paul Mundt <let...@linux-sh.org>
Cc: Alessandro Zummo <a.z...@towertech.it>
Cc: linux-...@vger.kernel.org
Cc: Paul Gortmaker <p_gor...@yahoo.com>
Cc: rtc-...@googlegroups.com
---
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)
Uwe Kleine-König
define it using __devexit.
Signed-off-by: Uwe Kleine-König <u.klein...@pengutronix.de>
Cc: James E.J. Bottomley <James.B...@suse.de>
Cc: Yang Hongyang <yan...@cn.fujitsu.com>
Cc: James Bottomley <James.B...@HansenPartnership.com>
Cc: Andrew Morton <ak...@linux-foundation.org>
Cc: Alan Cox <al...@linux.intel.com>
Cc: linux...@vger.kernel.org
Cc: linux-...@vger.kernel.org
Cc: Alan Cox <al...@redhat.com>
---
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;
Uwe Kleine-König
it using __devexit.
Signed-off-by: Uwe Kleine-König <u.klein...@pengutronix.de>
Acked-by: Sam Ravnborg <s...@ravnborg.org>
Cc: David Brownell <dbro...@users.sourceforge.net>
Cc: Andrew Morton <ak...@linux-foundation.org>
Cc: Wolfgang Ocker <w...@reccoware.de>
Cc: Greg Kroah-Hartman <gre...@suse.de>
Cc: spi-deve...@lists.sourceforge.net
Cc: linux-...@vger.kernel.org
Cc: Mike Frysinger <vap...@gentoo.org>
Cc: Alexey Dobriyan <adob...@gmail.com>
---
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);
Uwe Kleine-König
define it using __devexit.
Signed-off-by: Uwe Kleine-König <u.klein...@pengutronix.de>
Cc: Arnaud Patard <arnaud...@rtp-net.org>
Cc: Andrew Morton <ak...@linux-foundation.org>
Cc: Mike Wege <ext-mi...@nokia.com>
Cc: Imre Deak <imre...@solidboot.com>
Cc: Hiroshi DOYU <Hirosh...@nokia.com>
Cc: linux-...@vger.kernel.org
Cc: Imre Deak <imre...@nokia.com>
Cc: linux-fb...@lists.sourceforge.net
Cc: linux...@vger.kernel.org
---
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);
Uwe Kleine-König
wrap it with __devexit_p.
Signed-off-by: Uwe Kleine-König <u.klein...@pengutronix.de>
Cc: Roland Dreier <rol...@cisco.com>
Cc: Yevgeny Petrilin <yevg...@mellanox.co.il>
Cc: Yang Hongyang <yan...@cn.fujitsu.com>
Cc: Jack Morgenstein <ja...@dev.mellanox.co.il>
Cc: Eli Cohen <e...@mellanox.co.il>
Cc: linux-...@vger.kernel.org
Cc: Andrew Morton <ak...@linux-foundation.org>
Cc: net...@vger.kernel.org
---
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)
Uwe Kleine-König
it using __devexit.
Signed-off-by: Uwe Kleine-König <u.klein...@pengutronix.de>
Acked-by: Sam Ravnborg <s...@ravnborg.org>
Cc: Willem Riede <os...@riede.org>
Cc: James E.J. Bottomley <James.B...@suse.de>
Cc: "Kai Mäkisara" <Kai.Ma...@kolumbus.fi>
Cc: James Bottomley <James.B...@HansenPartnership.com>
Cc: Ed Lin <ed....@promise.com>
Cc: Yang Hongyang <yan...@cn.fujitsu.com>
Cc: Andrew Morton <ak...@linux-foundation.org>
Cc: linux...@vger.kernel.org
Cc: osst-...@lists.sourceforge.net
Cc: linux-...@vger.kernel.org
---
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);
Uwe Kleine-König
it using __devexit.
Signed-off-by: Uwe Kleine-König <u.klein...@pengutronix.de>
Acked-by: Jonathan Cameron <ji...@cam.ac.uk>
Cc: Greg Kroah-Hartman <gre...@suse.de>
Cc: linux-...@vger.kernel.org
Cc: de...@driverdev.osuosl.org
---
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;
Uwe Kleine-König
it using __devexit.
Signed-off-by: Uwe Kleine-König <u.klein...@pengutronix.de>
Acked-by: Sam Ravnborg <s...@ravnborg.org>
Cc: Greg Kroah-Hartman <gre...@suse.de>
Cc: Brian G. Merrell <bgme...@novell.com>
Cc: Shan Wei <sha...@cn.fujitsu.com>
Cc: Kay Sievers <kay.s...@vrfy.org>
Cc: de...@driverdev.osuosl.org
Cc: linux-...@vger.kernel.org
---
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;
Uwe Kleine-König
using __devexit.
Signed-off-by: Uwe Kleine-König <u.klein...@pengutronix.de>
Cc: Greg Ungerer <ge...@uclinux.org>
Cc: Len Sorensen <lsor...@csclub.uwaterloo.ca>
Cc: Greg Kroah-Hartman <gre...@suse.de>
Cc: Alan Cox <al...@linux.intel.com>
Cc: linux-...@vger.kernel.org
---
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;
Uwe Kleine-König
it using __devexit.
Signed-off-by: Uwe Kleine-König <u.klein...@pengutronix.de>
Cc: Andrew Morton <ak...@linux-foundation.org>
Cc: Christian Pellegrin <chri...@fsfe.org>
Cc: Chris Verges <chr...@cyberswitching.com>
Cc: linux-...@vger.kernel.org
Cc: Alessandro Zummo <a.z...@towertech.it>
Cc: Paul Gortmaker <p_gor...@yahoo.com>
Cc: rtc-...@googlegroups.com
---
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;
Uwe Kleine-König
__exit_p but __devexit_p to wrap it.
Signed-off-by: Uwe Kleine-König <u.klein...@pengutronix.de>
Cc: David Woodhouse <dw...@infradead.org>
Cc: David Woodhouse <David.W...@intel.com>
Cc: Artem Bityutskiy <Artem.Bi...@nokia.com>
Cc: Sascha Hauer <s.h...@pengutronix.de>
Cc: Vladimir Barinov <vova.b...@gmail.com>
Cc: Vladimir Barinov <vbar...@embeddedalley.com>
Cc: linu...@lists.infradead.org
Cc: linux-...@vger.kernel.org
Cc: Eric Benard <ebe...@eukrea.com>
---
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,
Uwe Kleine-König
define it using __devexit.
Signed-off-by: Uwe Kleine-König <u.klein...@pengutronix.de>
Acked-by: Jonathan Cameron <ji...@cam.ac.uk>
Cc: Greg Kroah-Hartman <gre...@suse.de>
Cc: linux-...@vger.kernel.org
Cc: de...@driverdev.osuosl.org
---
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);
Uwe Kleine-König
so define it using __devexit.
Signed-off-by: Uwe Kleine-König <u.klein...@pengutronix.de>
Acked-by: Sam Ravnborg <s...@ravnborg.org>
Cc: Andrew Morton <ak...@linux-foundation.org>
Cc: Doug Thompson <dougth...@xmission.com>
Cc: Dave Jiang <dji...@mvista.com>
Cc: Kumar Gala <ga...@kernel.crashing.org>
Cc: Yang Shi <yang...@windriver.com>
Cc: linux-...@vger.kernel.org
Cc: Ira W. Snyder <i...@ovro.caltech.edu>
---
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;
Uwe Kleine-König
it using __devexit.
Signed-off-by: Uwe Kleine-König <u.klein...@pengutronix.de>
Acked-by: Sam Ravnborg <s...@ravnborg.org>
Cc: Russell King <li...@arm.linux.org.uk>
Cc: Ben Dooks <ben-...@fluff.org>
Cc: Peter Korsgaard <jac...@sunsite.dk>
Cc: linux-...@vger.kernel.org
Cc: linux-ar...@lists.infradead.org
---
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);
Uwe Kleine-König
so define it using __devexit.
Signed-off-by: Uwe Kleine-König <u.klein...@pengutronix.de>
Cc: James E.J. Bottomley <James.B...@suse.de>
Cc: Yang Hongyang <yan...@cn.fujitsu.com>
Cc: Kay Sievers <kay.s...@vrfy.org>
Cc: James Bottomley <James.B...@HansenPartnership.com>
Cc: Greg Kroah-Hartman <gre...@suse.de>
Cc: linux...@vger.kernel.org
Cc: linux-...@vger.kernel.org
Cc: Andrew Morton <ak...@linux-foundation.org>
---
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 =
Uwe Kleine-König
it using __devexit.
Signed-off-by: Uwe Kleine-König <u.klein...@pengutronix.de>
Cc: Jing Huang <hua...@brocade.com>
Cc: James Bottomley <James.B...@suse.de>
Cc: linux-...@vger.kernel.org
Cc: James E.J. Bottomley <James.B...@suse.de>
Cc: linux...@vger.kernel.org
---
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);
Uwe Kleine-König
it using __devexit.
Signed-off-by: Uwe Kleine-König <u.klein...@pengutronix.de>
Acked-by: Sam Ravnborg <s...@ravnborg.org>
Cc: Russell King <li...@arm.linux.org.uk>
Acked-By: Ben Dooks <b...@simtec.co.uk>
Cc: Ramax Lo <ram...@gmail.com>
Cc: Nelson Castillo <arh...@freaks-unidos.net>
Cc: linux-...@vger.kernel.org
Cc: Ben Dooks <ben-...@fluff.org>
Cc: Alexey Dobriyan <adob...@gmail.com>
Cc: Ryan Mallon <ry...@bluewatersys.com>
Cc: linux-ar...@lists.infradead.org
---
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);
Uwe Kleine-König
define it using __devexit.
Signed-off-by: Uwe Kleine-König <u.klein...@pengutronix.de>
Acked-by: Sam Ravnborg <s...@ravnborg.org>
Cc: Neela Syam Kolli <megara...@lsi.com>
Cc: James E.J. Bottomley <James.B...@suse.de>
Cc: Yang Hongyang <yan...@cn.fujitsu.com>
Cc: Andrew Morton <ak...@linux-foundation.org>
Cc: linux...@vger.kernel.org
Cc: linux-...@vger.kernel.org
---
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;
Uwe Kleine-König
so define it using __devexit.
Signed-off-by: Uwe Kleine-König <u.klein...@pengutronix.de>
Cc: James E.J. Bottomley <James.B...@suse.de>
Cc: Yang Hongyang <yan...@cn.fujitsu.com>
Cc: Kyle McMartin <ky...@mcmartin.ca>
Cc: Kay Sievers <kay.s...@vrfy.org>
Cc: James Bottomley <James.B...@HansenPartnership.com>
Cc: linux...@vger.kernel.org
Cc: linux-...@vger.kernel.org
Cc: Andrew Morton <ak...@linux-foundation.org>
Cc: Helge Deller <del...@gmx.de>
---
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);
Uwe Kleine-König
define it using __devexit.
Signed-off-by: Uwe Kleine-König <u.klein...@pengutronix.de>
Cc: James E.J. Bottomley <James.B...@suse.de>
Cc: James Bottomley <James.B...@HansenPartnership.com>
Cc: Dmitri Vorobiev <dmitri....@movial.fi>
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;
Uwe Kleine-König
use __exit_p but __devexit_p to wrap it.
Signed-off-by: Uwe Kleine-König <u.klein...@pengutronix.de>
Cc: Andrew Morton <ak...@linux-foundation.org>
Cc: Kumar Gala <ga...@kernel.crashing.org>
Cc: Anton Vorontsov <avoro...@ru.mvista.com>
Cc: Grant Likely <grant....@secretlab.ca>
Cc: linux-...@vger.kernel.org
Cc: devicetre...@lists.ozlabs.org
Cc: David Brownell <dbro...@users.sourceforge.net>
Cc: spi-deve...@lists.sourceforge.net
---
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,
Uwe Kleine-König
define it using __devexit.
Signed-off-by: Uwe Kleine-König <u.klein...@pengutronix.de>
Cc: James E.J. Bottomley <James.B...@suse.de>
Cc: linux...@vger.kernel.org
Cc: linux-...@vger.kernel.org
---
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);
Uwe Kleine-König
it using __devexit.
Signed-off-by: Uwe Kleine-König <u.klein...@pengutronix.de>
Cc: James E.J. Bottomley <James.B...@suse.de>
Cc: James Bottomley <James.B...@HansenPartnership.com>
Cc: Kyle McMartin <ky...@mcmartin.ca>
Cc: Kay Sievers <kay.s...@vrfy.org>
Cc: Helge Deller <del...@gmx.de>
Cc: linux...@vger.kernel.org
Cc: linux-...@vger.kernel.org
Cc: Greg Kroah-Hartman <gre...@suse.de>
---
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);
Uwe Kleine-König
it using __devexit.
Signed-off-by: Uwe Kleine-König <u.klein...@pengutronix.de>
Cc: Andrew Morton <ak...@linux-foundation.org>
Cc: Florian Fainelli <flo...@openwrt.org>
Cc: Eugene Konev <ej...@imfi.kspu.ru>
Cc: Julia Lawall <ju...@diku.dk>
Cc: Robert P. J. Day <rpj...@crashcourse.ca>
Cc: linux-...@vger.kernel.org
Cc: openwr...@lists.openwrt.org
---
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);
Uwe Kleine-König
define it using __devexit.
Signed-off-by: Uwe Kleine-König <u.klein...@pengutronix.de>
Cc: Greg Kroah-Hartman <gre...@suse.de>
Cc: Alan Cox <al...@linux.intel.com>
Cc: linux-...@vger.kernel.org
---
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);
Mike Frysinger
> 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
Grant Likely
> The function plat_mpc8xxx_spi_remove is defined using __devexit, so don't
> use __exit_p but __devexit_p to wrap it.
>
Obviously correct.
Acked-by: Grant Likely <grant....@secretlab.ca>
g.
--
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.
Greg Ungerer
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 <u.klein...@pengutronix.de>
> Cc: Greg Ungerer <ge...@uclinux.org>
> Cc: Len Sorensen <lsor...@csclub.uwaterloo.ca>
> Cc: Greg Kroah-Hartman <gre...@suse.de>
> Cc: Alan Cox <al...@linux.intel.com>
> Cc: linux-...@vger.kernel.org
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: ge...@snapgear.com
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
Paul Mundt
> The function ds1302_rtc_remove is defined using __devexit, so don't use
> __exit_p but __devexit_p to wrap it.
>
> Cc: Paul Mundt <let...@linux-sh.org>
> Cc: Alessandro Zummo <a.z...@towertech.it>
> Cc: linux-...@vger.kernel.org
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 <u.klein...@pengutronix.de>
> Cc: Paul Mundt <let...@linux-sh.org>
> Cc: Magnus Damm <da...@opensource.se>
> Cc: linux-...@vger.kernel.org
I've applied both of these, thanks.
Peter Korsgaard
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 <u.klein...@pengutronix.de>
Uwe> Acked-by: Sam Ravnborg <s...@ravnborg.org>
Acked-by: Peter Korsgaard <jac...@sunsite.dk>
--
Bye, Peter Korsgaard
Uwe Kleine-König
wrap it with __devexit_p.
While at it add a trailing comma to the section initializer.
Signed-off-by: Uwe Kleine-König <u.klein...@pengutronix.de>
Cc: Roland Dreier <rol...@cisco.com>
Cc: Yevgeny Petrilin <yevg...@mellanox.co.il>
Cc: Yang Hongyang <yan...@cn.fujitsu.com>
Cc: Jack Morgenstein <ja...@dev.mellanox.co.il>
Cc: Eli Cohen <e...@mellanox.co.il>
Cc: linux-...@vger.kernel.org
Cc: Andrew Morton <ak...@linux-foundation.org>
Cc: net...@vger.kernel.org
Cc: Franco Fichtner <fra...@lastsummer.de>
---
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)
Franco Fichtner
> diff --git a/drivers/net/mlx4/main.c b/drivers/net/mlx4/main.c
> --- 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)
>
f
Richard Röjfors
> The function mc33880_remove is used only wrapped by __devexit_p so define
> it using __devexit.
>
> Signed-off-by: Uwe Kleine-K�nig <u.klein...@pengutronix.de>
Acked-by: Richard R�jfors <richard...@mocean-labs.com>
Ralf Baechle
> The function iodev_remove is used only wrapped by __devexit_p so define
> it using __devexit.
Thanks, queued for 2.6.33.
Ralf
Ben Dooks
> 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 <u.klein...@pengutronix.de>
> Acked-by: Sam Ravnborg <s...@ravnborg.org>
> Cc: Russell King <li...@arm.linux.org.uk>
> Acked-By: Ben Dooks <b...@simtec.co.uk>
> Cc: Ramax Lo <ram...@gmail.com>
> Cc: Nelson Castillo <arh...@freaks-unidos.net>
> Cc: linux-...@vger.kernel.org
> Cc: Ben Dooks <ben-...@fluff.org>
> Cc: Alexey Dobriyan <adob...@gmail.com>
> Cc: Ryan Mallon <ry...@bluewatersys.com>
> Cc: linux-ar...@lists.infradead.org
> ---
> 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
> linux-ar...@lists.infradead.org
> 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.
Uwe Kleine-König
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/ |