On 9/30/24 2:18 PM, Bart Van Assche wrote:
There is agreement that the word "slave" should not be used in Linux
kernel source code. Hence this patch that converts all SCSI drivers from
.slave_configure() to .device_configure(). No functionality has been
changed.
Cc: Damien Le Moal <dlemoal@xxxxxxxxxx>
Signed-off-by: Bart Van Assche <bvanassche@xxxxxxx>
---
drivers/infiniband/ulp/srp/ib_srp.c | 5 +++--
drivers/message/fusion/mptfc.c | 2 +-
drivers/message/fusion/mptsas.c | 6 +++---
drivers/message/fusion/mptscsih.c | 4 ++--
drivers/message/fusion/mptscsih.h | 3 ++-
drivers/message/fusion/mptspi.c | 7 ++++---
drivers/net/ethernet/allwinner/sun4i-emac.c | 4 ++--
drivers/s390/scsi/zfcp_scsi.c | 5 +++--
drivers/scsi/3w-9xxx.c | 7 ++++---
drivers/scsi/3w-sas.c | 7 ++++---
drivers/scsi/3w-xxxx.c | 9 ++++----
drivers/scsi/53c700.c | 7 ++++---
drivers/scsi/BusLogic.c | 7 ++++---
drivers/scsi/BusLogic.h | 3 ++-
drivers/scsi/aacraid/linit.c | 8 ++++---
drivers/scsi/advansys.c | 23 +++++++++++----------
drivers/scsi/aic7xxx/aic79xx_osm.c | 4 ++--
drivers/scsi/aic7xxx/aic7xxx_osm.c | 4 ++--
drivers/scsi/arcmsr/arcmsr_hba.c | 8 ++++---
drivers/scsi/bfa/bfad_im.c | 6 +++---
drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 5 +++--
drivers/scsi/csiostor/csio_scsi.c | 6 +++---
drivers/scsi/esp_scsi.c | 7 ++++---
drivers/scsi/hpsa.c | 8 ++++---
drivers/scsi/ibmvscsi/ibmvfc.c | 7 ++++---
drivers/scsi/ibmvscsi/ibmvscsi.c | 8 ++++---
drivers/scsi/ips.c | 6 +++---
drivers/scsi/ips.h | 3 ++-
drivers/scsi/lpfc/lpfc_scsi.c | 21 ++++++++++++-------
drivers/scsi/mvumi.c | 5 +++--
drivers/scsi/myrb.c | 5 +++--
drivers/scsi/myrs.c | 5 +++--
drivers/scsi/ncr53c8xx.c | 5 +++--
drivers/scsi/ps3rom.c | 5 +++--
drivers/scsi/qedf/qedf_main.c | 5 +++--
drivers/scsi/qla1280.c | 6 +++---
drivers/scsi/qla2xxx/qla_os.c | 4 ++--
drivers/scsi/qlogicpti.c | 5 +++--
drivers/scsi/scsi_debug.c | 7 ++++---
drivers/scsi/scsi_scan.c | 2 +-
drivers/scsi/smartpqi/smartpqi_init.c | 5 +++--
drivers/scsi/snic/snic_main.c | 6 +++---
drivers/scsi/stex.c | 4 ++--
drivers/scsi/storvsc_drv.c | 5 +++--
drivers/scsi/sym53c8xx_2/sym_glue.c | 5 +++--
drivers/scsi/xen-scsifront.c | 7 ++++---
drivers/staging/rts5208/rtsx.c | 4 ++--
47 files changed, 166 insertions(+), 124 deletions(-)
...... snipped.........
diff --git a/drivers/scsi/BusLogic.c b/drivers/scsi/BusLogic.c
index 2135a2b3e2d0..88839c81db97 100644
--- a/drivers/scsi/BusLogic.c
+++ b/drivers/scsi/BusLogic.c
@@ -2153,14 +2153,15 @@ static void __init blogic_inithoststruct(struct blogic_adapter *adapter,
}
/*
- blogic_slaveconfig will actually set the queue depth on individual
+ blogic_device_configure will actually set the queue depth on individual
scsi devices as they are permanently added to the device chain. We
shamelessly rip off the SelectQueueDepths code to make this work mostly
like it used to. Since we don't get called once at the end of the scan
but instead get called for each device, we have to do things a bit
differently.
*/
-static int blogic_slaveconfig(struct scsi_device *dev)
+static int blogic_device_configure(struct scsi_device *dev,
+ struct queue_limits *lim)
{
struct blogic_adapter *adapter =
(struct blogic_adapter *) dev->host->hostdata;
@@ -3672,7 +3673,7 @@ static const struct scsi_host_template blogic_template = {
.name = "BusLogic",
.info = blogic_drvr_info,
.queuecommand = blogic_qcmd,
- .slave_configure = blogic_slaveconfig,
+ .device_configure = blogic_device_configure,
.bios_param = blogic_diskparam,
.eh_host_reset_handler = blogic_hostreset,
#if 0
diff --git a/drivers/scsi/BusLogic.h b/drivers/scsi/BusLogic.h
index 7d1ec10f2430..1eb61e886ee3 100644
--- a/drivers/scsi/BusLogic.h
+++ b/drivers/scsi/BusLogic.h
@@ -1274,7 +1274,8 @@ static inline void blogic_incszbucket(unsigned int *cmdsz_buckets,
static const char *blogic_drvr_info(struct Scsi_Host *);
static int blogic_qcmd(struct Scsi_Host *h, struct scsi_cmnd *);
static int blogic_diskparam(struct scsi_device *, struct block_device *, sector_t, int *);
-static int blogic_slaveconfig(struct scsi_device *);
+static int blogic_device_configure(struct scsi_device *,
+ struct queue_limits *lim);
static void blogic_qcompleted_ccb(struct blogic_ccb *);
static irqreturn_t blogic_inthandler(int, void *);
static int blogic_resetadapter(struct blogic_adapter *, bool hard_reset);
Looks fine for BusLogic driver.
Acked-by: Khalid Aziz <khalid@xxxxxxxxxxxxxx>
