scsi: core: Remove the .slave_configure() method

Now that all SCSI drivers have been converted from .slave_configure() to
.sdev_configure(), remove support for .slave_configure() from the SCSI
core.

Reviewed-by: Damien Le Moal <dlemoal@kernel.org>
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Link: https://lore.kernel.org/r/20241022180839.2712439-5-bvanassche@acm.org
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c
index faf3dd72e21ebfc14f2d22582e46dbafae5e1c2d..e770480fec5ca3c923edff97e715d7872d6f0271 100644 (file)
--- 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->sdev_configure)
                ret = hostt->sdev_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->sdev_configure || hostt->slave_configure)
+       if (hostt->sdev_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 7e1b1a54e46ada106aacf41821255c8923a6175a..8fccfd27393e61b90210fd293faa9aeb9dbb223a 100644 (file)
--- 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 sdev_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 sdev_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 sdev_destroy().  This is
-        * assuming you implement slave_configure and sdev_destroy.
+        * assuming you implement sdev_configure and sdev_destroy.
         * However, if you allocate memory and hang it off the device struct,
         * then you must implement the sdev_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 sdev_configure for
-        * all new code.  A driver must never define both.
         */
        int (* sdev_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 sdev_init or slave_configure calls. 
+        * it allocated in the sdev_init or sdev_configure calls.
         *
         * Status: OPTIONAL
         */