Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2024-12-28 16:52:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

scsi: core: Remove the .slave_configure() method

Browse Source 
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>
This commit is contained in:
Bart Van Assche 2024-10-22 11:07:56 -07:00 committed by Martin K. Petersen
parent 49515b7fe5
commit 0f98212d96
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/scsi/scsi_scan.c
View File

@ -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)

10
include/scsi/scsi_host.h
View File

@ -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
*/