[scsi hcil 4/9] s/scsi_scan_target/spi_scan_target/

Jeff Garzik
2005-10-24T22:02:35Z

commit 54815084f6ca2f40ca474c906fbd17aef2b040d4
Author: Jeff Garzik <jgarzik@pobox.com>
Date: Mon Oct 24 15:13:54 2005 -0400

[SCSI] s/scsi_scan_target/spi_scan_target/

There are very few scsi_scan_target() users, arguably internal users,
and given their young history we can afford to go ahead and change the
API a bit. This just renames a symbol; no other changes.

The new scsi_scan_target(), when it comes back, will have different
number of args, and differing arg types, which should make the changes
obvious even to non-upstream users.

drivers/scsi/scsi_scan.c | 14 +++++++-------
drivers/scsi/scsi_transport_fc.c | 2 +-
drivers/scsi/scsi_transport_sas.c | 2 +-
include/scsi/scsi_device.h | 4 ++--
4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c
index cff0a70..0cbcbe7 100644
--- a/drivers/scsi/scsi_scan.c
+++ b/drivers/scsi/scsi_scan.c
@@ -1306,7 +1306,7 @@ void scsi_rescan_device(struct device *d
}
EXPORT_SYMBOL(scsi_rescan_device);

-static void __scsi_scan_target(struct device *parent, unsigned int channel,
+static void __spi_scan_target(struct device *parent, unsigned int channel,
unsigned int id, unsigned int lun, int rescan)
{
struct Scsi_Host *shost = dev_to_shost(parent);
@@ -1357,7 +1357,7 @@ static void __scsi_scan_target(struct de
}

/**
- * scsi_scan_target - scan a target id, possibly including all LUNs on the
+ * spi_scan_target - scan a target id, possibly including all LUNs on the
* target.
* @parent: host to scan
* @channel: channel to scan
@@ -1372,17 +1372,17 @@ static void __scsi_scan_target(struct de
* First try a REPORT LUN scan, if that does not scan the target, do a
* sequential scan of LUNs on the target id.
**/
-void scsi_scan_target(struct device *parent, unsigned int channel,
+void spi_scan_target(struct device *parent, unsigned int channel,
unsigned int id, unsigned int lun, int rescan)
{
struct Scsi_Host *shost = dev_to_shost(parent);

down(&shost->scan_mutex);
if (scsi_host_scan_allowed(shost))
- __scsi_scan_target(parent, channel, id, lun, rescan);
+ __spi_scan_target(parent, channel, id, lun, rescan);
up(&shost->scan_mutex);
}
-EXPORT_SYMBOL(scsi_scan_target);
+EXPORT_SYMBOL(spi_scan_target);

static void scsi_scan_channel(struct Scsi_Host *shost, unsigned int channel,
unsigned int id, unsigned int lun, int rescan)
@@ -1407,11 +1407,11 @@ static void scsi_scan_channel(struct Scs
order_id = shost->max_id - id - 1;
else
order_id = id;
- __scsi_scan_target(&shost->shost_gendev, channel,
+ __spi_scan_target(&shost->shost_gendev, channel,
order_id, lun, rescan);
}
else
- __scsi_scan_target(&shost->shost_gendev, channel,
+ __spi_scan_target(&shost->shost_gendev, channel,
id, lun, rescan);
}

diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c
index 771e97e..57db6d1 100644
--- a/drivers/scsi/scsi_transport_fc.c
+++ b/drivers/scsi/scsi_transport_fc.c
@@ -1680,7 +1680,7 @@ fc_scsi_scan_rport(void *data)
{
struct fc_rport *rport = (struct fc_rport *)data;

- scsi_scan_target(&rport->dev, rport->channel, rport->scsi_target_id,
+ spi_scan_target(&rport->dev, rport->channel, rport->scsi_target_id,
SCAN_WILD_CARD, 1);
}

diff --git a/drivers/scsi/scsi_transport_sas.c b/drivers/scsi/scsi_transport_sas.c
index 1d145d2..f6c1a96 100644
--- a/drivers/scsi/scsi_transport_sas.c
+++ b/drivers/scsi/scsi_transport_sas.c
@@ -578,7 +578,7 @@ int sas_rphy_add(struct sas_rphy *rphy)
spin_unlock(&sas_host->lock);

if (rphy->scsi_target_id != -1) {
- scsi_scan_target(&rphy->dev, parent->number,
+ spi_scan_target(&rphy->dev, parent->number,
rphy->scsi_target_id, ~0, 0);
}

diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h
index 233b053..14d89eb 100644
--- a/include/scsi/scsi_device.h
+++ b/include/scsi/scsi_device.h
@@ -246,8 +246,8 @@ extern int scsi_device_quiesce(struct sc
extern void scsi_device_resume(struct scsi_device *sdev);
extern void scsi_target_quiesce(struct scsi_target *);
extern void scsi_target_resume(struct scsi_target *);
-extern void scsi_scan_target(struct device *parent, unsigned int channel,
- unsigned int id, unsigned int lun, int rescan);
+extern void spi_scan_target(struct device *parent, unsigned int channel,
+ unsigned int id, unsigned int lun, int rescan);
extern void scsi_target_reap(struct scsi_target *);
extern void scsi_target_block(struct device *);
extern void scsi_target_unblock(struct device *);