Subject: Re: [PATCH v2 3/7] ibmvscsi: Replace magic values in set_adpater_info() with defines

From: Manoj Kumar <[email-masked]>
Date: Fri, 12 Feb 2016 16:06:04 -0600

Reviewed-by: Manoj Kumar <[email-masked]>

---
Manoj Kumar

On 2/10/2016 7:32 PM, Tyrel Datwyler wrote:
> Add defines for mad version and mad os_type, and replace the magic
> numbers in set_adapter_info() accordingly.
>
> Signed-off-by: Tyrel Datwyler <[email-masked]>
> ---
>   drivers/scsi/ibmvscsi/ibmvscsi.c | 8 ++++----
>   drivers/scsi/ibmvscsi/viosrp.h   | 3 +++
>   2 files changed, 7 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/scsi/ibmvscsi/ibmvscsi.c b/drivers/scsi/ibmvscsi/ibmvscsi.c
> index c888ea1..4b09a9b 100644
> --- a/drivers/scsi/ibmvscsi/ibmvscsi.c
> +++ b/drivers/scsi/ibmvscsi/ibmvscsi.c
> @@ -283,8 +283,8 @@ static void set_adapter_info(struct ibmvscsi_host_data *hostdata)
>   	hostdata->madapter_info.partition_number =
>   					cpu_to_be32(partition_number);
>
> -	hostdata->madapter_info.mad_version = cpu_to_be32(1);
> -	hostdata->madapter_info.os_type = cpu_to_be32(2);
> +	hostdata->madapter_info.mad_version = cpu_to_be32(SRP_MAD_VERSION_1);
> +	hostdata->madapter_info.os_type = cpu_to_be32(SRP_MAD_OS_LINUX);
>   }
>
>   /**
> @@ -1398,7 +1398,7 @@ static void adapter_info_rsp(struct srp_event_struct *evt_struct)
>   			hostdata->host->max_sectors =
>   				be32_to_cpu(hostdata->madapter_info.port_max_txu[0]) >> 9;
>   		
> -		if (be32_to_cpu(hostdata->madapter_info.os_type) == 3 &&
> +		if (be32_to_cpu(hostdata->madapter_info.os_type) == SRP_MAD_OS_AIX &&
>   		    strcmp(hostdata->madapter_info.srp_version, "1.6a") <= 0) {
>   			dev_err(hostdata->dev, "host (Ver. %s) doesn't support large transfers\n",
>   				hostdata->madapter_info.srp_version);
> @@ -1407,7 +1407,7 @@ static void adapter_info_rsp(struct srp_event_struct *evt_struct)
>   			hostdata->host->sg_tablesize = MAX_INDIRECT_BUFS;
>   		}
>
> -		if (be32_to_cpu(hostdata->madapter_info.os_type) == 3) {
> +		if (be32_to_cpu(hostdata->madapter_info.os_type) == SRP_MAD_OS_AIX) {
>   			enable_fast_fail(hostdata);
>   			return;
>   		}
> diff --git a/drivers/scsi/ibmvscsi/viosrp.h b/drivers/scsi/ibmvscsi/viosrp.h
> index 3d20851..d0f689b 100644
> --- a/drivers/scsi/ibmvscsi/viosrp.h
> +++ b/drivers/scsi/ibmvscsi/viosrp.h
> @@ -221,7 +221,10 @@ struct mad_adapter_info_data {
>   	char srp_version[8];
>   	char partition_name[96];
>   	__be32 partition_number;
> +#define SRP_MAD_VERSION_1 1
>   	__be32 mad_version;
> +#define SRP_MAD_OS_LINUX 2
> +#define SRP_MAD_OS_AIX 3
>   	__be32 os_type;
>   	__be32 port_max_txu[8];	/* per-port maximum transfer */
>   };
>