CONFIG_HOTPLUG is going away as an option so __devexit is no
longer needed.
Signed-off-by: Bill Pemberton wf...@virginia.edu
Cc: James E.J. Bottomley james.bottom...@hansenpartnership.com
Cc: Matthew Wilcox matt...@wil.cx
Cc: Russell King li...@arm.linux.org.uk
Cc: Oliver Neukum oli...@neukum.org
Cc: Ali Akcaagac ali...@web.de
Cc: Jamie Lenehan lene...@twibble.org
Cc: Neela Syam Kolli megaraidli...@lsi.com
Cc: GOTO Masanori go...@debian.or.jp
Cc: YOKOTA Hiroshi yok...@netlab.is.tsukuba.ac.jp
Cc: Michael Reed m...@sgi.com
Cc: Kurt Garloff garl...@suse.de
Cc: Guennadi Liakhovetski g.liakhovet...@gmx.de
Cc: linux-scsi@vger.kernel.org
Cc: linux-arm-ker...@lists.infradead.org
Cc: dc3...@twibble.org
Cc: iss_storage...@hp.com
---
drivers/scsi/NCR_D700.c | 4 ++--
drivers/scsi/a100u2w.c| 2 +-
drivers/scsi/a2091.c | 2 +-
drivers/scsi/aacraid/linit.c | 2 +-
drivers/scsi/advansys.c | 6 +++---
drivers/scsi/aha1740.c| 2 +-
drivers/scsi/aic94xx/aic94xx_init.c | 2 +-
drivers/scsi/arm/acornscsi.c | 2 +-
drivers/scsi/arm/arxescsi.c | 2 +-
drivers/scsi/arm/cumana_1.c | 2 +-
drivers/scsi/arm/cumana_2.c | 2 +-
drivers/scsi/arm/eesox.c | 2 +-
drivers/scsi/arm/oak.c| 2 +-
drivers/scsi/arm/powertec.c | 2 +-
drivers/scsi/bvme6000_scsi.c | 2 +-
drivers/scsi/dc395x.c | 2 +-
drivers/scsi/dmx3191d.c | 2 +-
drivers/scsi/fnic/fnic_main.c | 2 +-
drivers/scsi/gdth.c | 2 +-
drivers/scsi/gvp11.c | 2 +-
drivers/scsi/hpsa.c | 4 ++--
drivers/scsi/ipr.c| 2 +-
drivers/scsi/ips.c| 4 ++--
drivers/scsi/isci/init.c | 2 +-
drivers/scsi/jazz_esp.c | 2 +-
drivers/scsi/lpfc/lpfc_init.c | 6 +++---
drivers/scsi/mac_esp.c| 2 +-
drivers/scsi/megaraid.c | 2 +-
drivers/scsi/megaraid/megaraid_sas_base.c | 2 +-
drivers/scsi/mpt2sas/mpt2sas_scsih.c | 2 +-
drivers/scsi/mvme16x_scsi.c | 2 +-
drivers/scsi/mvsas/mv_init.c | 2 +-
drivers/scsi/nsp32.c | 4 ++--
drivers/scsi/pm8001/pm8001_init.c | 2 +-
drivers/scsi/pmcraid.c| 2 +-
drivers/scsi/qla1280.c| 2 +-
drivers/scsi/qla4xxx/ql4_os.c | 2 +-
drivers/scsi/qlogicpti.c | 4 ++--
drivers/scsi/sim710.c | 2 +-
drivers/scsi/sun3x_esp.c | 2 +-
drivers/scsi/sun_esp.c| 2 +-
drivers/scsi/tmscsim.c| 2 +-
drivers/scsi/virtio_scsi.c| 2 +-
drivers/scsi/zorro7xx.c | 2 +-
44 files changed, 53 insertions(+), 53 deletions(-)
diff --git a/drivers/scsi/NCR_D700.c b/drivers/scsi/NCR_D700.c
index 86b3533..b39a240 100644
--- a/drivers/scsi/NCR_D700.c
+++ b/drivers/scsi/NCR_D700.c
@@ -349,7 +349,7 @@ NCR_D700_probe(struct device *dev)
return 0;
}
-static void __devexit
+static void
NCR_D700_remove_one(struct Scsi_Host *host)
{
scsi_remove_host(host);
@@ -359,7 +359,7 @@ NCR_D700_remove_one(struct Scsi_Host *host)
release_region(host-base, 64);
}
-static int __devexit
+static int
NCR_D700_remove(struct device *dev)
{
struct NCR_D700_private *p = dev_get_drvdata(dev);
diff --git a/drivers/scsi/a100u2w.c b/drivers/scsi/a100u2w.c
index 9f9193b..7624a1f 100644
--- a/drivers/scsi/a100u2w.c
+++ b/drivers/scsi/a100u2w.c
@@ -1197,7 +1197,7 @@ out:
return error;
}
-static void __devexit inia100_remove_one(struct pci_dev *pdev)
+static void inia100_remove_one(struct pci_dev *pdev)
{
struct Scsi_Host *shost = pci_get_drvdata(pdev);
struct orc_host *host = (struct orc_host *)shost-hostdata;
diff --git a/drivers/scsi/a2091.c b/drivers/scsi/a2091.c
index 7c6e9aa..3ec409e 100644
--- a/drivers/scsi/a2091.c
+++ b/drivers/scsi/a2091.c
@@ -239,7 +239,7 @@ fail_alloc:
return error;
}
-static void __devexit a2091_remove(struct zorro_dev *z)
+static void a2091_remove(struct zorro_dev *z)
{
struct Scsi_Host *instance = zorro_get_drvdata(z);
struct a2091_hostdata *hdata = shost_priv(instance);
diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c
index ac8fcfa..5394b98 100644
--- a/drivers/scsi/aacraid/linit.c
+++ b/drivers/scsi/aacraid/linit.c
@@ -1308,7 +1308,7 @@ static void aac_shutdown(struct pci_dev *dev)
__aac_shutdown((struct aac_dev *)shost-hostdata);
}
-static void __devexit aac_remove_one(struct pci_dev *pdev)
+static void aac_remove_one(struct pci_dev *pdev)
{
struct Scsi_Host *shost = pci_get_drvdata(pdev);
struct aac_dev *aac = (struct
