> On Feb 11, 2022, at 2:32 PM, Bart Van Assche <bvanassche@xxxxxxx> wrote:
>
> Introduce the NCR5380_cmd_priv() function. This function will allow to
> access the SCSI pointer in the next patch with a single statement instead of
> two, e.g. as follows:
>
> struct scsi_pointer *scsi_pointer =
> &NCR5380_cmd_priv(cmd)->scsi_pointer;
>
> Cc: Finn Thain <fthain@xxxxxxxxxxxxxxxxxxx>
> Cc: Hannes Reinecke <hare@xxxxxxxx>
> Cc: Johannes Thumshirn <johannes.thumshirn@xxxxxxx>
> Cc: Himanshu Madhani <himanshu.madhani@xxxxxxxxxx>
> Signed-off-by: Bart Van Assche <bvanassche@xxxxxxx>
> ---
> drivers/scsi/NCR5380.c | 8 ++++----
> drivers/scsi/NCR5380.h | 5 +++++
> 2 files changed, 9 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/scsi/NCR5380.c b/drivers/scsi/NCR5380.c
> index 55af3e245a92..6fa5e363945a 100644
> --- a/drivers/scsi/NCR5380.c
> +++ b/drivers/scsi/NCR5380.c
> @@ -564,7 +564,7 @@ static int NCR5380_queue_command(struct Scsi_Host *instance,
> struct scsi_cmnd *cmd)
> {
> struct NCR5380_hostdata *hostdata = shost_priv(instance);
> - struct NCR5380_cmd *ncmd = scsi_cmd_priv(cmd);
> + struct NCR5380_cmd *ncmd = NCR5380_cmd_priv(cmd);
> unsigned long flags;
>
> #if (NDEBUG & NDEBUG_NO_WRITE)
> @@ -672,7 +672,7 @@ static struct scsi_cmnd *dequeue_next_cmd(struct Scsi_Host *instance)
> static void requeue_cmd(struct Scsi_Host *instance, struct scsi_cmnd *cmd)
> {
> struct NCR5380_hostdata *hostdata = shost_priv(instance);
> - struct NCR5380_cmd *ncmd = scsi_cmd_priv(cmd);
> + struct NCR5380_cmd *ncmd = NCR5380_cmd_priv(cmd);
>
> if (hostdata->sensing == cmd) {
> scsi_eh_restore_cmnd(cmd, &hostdata->ses);
> @@ -1690,7 +1690,7 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance)
> #endif
>
> while ((cmd = hostdata->connected)) {
> - struct NCR5380_cmd *ncmd = scsi_cmd_priv(cmd);
> + struct NCR5380_cmd *ncmd = NCR5380_cmd_priv(cmd);
>
> tmp = NCR5380_read(STATUS_REG);
> /* We only have a valid SCSI phase when REQ is asserted */
> @@ -2206,7 +2206,7 @@ static bool list_del_cmd(struct list_head *haystack,
> struct scsi_cmnd *needle)
> {
> if (list_find_cmd(haystack, needle)) {
> - struct NCR5380_cmd *ncmd = scsi_cmd_priv(needle);
> + struct NCR5380_cmd *ncmd = NCR5380_cmd_priv(needle);
>
> list_del(&ncmd->list);
> return true;
> diff --git a/drivers/scsi/NCR5380.h b/drivers/scsi/NCR5380.h
> index 845bd2423e66..88a1bb41b72e 100644
> --- a/drivers/scsi/NCR5380.h
> +++ b/drivers/scsi/NCR5380.h
> @@ -230,6 +230,11 @@ struct NCR5380_cmd {
> struct list_head list;
> };
>
> +static inline struct NCR5380_cmd *NCR5380_cmd_priv(struct scsi_cmnd *cmd)
> +{
> + return scsi_cmd_priv(cmd);
> +}
> +
> #define NCR5380_PIO_CHUNK_SIZE 256
>
> /* Time limit (ms) to poll registers when IRQs are disabled, e.g. during PDMA */
Reviewed-by: Himanshu Madhani <himanshu.madhani@xxxxxxxxxx>
--
Himanshu Madhani Oracle Linux Engineering
