2015-11-05 11:58:09

by Sunny Kumar

Subject: [PATCH 1/1] staging: rdma: hfi1 : Prefer using the BIT macro

This patch replaces bit shifting on 1 with the BIT(x) macro

Signed-off-by: Sunny Kumar <[email protected]>
---
drivers/staging/rdma/hfi1/user_sdma.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/staging/rdma/hfi1/user_sdma.c b/drivers/staging/rdma/hfi1/user_sdma.c
index 36c838d..95a6d99 100644
--- a/drivers/staging/rdma/hfi1/user_sdma.c
+++ b/drivers/staging/rdma/hfi1/user_sdma.c
@@ -146,8 +146,8 @@ MODULE_PARM_DESC(sdma_comp_size, "Size of User SDMA completion ring. Default: 12
#define KDETH_OM_MAX_SIZE (1 << ((KDETH_OM_LARGE / KDETH_OM_SMALL) + 1))

/* Last packet in the request */
-#define TXREQ_FLAGS_REQ_LAST_PKT (1 << 0)
-#define TXREQ_FLAGS_IOVEC_LAST_PKT (1 << 0)
+#define TXREQ_FLAGS_REQ_LAST_PKT BIT(1 << 0)
+#define TXREQ_FLAGS_IOVEC_LAST_PKT BIT(1 << 0)

#define SDMA_REQ_IN_USE 0
#define SDMA_REQ_FOR_THREAD 1
@@ -156,9 +156,9 @@ MODULE_PARM_DESC(sdma_comp_size, "Size of User SDMA completion ring. Default: 12
#define SDMA_REQ_HAS_ERROR 4
#define SDMA_REQ_DONE_ERROR 5

-#define SDMA_PKT_Q_INACTIVE (1 << 0)
-#define SDMA_PKT_Q_ACTIVE (1 << 1)
-#define SDMA_PKT_Q_DEFERRED (1 << 2)
+#define SDMA_PKT_Q_INACTIVE BIT(1 << 0)
+#define SDMA_PKT_Q_ACTIVE BIT(1 << 1)
+#define SDMA_PKT_Q_DEFERRED BIT(1 << 2)

/*
* Maximum retry attempts to submit a TX request
--
2.1.4

2015-11-05 13:27:45

by Leon Romanovsky

Subject: Re: [PATCH 1/1] staging: rdma: hfi1 : Prefer using the BIT macro

On Thu, Nov 05, 2015 at 05:28:03PM +0530, Sunny Kumar wrote:
> This patch replaces bit shifting on 1 with the BIT(x) macro
>
> Signed-off-by: Sunny Kumar <[email protected]>
> ---
> drivers/staging/rdma/hfi1/user_sdma.c | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> /* Last packet in the request */
> -#define TXREQ_FLAGS_REQ_LAST_PKT (1 << 0)
> -#define TXREQ_FLAGS_IOVEC_LAST_PKT (1 << 0)
> +#define TXREQ_FLAGS_REQ_LAST_PKT BIT(1 << 0)
> +#define TXREQ_FLAGS_IOVEC_LAST_PKT BIT(1 << 0)
>
It is wrong. It actually creates 0x2 instead of 0x1.

> -#define SDMA_PKT_Q_INACTIVE (1 << 0)
> -#define SDMA_PKT_Q_ACTIVE (1 << 1)
> -#define SDMA_PKT_Q_DEFERRED (1 << 2)
> +#define SDMA_PKT_Q_INACTIVE BIT(1 << 0)
> +#define SDMA_PKT_Q_ACTIVE BIT(1 << 1)
> +#define SDMA_PKT_Q_DEFERRED BIT(1 << 2)
The same comment as above. It is wrong.

2015-11-05 14:24:41

by Marciniszyn, Mike

Subject: RE: [PATCH 1/1] staging: rdma: hfi1 : Prefer using the BIT macro

> Subject: [PATCH 1/1] staging: rdma: hfi1 : Prefer using the BIT macro
>
> This patch replaces bit shifting on 1 with the BIT(x) macro
>
> Signed-off-by: Sunny Kumar <[email protected]>
> ---

Nak.

The patch leaves the shift in.

Mike

2015-11-05 17:07:03

by Ira Weiny

Subject: Re: [PATCH 1/1] staging: rdma: hfi1 : Prefer using the BIT macro

On Thu, Nov 05, 2015 at 05:28:03PM +0530, Sunny Kumar wrote:
> This patch replaces bit shifting on 1 with the BIT(x) macro
>
> Signed-off-by: Sunny Kumar <[email protected]>

Also, NAK as has been covered in other responses.

However, I wanted to add, similar to the hfi1_ioctl fix, we have follow on
checkpatch patches which address this.

Ira

> ---
> drivers/staging/rdma/hfi1/user_sdma.c | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/staging/rdma/hfi1/user_sdma.c b/drivers/staging/rdma/hfi1/user_sdma.c
> index 36c838d..95a6d99 100644
> --- a/drivers/staging/rdma/hfi1/user_sdma.c
> +++ b/drivers/staging/rdma/hfi1/user_sdma.c
> @@ -146,8 +146,8 @@ MODULE_PARM_DESC(sdma_comp_size, "Size of User SDMA completion ring. Default: 12
> #define KDETH_OM_MAX_SIZE (1 << ((KDETH_OM_LARGE / KDETH_OM_SMALL) + 1))
>
> /* Last packet in the request */
> -#define TXREQ_FLAGS_REQ_LAST_PKT (1 << 0)
> -#define TXREQ_FLAGS_IOVEC_LAST_PKT (1 << 0)
> +#define TXREQ_FLAGS_REQ_LAST_PKT BIT(1 << 0)
> +#define TXREQ_FLAGS_IOVEC_LAST_PKT BIT(1 << 0)
>
> #define SDMA_REQ_IN_USE 0
> #define SDMA_REQ_FOR_THREAD 1
> @@ -156,9 +156,9 @@ MODULE_PARM_DESC(sdma_comp_size, "Size of User SDMA completion ring. Default: 12
> #define SDMA_REQ_HAS_ERROR 4
> #define SDMA_REQ_DONE_ERROR 5
>
> -#define SDMA_PKT_Q_INACTIVE (1 << 0)
> -#define SDMA_PKT_Q_ACTIVE (1 << 1)
> -#define SDMA_PKT_Q_DEFERRED (1 << 2)
> +#define SDMA_PKT_Q_INACTIVE BIT(1 << 0)
> +#define SDMA_PKT_Q_ACTIVE BIT(1 << 1)
> +#define SDMA_PKT_Q_DEFERRED BIT(1 << 2)
>
> /*
> * Maximum retry attempts to submit a TX request
> --
> 2.1.4
>
> _______________________________________________
> devel mailing list
> [email protected]
> http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel