>From a2d6ea3b183edc7a71f33e66fce63088c0f3e8a1 Mon Sep 17 00:00:00 2001 From: Hannes Reinecke Date: Mon, 25 Feb 2008 04:17:51 +0100 Subject: [PATCH] Rename __scsi_remove_device() into scsi_sysfs_remove_sdev() __scsi_remove_device() is actually the counterpart to scsi_sysfs_add_sdev(). So we'd better rename it to avoid confusion. Signed-off-by: Hannes Reinecke --- drivers/scsi/scsi_priv.h | 2 +- drivers/scsi/scsi_scan.c | 4 ++-- drivers/scsi/scsi_sysfs.c | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/scsi/scsi_priv.h b/drivers/scsi/scsi_priv.h index b33e725..4ff548c 100644 --- a/drivers/scsi/scsi_priv.h +++ b/drivers/scsi/scsi_priv.h @@ -112,13 +112,13 @@ extern void scsi_exit_sysctl(void); /* scsi_sysfs.c */ extern int scsi_sysfs_add_sdev(struct scsi_device *); +extern void scsi_sysfs_remove_sdev(struct scsi_device *); extern int scsi_sysfs_add_host(struct Scsi_Host *); extern int scsi_sysfs_register(void); extern void scsi_sysfs_unregister(void); extern void scsi_sysfs_device_initialize(struct scsi_device *); extern int scsi_sysfs_target_initialize(struct scsi_device *); extern struct scsi_transport_template blank_transport_template; -extern void __scsi_remove_device(struct scsi_device *); extern struct bus_type scsi_bus_type; extern struct attribute_group *scsi_sysfs_shost_attr_groups[]; diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c index aa632f9..971ac9e 100644 --- a/drivers/scsi/scsi_scan.c +++ b/drivers/scsi/scsi_scan.c @@ -1131,7 +1131,7 @@ static int scsi_probe_and_add_lun(struct scsi_target *starget, if (scsi_device_get(sdev) == 0) { *sdevp = sdev; } else { - __scsi_remove_device(sdev); + scsi_sysfs_remove_sdev(sdev); res = SCSI_SCAN_NO_RESPONSE; } } @@ -1881,7 +1881,7 @@ void scsi_forget_host(struct Scsi_Host *shost) if (sdev->sdev_state == SDEV_DEL) continue; spin_unlock_irqrestore(shost->host_lock, flags); - __scsi_remove_device(sdev); + scsi_sysfs_remove_sdev(sdev); goto restart; } spin_unlock_irqrestore(shost->host_lock, flags); diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c index 3ec76dd..0f33b99 100644 --- a/drivers/scsi/scsi_sysfs.c +++ b/drivers/scsi/scsi_sysfs.c @@ -851,7 +851,7 @@ int scsi_sysfs_add_sdev(struct scsi_device *sdev) else error = device_create_file(&sdev->sdev_gendev, &dev_attr_queue_depth); if (error) { - __scsi_remove_device(sdev); + scsi_sysfs_remove_sdev(sdev); goto out; } if (sdev->host->hostt->change_queue_type) @@ -859,7 +859,7 @@ int scsi_sysfs_add_sdev(struct scsi_device *sdev) else error = device_create_file(&sdev->sdev_gendev, &dev_attr_queue_type); if (error) { - __scsi_remove_device(sdev); + scsi_sysfs_remove_sdev(sdev); goto out; } @@ -879,7 +879,7 @@ int scsi_sysfs_add_sdev(struct scsi_device *sdev) error = device_create_file(&sdev->sdev_gendev, sdev->host->hostt->sdev_attrs[i]); if (error) { - __scsi_remove_device(sdev); + scsi_sysfs_remove_sdev(sdev); goto out; } } @@ -899,7 +899,7 @@ int scsi_sysfs_add_sdev(struct scsi_device *sdev) return error; } -void __scsi_remove_device(struct scsi_device *sdev) +void scsi_sysfs_remove_sdev(struct scsi_device *sdev) { struct device *dev = &sdev->sdev_gendev; @@ -926,7 +926,7 @@ void scsi_remove_device(struct scsi_device *sdev) struct Scsi_Host *shost = sdev->host; mutex_lock(&shost->scan_mutex); - __scsi_remove_device(sdev); + scsi_sysfs_remove_sdev(sdev); mutex_unlock(&shost->scan_mutex); } EXPORT_SYMBOL(scsi_remove_device); -- 1.5.3.2