Now that all SCSI drivers have been converted from .slave_configure() to
.device_configure(), remove support for .slave_configure() from the SCSI
core. Change all references to .slave_configure() in the SCSI documentation
into references to .device_configure().
Cc: Damien Le Moal <dlemoal@xxxxxxxxxx>
Signed-off-by: Bart Van Assche <bvanassche@xxxxxxx>
---
drivers/scsi/scsi_scan.c | 4 +---
include/scsi/scsi_host.h | 10 +++-------
2 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c
index 05ea1e781d21..bb4ebb744b69 100644
--- a/drivers/scsi/scsi_scan.c
+++ b/drivers/scsi/scsi_scan.c
@@ -1076,8 +1076,6 @@ static int scsi_add_lun(struct scsi_device *sdev, unsigned char *inq_result,
if (hostt->device_configure)
ret = hostt->device_configure(sdev, &lim);
- else if (hostt->slave_configure)
- ret = hostt->slave_configure(sdev);
if (ret) {
queue_limits_cancel_update(sdev->request_queue);
/*
@@ -1102,7 +1100,7 @@ static int scsi_add_lun(struct scsi_device *sdev, unsigned char *inq_result,
* Set up budget map again since memory consumption of the map depends
* on actual queue depth.
*/
- if (hostt->device_configure || hostt->slave_configure)
+ if (hostt->device_configure)
scsi_realloc_sdev_budget_map(sdev, sdev->queue_depth);
if (sdev->scsi_level >= SCSI_3)
diff --git a/include/scsi/scsi_host.h b/include/scsi/scsi_host.h
index 934aae4254c3..28df2bd7af46 100644
--- a/include/scsi/scsi_host.h
+++ b/include/scsi/scsi_host.h
@@ -169,11 +169,11 @@ struct scsi_host_template {
*
* Deallocation: If we didn't find any devices at this ID, you will
* get an immediate call to device_destroy(). If we find something
- * here then you will get a call to slave_configure(), then the
+ * here then you will get a call to device_configure(), then the
* device will be used for however long it is kept around, then when
* the device is removed from the system (or * possibly at reboot
* time), you will then get a call to device_destroy(). This is
- * assuming you implement slave_configure and device_destroy.
+ * assuming you implement device_configure and device_destroy.
* However, if you allocate memory and hang it off the device struct,
* then you must implement the device_destroy() routine at a minimum
* in order to avoid leaking memory
@@ -211,19 +211,15 @@ struct scsi_host_template {
* up after yourself before returning non-0
*
* Status: OPTIONAL
- *
- * Note: slave_configure is the legacy version, use device_configure for
- * all new code. A driver must never define both.
*/
int (* device_configure)(struct scsi_device *, struct queue_limits *lim);
- int (* slave_configure)(struct scsi_device *);
/*
* Immediately prior to deallocating the device and after all activity
* has ceased the mid layer calls this point so that the low level
* driver may completely detach itself from the scsi device and vice
* versa. The low level driver is responsible for freeing any memory
- * it allocated in the device_alloc or slave_configure calls.
+ * it allocated in the device_alloc or device_configure calls.
*
* Status: OPTIONAL
*/
