Re: [PATCH v4 06/54] scsi: NCR5380: Prepare for enabling lock context analysis

[Finn Thain <fthain@linux-m68k.org>]

On Fri, 25 Sep 2026, Bart Van Assche wrote:

> Pass the struct NCR5380_hostdata pointer directly to NCR5380_select()
> and NCR5380_information_transfer() instead of the struct Scsi_Host
> pointer. This ensures that the lock context annotations
> (__releases(&hostdata->lock) and __acquires(&hostdata->lock)) refer to
> a function argument. Update callers and function prototypes accordingly.
> 
> Cc: Finn Thain <fthain@linux-m68k.org>
> Cc: Michael Schmitz <schmitzmic@gmail.com>
> Signed-off-by: Bart Van Assche <bvanassche@acm.org>
> ---
>  drivers/scsi/NCR5380.c | 19 ++++++++++---------
>  drivers/scsi/NCR5380.h |  5 +++--
>  2 files changed, 13 insertions(+), 11 deletions(-)
> 
> diff --git a/drivers/scsi/NCR5380.c b/drivers/scsi/NCR5380.c
> index 006dcf981218..6afbd5936892 100644
> --- a/drivers/scsi/NCR5380.c
> +++ b/drivers/scsi/NCR5380.c
> @@ -718,7 +718,7 @@ static void NCR5380_main(struct work_struct *work)
>  			 * entire unit.
>  			 */
>  
> -			if (!NCR5380_select(instance, cmd)) {
> +			if (!NCR5380_select(hostdata, cmd)) {
>  				dsprintk(NDEBUG_MAIN, instance, "main: select complete\n");
>  			} else {
>  				dsprintk(NDEBUG_MAIN | NDEBUG_QUEUES, instance,
> @@ -728,7 +728,7 @@ static void NCR5380_main(struct work_struct *work)
>  		}
>  		if (hostdata->connected && !hostdata->dma_len) {
>  			dsprintk(NDEBUG_MAIN, instance, "main: performing information transfer\n");
> -			NCR5380_information_transfer(instance);
> +			NCR5380_information_transfer(hostdata);
>  			done = 0;
>  		}
>  		if (!hostdata->connected) {
> @@ -937,7 +937,7 @@ static irqreturn_t __maybe_unused NCR5380_intr(int irq, void *dev_id)
>  
>  /**
>   * NCR5380_select - attempt arbitration and selection for a given command
> - * @instance: the Scsi_Host instance
> + * @hostdata: host private data
>   * @cmd: the scsi_cmnd to execute
>   *
>   * This routine establishes an I_T_L nexus for a SCSI command. This involves
> @@ -960,10 +960,11 @@ static irqreturn_t __maybe_unused NCR5380_intr(int irq, void *dev_id)
>   * cmd->result host byte set to DID_BAD_TARGET.
>   */
>  
> -static bool NCR5380_select(struct Scsi_Host *instance, struct scsi_cmnd *cmd)
> +static bool NCR5380_select(struct NCR5380_hostdata *hostdata,
> +			   struct scsi_cmnd *cmd)
>  	__releases(&hostdata->lock) __acquires(&hostdata->lock)
>  {
> -	struct NCR5380_hostdata *hostdata = shost_priv(instance);
> +	struct Scsi_Host *instance = hostdata->host;
>  	unsigned char tmp[3], phase;
>  	unsigned char *data;
>  	int len;
> @@ -1643,23 +1644,23 @@ static int NCR5380_transfer_dma(struct Scsi_Host *instance,
>  }
>  
>  /*
> - * Function : NCR5380_information_transfer (struct Scsi_Host *instance)
> + * Function : NCR5380_information_transfer(struct NCR5380_hostdata *hostdata)
>   *
>   * Purpose : run through the various SCSI phases and do as the target
>   * directs us to.  Operates on the currently connected command,
>   * instance->connected.
>   *
> - * Inputs : instance, instance for which we are doing commands
> + * Inputs : hostdata, the private host data
>   *
>   * Side effects : SCSI things happen, the disconnected queue will be
>   * modified if a command disconnects, *instance->connected will
>   * change.
>   */
>  

Acked-by: Finn Thain <fthain@linux-m68k.org>

Would you please update that to kerneldoc format? Something like this:

/**
 * NCR5380_information_transfer - respond to information transfer phases
 * @hostdata: private host data
 *
 * Run through various bus phases as directed by the target.
 * Operates on the currently connected command until it's either completed
 * or moved to the disconnected queue.
 */