iavf: field get conversion

Refactor the iavf driver to use FIELD_GET() for mask and shift reads,
which reduces lines of code and adds clarity of intent.

This code was generated by the following coccinelle/spatch script and
then manually repaired in a later patch.

@get@
constant shift,mask;
type T;
expression a;
@@
-((T)((a) & mask) >> shift)
+FIELD_GET(mask, a)

and applied via:
spatch --sp-file field_prep.cocci --in-place --dir \
 drivers/net/ethernet/intel/

Cc: Julia Lawall <Julia.Lawall@inria.fr>
Reviewed-by: Marcin Szycik <marcin.szycik@linux.intel.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Tested-by: Rafal Romanowski <rafal.romanowski@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>

diff --git a/drivers/net/ethernet/intel/iavf/iavf_ethtool.c b/drivers/net/ethernet/intel/iavf/iavf_ethtool.c
index bffb45802dab3a49ca74d3f79a62c6e940ad3106..378c3e9ddf9d45bf0bcebf1b1682b2ef92b03900 100644 (file)
--- a/drivers/net/ethernet/intel/iavf/iavf_ethtool.c
+++ b/drivers/net/ethernet/intel/iavf/iavf_ethtool.c
@@ -1017,8 +1017,7 @@ iavf_parse_rx_flow_user_data(struct ethtool_rx_flow_spec *fsp,
 #define IAVF_USERDEF_FLEX_MAX_OFFS_VAL 504
                flex = &fltr->flex_words[cnt++];
                flex->word = value & IAVF_USERDEF_FLEX_WORD_M;
-               flex->offset = (value & IAVF_USERDEF_FLEX_OFFS_M) >>
-                            IAVF_USERDEF_FLEX_OFFS_S;
+               flex->offset = FIELD_GET(IAVF_USERDEF_FLEX_OFFS_M, value);
                if (flex->offset > IAVF_USERDEF_FLEX_MAX_OFFS_VAL)
                        return -EINVAL;
        }

diff --git a/drivers/net/ethernet/intel/iavf/iavf_txrx.c b/drivers/net/ethernet/intel/iavf/iavf_txrx.c
index fb7edba9c2f8b334563157dcae0ede66fb9ab947..b71484c87a84618f5e8722fee0506ba23841e051 100644 (file)
--- a/drivers/net/ethernet/intel/iavf/iavf_txrx.c
+++ b/drivers/net/ethernet/intel/iavf/iavf_txrx.c
@@ -989,11 +989,9 @@ static void iavf_rx_checksum(struct iavf_vsi *vsi,
        u64 qword;
 
        qword = le64_to_cpu(rx_desc->wb.qword1.status_error_len);
-       ptype = (qword & IAVF_RXD_QW1_PTYPE_MASK) >> IAVF_RXD_QW1_PTYPE_SHIFT;
-       rx_error = (qword & IAVF_RXD_QW1_ERROR_MASK) >>
-                  IAVF_RXD_QW1_ERROR_SHIFT;
-       rx_status = (qword & IAVF_RXD_QW1_STATUS_MASK) >>
-                   IAVF_RXD_QW1_STATUS_SHIFT;
+       ptype = FIELD_GET(IAVF_RXD_QW1_PTYPE_MASK, qword);
+       rx_error = FIELD_GET(IAVF_RXD_QW1_ERROR_MASK, qword);
+       rx_status = FIELD_GET(IAVF_RXD_QW1_STATUS_MASK, qword);
        decoded = decode_rx_desc_ptype(ptype);
 
        skb->ip_summed = CHECKSUM_NONE;
@@ -1534,8 +1532,7 @@ static int iavf_clean_rx_irq(struct iavf_ring *rx_ring, int budget)
                if (!iavf_test_staterr(rx_desc, IAVF_RXD_DD))
                        break;
 
-               size = (qword & IAVF_RXD_QW1_LENGTH_PBUF_MASK) >>
-                      IAVF_RXD_QW1_LENGTH_PBUF_SHIFT;
+               size = FIELD_GET(IAVF_RXD_QW1_LENGTH_PBUF_MASK, qword);
 
                iavf_trace(clean_rx_irq, rx_ring, rx_desc, skb);
                rx_buffer = iavf_get_rx_buffer(rx_ring, size);
@@ -1582,8 +1579,7 @@ static int iavf_clean_rx_irq(struct iavf_ring *rx_ring, int budget)
                total_rx_bytes += skb->len;
 
                qword = le64_to_cpu(rx_desc->wb.qword1.status_error_len);
-               rx_ptype = (qword & IAVF_RXD_QW1_PTYPE_MASK) >>
-                          IAVF_RXD_QW1_PTYPE_SHIFT;
+               rx_ptype = FIELD_GET(IAVF_RXD_QW1_PTYPE_MASK, qword);
 
                /* populate checksum, VLAN, and protocol */
                iavf_process_skb_fields(rx_ring, rx_desc, skb, rx_ptype);
@@ -2291,8 +2287,7 @@ static void iavf_tx_map(struct iavf_ring *tx_ring, struct sk_buff *skb,
 
        if (tx_flags & IAVF_TX_FLAGS_HW_VLAN) {
                td_cmd |= IAVF_TX_DESC_CMD_IL2TAG1;
-               td_tag = (tx_flags & IAVF_TX_FLAGS_VLAN_MASK) >>
-                        IAVF_TX_FLAGS_VLAN_SHIFT;
+               td_tag = FIELD_GET(IAVF_TX_FLAGS_VLAN_MASK, tx_flags);
        }
 
        first->tx_flags = tx_flags;
@@ -2468,8 +2463,7 @@ static netdev_tx_t iavf_xmit_frame_ring(struct sk_buff *skb,
        if (tx_flags & IAVF_TX_FLAGS_HW_OUTER_SINGLE_VLAN) {
                cd_type_cmd_tso_mss |= IAVF_TX_CTX_DESC_IL2TAG2 <<
                        IAVF_TXD_CTX_QW1_CMD_SHIFT;
-               cd_l2tag2 = (tx_flags & IAVF_TX_FLAGS_VLAN_MASK) >>
-                       IAVF_TX_FLAGS_VLAN_SHIFT;
+               cd_l2tag2 = FIELD_GET(IAVF_TX_FLAGS_VLAN_MASK, tx_flags);
        }
 
        /* obtain protocol of skb */