Re: [PATCH net-next v2 05/19] bna: use BIT(x) instead of (1 << x)

2015-06-16 Thread Ivan Vecera 

On 06/12/2015 03:30 PM, David Laight wrote:

From: Ivan Vecera
...

diff --git a/drivers/net/ethernet/brocade/bna/bfa_defs_mfg_comm.h
b/drivers/net/ethernet/brocade/bna/bfa_defs_mfg_comm.h
index 679a503..16090fd 100644
--- a/drivers/net/ethernet/brocade/bna/bfa_defs_mfg_comm.h
+++ b/drivers/net/ethernet/brocade/bna/bfa_defs_mfg_comm.h
@@ -75,7 +75,7 @@ enum {
CB_GPIO_FC4P2   = (4),  /*!< 4G 2port FC card*/
CB_GPIO_FC4P1   = (5),  /*!< 4G 1port FC card*/
CB_GPIO_DFLY= (6),  /*!< 8G 2port FC mezzanine card  */
-   CB_GPIO_PROTO   = (1 << 7)/*!< 8G 2port FC prototypes  */
+   CB_GPIO_PROTO   = BIT(7)/*!< 8G 2port FC prototypes  */


That doesn't look like a BIT() value to me, just a large number.
Should the release driver even have support for the prototype hardware?

Why not? Does prototype HW need special driver?
The CB_GPIO_PROTO is an indication and you can have e.g. (CB_GPIO_FC4P1 
| CB_GPIO_PROTO) as 4G 1 port FC prototype card.




...

-   if (rx_enet_mask & ((u32)(1 << i))) {
+   if (rx_enet_mask & ((u32)BIT(i))) {


The (u32) cast looks superfluous.
There are also too many ().

Will fix.



...

-   int bit = (1 << (vlan_id & BFI_VLAN_WORD_MASK));
+   int bit = BIT((vlan_id & BFI_VLAN_WORD_MASK));


Too many ()

The same...



David

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html



--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

RE: [PATCH net-next v2 05/19] bna: use BIT(x) instead of (1 << x)

2015-06-12 Thread David Laight 
From: Ivan Vecera
...
> diff --git a/drivers/net/ethernet/brocade/bna/bfa_defs_mfg_comm.h
> b/drivers/net/ethernet/brocade/bna/bfa_defs_mfg_comm.h
> index 679a503..16090fd 100644
> --- a/drivers/net/ethernet/brocade/bna/bfa_defs_mfg_comm.h
> +++ b/drivers/net/ethernet/brocade/bna/bfa_defs_mfg_comm.h
> @@ -75,7 +75,7 @@ enum {
>   CB_GPIO_FC4P2   = (4),  /*!< 4G 2port FC card   */
>   CB_GPIO_FC4P1   = (5),  /*!< 4G 1port FC card   */
>   CB_GPIO_DFLY= (6),  /*!< 8G 2port FC mezzanine card */
> - CB_GPIO_PROTO   = (1 << 7)  /*!< 8G 2port FC prototypes */
> + CB_GPIO_PROTO   = BIT(7)/*!< 8G 2port FC prototypes */

That doesn't look like a BIT() value to me, just a large number.
Should the release driver even have support for the prototype hardware?

...
> - if (rx_enet_mask & ((u32)(1 << i))) {
> + if (rx_enet_mask & ((u32)BIT(i))) {

The (u32) cast looks superfluous.
There are also too many ().

...
> - int bit = (1 << (vlan_id & BFI_VLAN_WORD_MASK));
> + int bit = BIT((vlan_id & BFI_VLAN_WORD_MASK));

Too many ()

David

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH net-next v2 05/19] bna: use BIT(x) instead of (1 << x)

2015-06-11 Thread Ivan Vecera 
Signed-off-by: Ivan Vecera 
---
 .../net/ethernet/brocade/bna/bfa_defs_mfg_comm.h   |  2 +-
 drivers/net/ethernet/brocade/bna/bfa_ioc_ct.c  |  2 +-
 drivers/net/ethernet/brocade/bna/bfi_enet.h| 66 ++--
 drivers/net/ethernet/brocade/bna/bna_enet.c|  4 +-
 drivers/net/ethernet/brocade/bna/bna_hw_defs.h | 70 +++---
 drivers/net/ethernet/brocade/bna/bna_tx_rx.c   | 22 +++
 6 files changed, 83 insertions(+), 83 deletions(-)

diff --git a/drivers/net/ethernet/brocade/bna/bfa_defs_mfg_comm.h 
b/drivers/net/ethernet/brocade/bna/bfa_defs_mfg_comm.h
index 679a503..16090fd 100644
--- a/drivers/net/ethernet/brocade/bna/bfa_defs_mfg_comm.h
+++ b/drivers/net/ethernet/brocade/bna/bfa_defs_mfg_comm.h
@@ -75,7 +75,7 @@ enum {
CB_GPIO_FC4P2   = (4),  /*!< 4G 2port FC card   */
CB_GPIO_FC4P1   = (5),  /*!< 4G 1port FC card   */
CB_GPIO_DFLY= (6),  /*!< 8G 2port FC mezzanine card */
-   CB_GPIO_PROTO   = (1 << 7)  /*!< 8G 2port FC prototypes */
+   CB_GPIO_PROTO   = BIT(7)/*!< 8G 2port FC prototypes */
 };
 
 #define bfa_mfg_adapter_prop_init_gpio(gpio, card_type, prop)  \
diff --git a/drivers/net/ethernet/brocade/bna/bfa_ioc_ct.c 
b/drivers/net/ethernet/brocade/bna/bfa_ioc_ct.c
index 2e72445..4247d8a 100644
--- a/drivers/net/ethernet/brocade/bna/bfa_ioc_ct.c
+++ b/drivers/net/ethernet/brocade/bna/bfa_ioc_ct.c
@@ -24,7 +24,7 @@
 #include "bfa_defs.h"
 
 #define bfa_ioc_ct_sync_pos(__ioc) \
-   ((u32) (1 << bfa_ioc_pcifn(__ioc)))
+   ((u32)BIT(bfa_ioc_pcifn(__ioc)))
 #define BFA_IOC_SYNC_REQD_SH   16
 #define bfa_ioc_ct_get_sync_ackd(__val) (__val & 0x)
 #define bfa_ioc_ct_clear_sync_ackd(__val) (__val & 0x)
diff --git a/drivers/net/ethernet/brocade/bna/bfi_enet.h 
b/drivers/net/ethernet/brocade/bna/bfi_enet.h
index fad3a12..d7be7ea8 100644
--- a/drivers/net/ethernet/brocade/bna/bfi_enet.h
+++ b/drivers/net/ethernet/brocade/bna/bfi_enet.h
@@ -68,13 +68,13 @@ union bfi_addr_be_u {
 #define BFI_ENET_TXQ_WI_EXTENSION  (0x104) /* Extension WI */
 
 /* TxQ Entry Control Flags */
-#define BFI_ENET_TXQ_WI_CF_FCOE_CRC(1 << 8)
-#define BFI_ENET_TXQ_WI_CF_IPID_MODE   (1 << 5)
-#define BFI_ENET_TXQ_WI_CF_INS_PRIO(1 << 4)
-#define BFI_ENET_TXQ_WI_CF_INS_VLAN(1 << 3)
-#define BFI_ENET_TXQ_WI_CF_UDP_CKSUM   (1 << 2)
-#define BFI_ENET_TXQ_WI_CF_TCP_CKSUM   (1 << 1)
-#define BFI_ENET_TXQ_WI_CF_IP_CKSUM(1 << 0)
+#define BFI_ENET_TXQ_WI_CF_FCOE_CRCBIT(8)
+#define BFI_ENET_TXQ_WI_CF_IPID_MODE   BIT(5)
+#define BFI_ENET_TXQ_WI_CF_INS_PRIOBIT(4)
+#define BFI_ENET_TXQ_WI_CF_INS_VLANBIT(3)
+#define BFI_ENET_TXQ_WI_CF_UDP_CKSUM   BIT(2)
+#define BFI_ENET_TXQ_WI_CF_TCP_CKSUM   BIT(1)
+#define BFI_ENET_TXQ_WI_CF_IP_CKSUMBIT(0)
 
 struct bfi_enet_txq_wi_base {
u8  reserved;
@@ -122,32 +122,32 @@ struct bfi_enet_rxq_entry {
 
 /*   R X   C O M P L E T I O N   Q U E U E   D E F I N E S   */
 /* CQ Entry Flags */
-#defineBFI_ENET_CQ_EF_MAC_ERROR(1 <<  0)
-#defineBFI_ENET_CQ_EF_FCS_ERROR(1 <<  1)
-#defineBFI_ENET_CQ_EF_TOO_LONG (1 <<  2)
-#defineBFI_ENET_CQ_EF_FC_CRC_OK(1 <<  3)
+#define BFI_ENET_CQ_EF_MAC_ERROR   BIT(0)
+#define BFI_ENET_CQ_EF_FCS_ERROR   BIT(1)
+#define BFI_ENET_CQ_EF_TOO_LONGBIT(2)
+#define BFI_ENET_CQ_EF_FC_CRC_OK   BIT(3)
 
-#defineBFI_ENET_CQ_EF_RSVD1(1 <<  4)
-#defineBFI_ENET_CQ_EF_L4_CKSUM_OK  (1 <<  5)
-#defineBFI_ENET_CQ_EF_L3_CKSUM_OK  (1 <<  6)
-#defineBFI_ENET_CQ_EF_HDS_HEADER   (1 <<  7)
+#define BFI_ENET_CQ_EF_RSVD1   BIT(4)
+#define BFI_ENET_CQ_EF_L4_CKSUM_OK BIT(5)
+#define BFI_ENET_CQ_EF_L3_CKSUM_OK BIT(6)
+#define BFI_ENET_CQ_EF_HDS_HEADER  BIT(7)
 
-#defineBFI_ENET_CQ_EF_UDP  (1 <<  8)
-#defineBFI_ENET_CQ_EF_TCP  (1 <<  9)
-#defineBFI_ENET_CQ_EF_IP_OPTIONS   (1 << 10)
-#defineBFI_ENET_CQ_EF_IPV6 (1 << 11)
+#define BFI_ENET_CQ_EF_UDP BIT(8)
+#define BFI_ENET_CQ_EF_TCP BIT(9)
+#define BFI_ENET_CQ_EF_IP_OPTIONS  BIT(10)
+#define BFI_ENET_CQ_EF_IPV6BIT(11)
 
-#defineBFI_ENET_CQ_EF_IPV4 (1 << 12)
-#defineBFI_ENET_CQ_EF_VLAN (1 << 13)
-#defineBFI_ENET_CQ_EF_RSS  (1 << 14)
-#defineBFI_ENET_CQ_EF_RSVD2(1 << 15)
+#define BFI_ENET_CQ_EF_IPV4BIT(12)
+#define BFI_ENET_CQ_EF_VLANBIT(13)
+#define BFI_ENET_CQ_EF_RSS BIT(14)
+#define BFI_ENET_CQ_EF_RSVD2   BIT(15)
 
-#defineBFI_ENET_CQ_EF_MCAST_MATCH  (1 << 16)
-#defineBFI_ENET_CQ_EF_MCAST(1 << 17)
-#define BFI_ENET_CQ_EF_BCAST   (1 << 18)
-#defineBFI_ENET_CQ_EF_REMOTE