[PATCH] scsi: bnx2i: bnx2i_hwi: use swap macro in bnx2i_send_iscsi_nopout

[PATCH] scsi: bnx2i: bnx2i_hwi: use swap macro in bnx2i_send_iscsi_nopout

[Gustavo A. R. Silva]

Make use of the swap macro and remove unnecessary variable tmp.
This makes the code easier to read and maintain.

This code was detected with the help of Coccinelle.

Signed-off-by: Gustavo A. R. Silva <garsilva@embeddedor.com>
---
 drivers/scsi/bnx2i/bnx2i_hwi.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/drivers/scsi/bnx2i/bnx2i_hwi.c b/drivers/scsi/bnx2i/bnx2i_hwi.c
index e0640e0..9e3bf53 100644
--- a/drivers/scsi/bnx2i/bnx2i_hwi.c
+++ b/drivers/scsi/bnx2i/bnx2i_hwi.c
@@ -547,12 +547,9 @@ int bnx2i_send_iscsi_nopout(struct bnx2i_conn *bnx2i_conn,
 	nopout_wqe->op_attr = ISCSI_FLAG_CMD_FINAL;
 	memcpy(nopout_wqe->lun, &nopout_hdr->lun, 8);
 
-	if (test_bit(BNX2I_NX2_DEV_57710, &ep->hba->cnic_dev_type)) {
-		u32 tmp = nopout_wqe->lun[0];
-		/* 57710 requires LUN field to be swapped */
-		nopout_wqe->lun[0] = nopout_wqe->lun[1];
-		nopout_wqe->lun[1] = tmp;
-	}
+	/* 57710 requires LUN field to be swapped */
+	if (test_bit(BNX2I_NX2_DEV_57710, &ep->hba->cnic_dev_type))
+		swap(nopout_wqe->lun[0], nopout_wqe->lun[1]);
 
 	nopout_wqe->itt = ((u16)task->itt |
 			   (ISCSI_TASK_TYPE_MPATH <<
-- 
2.7.4

Re: [PATCH] scsi: bnx2i: bnx2i_hwi: use swap macro in bnx2i_send_iscsi_nopout

[Rangankar, Manish]

On 04/11/17 1:28 AM, "Gustavo A. R. Silva" <garsilva@embeddedor.com> wrote:

>Make use of the swap macro and remove unnecessary variable tmp.
>This makes the code easier to read and maintain.
>
>This code was detected with the help of Coccinelle.
>
>Signed-off-by: Gustavo A. R. Silva <garsilva@embeddedor.com>
>---
> drivers/scsi/bnx2i/bnx2i_hwi.c | 9 +++------
> 1 file changed, 3 insertions(+), 6 deletions(-)
>
>diff --git a/drivers/scsi/bnx2i/bnx2i_hwi.c
>b/drivers/scsi/bnx2i/bnx2i_hwi.c
>index e0640e0..9e3bf53 100644
>--- a/drivers/scsi/bnx2i/bnx2i_hwi.c
>+++ b/drivers/scsi/bnx2i/bnx2i_hwi.c
>@@ -547,12 +547,9 @@ int bnx2i_send_iscsi_nopout(struct bnx2i_conn
>*bnx2i_conn,
> 	nopout_wqe->op_attr = ISCSI_FLAG_CMD_FINAL;
> 	memcpy(nopout_wqe->lun, &nopout_hdr->lun, 8);
> 
>-	if (test_bit(BNX2I_NX2_DEV_57710, &ep->hba->cnic_dev_type)) {
>-		u32 tmp = nopout_wqe->lun[0];
>-		/* 57710 requires LUN field to be swapped */
>-		nopout_wqe->lun[0] = nopout_wqe->lun[1];
>-		nopout_wqe->lun[1] = tmp;
>-	}
>+	/* 57710 requires LUN field to be swapped */
>+	if (test_bit(BNX2I_NX2_DEV_57710, &ep->hba->cnic_dev_type))
>+		swap(nopout_wqe->lun[0], nopout_wqe->lun[1]);
> 
> 	nopout_wqe->itt = ((u16)task->itt |
> 			   (ISCSI_TASK_TYPE_MPATH <<
>-- 
>2.7.4

Thanks,

Acked-by: Manish Rangankar <Manish.Rangankar@cavium.com>

>

Re: [PATCH] scsi: bnx2i: bnx2i_hwi: use swap macro in bnx2i_send_iscsi_nopout

[Gustavo A. R. Silva]

Quoting "Rangankar, Manish" <Manish.Rangankar@cavium.com>:

> On 04/11/17 1:28 AM, "Gustavo A. R. Silva" <garsilva@embeddedor.com> wrote:
>
>> Make use of the swap macro and remove unnecessary variable tmp.
>> This makes the code easier to read and maintain.
>>
>> This code was detected with the help of Coccinelle.
>>
>> Signed-off-by: Gustavo A. R. Silva <garsilva@embeddedor.com>
>> ---
>> drivers/scsi/bnx2i/bnx2i_hwi.c | 9 +++------
>> 1 file changed, 3 insertions(+), 6 deletions(-)
>>
>> diff --git a/drivers/scsi/bnx2i/bnx2i_hwi.c
>> b/drivers/scsi/bnx2i/bnx2i_hwi.c
>> index e0640e0..9e3bf53 100644
>> --- a/drivers/scsi/bnx2i/bnx2i_hwi.c
>> +++ b/drivers/scsi/bnx2i/bnx2i_hwi.c
>> @@ -547,12 +547,9 @@ int bnx2i_send_iscsi_nopout(struct bnx2i_conn
>> *bnx2i_conn,
>> 	nopout_wqe->op_attr = ISCSI_FLAG_CMD_FINAL;
>> 	memcpy(nopout_wqe->lun, &nopout_hdr->lun, 8);
>>
>> -	if (test_bit(BNX2I_NX2_DEV_57710, &ep->hba->cnic_dev_type)) {
>> -		u32 tmp = nopout_wqe->lun[0];
>> -		/* 57710 requires LUN field to be swapped */
>> -		nopout_wqe->lun[0] = nopout_wqe->lun[1];
>> -		nopout_wqe->lun[1] = tmp;
>> -	}
>> +	/* 57710 requires LUN field to be swapped */
>> +	if (test_bit(BNX2I_NX2_DEV_57710, &ep->hba->cnic_dev_type))
>> +		swap(nopout_wqe->lun[0], nopout_wqe->lun[1]);
>>
>> 	nopout_wqe->itt = ((u16)task->itt |
>> 			   (ISCSI_TASK_TYPE_MPATH <<
>> --
>> 2.7.4
>
> Thanks,
>
> Acked-by: Manish Rangankar <Manish.Rangankar@cavium.com>
>

Thank you, Manish.

--
Gustavo A. R. Silva

Re: [PATCH] scsi: bnx2i: bnx2i_hwi: use swap macro in bnx2i_send_iscsi_nopout

[Martin K. Petersen]

Gustavo A.,

> Make use of the swap macro and remove unnecessary variable tmp.
> This makes the code easier to read and maintain.

Applied to 4.16/scsi-queue. Thanks!

-- 
Martin K. Petersen	Oracle Linux Engineering