Re: [PATCH v2 04/18] scsi: rename and move get_scsi_ml_byte()

[Hannes Reinecke <hare@suse.de>]

On 1/12/23 15:03, Niklas Cassel wrote:
> SCSI has two different getters:
> - get_XXX_byte() (in scsi_cmnd.h) which takes a struct scsi_cmnd *, and
> - XXX_byte() (in scsi.h) which takes a scmd->result.
> The proper name for get_scsi_ml_byte() should thus be without the get_
> prefix, as it takes a scmd->result. Rename the function to rectify this.
> 
> Additionally, move get_scsi_ml_byte() to scsi_priv.h since both scsi_lib.c
> and scsi_error.c will need to use this helper in a follow-up patch.
> 
> Signed-off-by: Niklas Cassel <niklas.cassel@wdc.com>
> ---
>   drivers/scsi/scsi_lib.c  | 7 +------
>   drivers/scsi/scsi_priv.h | 5 +++++
>   2 files changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
> index 9ed1ebcb7443..6630a36b873e 100644
> --- a/drivers/scsi/scsi_lib.c
> +++ b/drivers/scsi/scsi_lib.c
> @@ -579,11 +579,6 @@ static bool scsi_end_request(struct request *req, blk_status_t error,
>   	return false;
>   }
>   
> -static inline u8 get_scsi_ml_byte(int result)
> -{
> -	return (result >> 8) & 0xff;
> -}
> -
>   /**
>    * scsi_result_to_blk_status - translate a SCSI result code into blk_status_t
>    * @result:	scsi error code
> @@ -596,7 +591,7 @@ static blk_status_t scsi_result_to_blk_status(int result)
>   	 * Check the scsi-ml byte first in case we converted a host or status
>   	 * byte.
>   	 */
> -	switch (get_scsi_ml_byte(result)) {
> +	switch (scsi_ml_byte(result)) {
>   	case SCSIML_STAT_OK:
>   		break;
>   	case SCSIML_STAT_RESV_CONFLICT:
> diff --git a/drivers/scsi/scsi_priv.h b/drivers/scsi/scsi_priv.h
> index 96284a0e13fe..74324fba4281 100644
> --- a/drivers/scsi/scsi_priv.h
> +++ b/drivers/scsi/scsi_priv.h
> @@ -29,6 +29,11 @@ enum scsi_ml_status {
>   	SCSIML_STAT_TGT_FAILURE		= 0x04,	/* Permanent target failure */
>   };
>   
> +static inline u8 scsi_ml_byte(int result)
> +{
> +	return (result >> 8) & 0xff;
> +}
> +
>   /*
>    * Scsi Error Handler Flags
>    */

Naming is hard :-)

Reviewed-by: Hannes Reinecke <hare@suse.de>

Cheers,

Hannes
-- 
Dr. Hannes Reinecke                Kernel Storage Architect
hare@suse.de                              +49 911 74053 688
SUSE Software Solutions GmbH, Maxfeldstr. 5, 90409 Nürnberg
HRB 36809 (AG Nürnberg), Geschäftsführer: Ivo Totev, Andrew
Myers, Andrew McDonald, Martje Boudien Moerman