summaryrefslogtreecommitdiff
path: root/include/scsi
diff options
context:
space:
mode:
authorBart Van Assche <bvanassche@acm.org>2024-10-22 21:07:56 +0300
committerMartin K. Petersen <martin.petersen@oracle.com>2024-12-04 23:34:28 +0300
commit0f98212d96a2af52e4091a199ef1d35d478d0c60 (patch)
treea1264a88f9c73d9e4a99cd485d796abdde92eda6 /include/scsi
parent49515b7fe50ce4348b3dd5116b6d7d4308546da6 (diff)
downloadlinux-0f98212d96a2af52e4091a199ef1d35d478d0c60.tar.xz
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>
Diffstat (limited to 'include/scsi')
-rw-r--r--include/scsi/scsi_host.h10
1 files changed, 3 insertions, 7 deletions
diff --git a/include/scsi/scsi_host.h b/include/scsi/scsi_host.h
index 7e1b1a54e46a..8fccfd27393e 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 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
*/