Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/560288/?format=api
{ "id": 560288, "url": "http://patchwork.ozlabs.org/api/patches/560288/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20151222214349.42447.44013.stgit@bwallan-cwp1.jf.intel.com/", "project": { "id": 46, "url": "http://patchwork.ozlabs.org/api/projects/46/?format=api", "name": "Intel Wired Ethernet development", "link_name": "intel-wired-lan", "list_id": "intel-wired-lan.osuosl.org", "list_email": "intel-wired-lan@osuosl.org", "web_url": "", "scm_url": "", "webscm_url": "", "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<20151222214349.42447.44013.stgit@bwallan-cwp1.jf.intel.com>", "list_archive_url": null, "date": "2015-12-22T21:43:49", "name": "[next-queue,2/2] fm10k: cleanup remaining right-bit-shifted 1", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "0f0cbe287b4fbd5baa19b0787dc4ecc980af2062", "submitter": { "id": 503, "url": "http://patchwork.ozlabs.org/api/people/503/?format=api", "name": "Allan, Bruce W", "email": "bruce.w.allan@intel.com" }, "delegate": { "id": 68, "url": "http://patchwork.ozlabs.org/api/users/68/?format=api", "username": "jtkirshe", "first_name": "Jeff", "last_name": "Kirsher", "email": "jeffrey.t.kirsher@intel.com" }, "mbox": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20151222214349.42447.44013.stgit@bwallan-cwp1.jf.intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/560288/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/560288/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<intel-wired-lan-bounces@lists.osuosl.org>", "X-Original-To": [ "incoming@patchwork.ozlabs.org", "intel-wired-lan@lists.osuosl.org" ], "Delivered-To": [ "patchwork-incoming@bilbo.ozlabs.org", "intel-wired-lan@lists.osuosl.org" ], "Received": [ "from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133])\n\tby ozlabs.org (Postfix) with ESMTP id BAD131402C4\n\tfor <incoming@patchwork.ozlabs.org>;\n\tWed, 23 Dec 2015 08:43:50 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 16643958B6;\n\tTue, 22 Dec 2015 21:43:50 +0000 (UTC)", "from hemlock.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id L0xJKctU+at7; Tue, 22 Dec 2015 21:43:49 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 1904B94D56;\n\tTue, 22 Dec 2015 21:43:49 +0000 (UTC)", "from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n\tby ash.osuosl.org (Postfix) with ESMTP id 3E1081BFEE9\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 22 Dec 2015 21:43:48 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 398D19251C\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 22 Dec 2015 21:43:48 +0000 (UTC)", "from whitealder.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id eemivpYS78vC for <intel-wired-lan@lists.osuosl.org>;\n\tTue, 22 Dec 2015 21:43:47 +0000 (UTC)", "from mga04.intel.com (mga04.intel.com [192.55.52.120])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id E4F2A92504\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 22 Dec 2015 21:43:46 +0000 (UTC)", "from fmsmga001.fm.intel.com ([10.253.24.23])\n\tby fmsmga104.fm.intel.com with ESMTP; 22 Dec 2015 13:43:46 -0800", "from bwallan-cwp1.jf.intel.com ([10.166.136.47])\n\tby fmsmga001.fm.intel.com with ESMTP; 22 Dec 2015 13:43:47 -0800", "from bwallan-cwp1.jf.intel.com (localhost [127.0.0.1])\n\tby bwallan-cwp1.jf.intel.com (8.15.2/8.15.1) with ESMTP id\n\ttBMLhnPt042482 for <intel-wired-lan@lists.osuosl.org>;\n\tTue, 22 Dec 2015 13:43:49 -0800" ], "X-Virus-Scanned": [ "amavisd-new at osuosl.org", "amavisd-new at osuosl.org" ], "X-Greylist": "domain auto-whitelisted by SQLgrey-1.7.6", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.20,466,1444719600\"; d=\"scan'208\";a=\"867682586\"", "From": "Bruce Allan <bruce.w.allan@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Tue, 22 Dec 2015 13:43:49 -0800", "Message-ID": "<20151222214349.42447.44013.stgit@bwallan-cwp1.jf.intel.com>", "In-Reply-To": "<20151222214344.42447.71576.stgit@bwallan-cwp1.jf.intel.com>", "References": "<20151222214344.42447.71576.stgit@bwallan-cwp1.jf.intel.com>", "User-Agent": "StGit/0.17.1-dirty", "MIME-Version": "1.0", "Subject": "[Intel-wired-lan] [next-queue PATCH 2/2] fm10k: cleanup remaining\n\tright-bit-shifted 1", "X-BeenThere": "intel-wired-lan@lists.osuosl.org", "X-Mailman-Version": "2.1.18-1", "Precedence": "list", "List-Id": "Intel Wired Ethernet Linux Kernel Driver Development\n\t<intel-wired-lan.lists.osuosl.org>", "List-Unsubscribe": "<http://lists.osuosl.org/mailman/options/intel-wired-lan>, \n\t<mailto:intel-wired-lan-request@lists.osuosl.org?subject=unsubscribe>", "List-Archive": "<http://lists.osuosl.org/pipermail/intel-wired-lan/>", "List-Post": "<mailto:intel-wired-lan@lists.osuosl.org>", "List-Help": "<mailto:intel-wired-lan-request@lists.osuosl.org?subject=help>", "List-Subscribe": "<http://lists.osuosl.org/mailman/listinfo/intel-wired-lan>, \n\t<mailto:intel-wired-lan-request@lists.osuosl.org?subject=subscribe>", "Content-Type": "text/plain; charset=\"us-ascii\"", "Content-Transfer-Encoding": "7bit", "Errors-To": "intel-wired-lan-bounces@lists.osuosl.org", "Sender": "\"Intel-wired-lan\" <intel-wired-lan-bounces@lists.osuosl.org>" }, "content": "Use BIT() macro instead.\n\nSigned-off-by: Bruce Allan <bruce.w.allan@intel.com>\n---\n drivers/net/ethernet/intel/fm10k/fm10k.h | 12 ++++++-----\n drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c | 20 ++++++++----------\n drivers/net/ethernet/intel/fm10k/fm10k_main.c | 20 +++++++++---------\n drivers/net/ethernet/intel/fm10k/fm10k_netdev.c | 2 +-\n drivers/net/ethernet/intel/fm10k/fm10k_pci.c | 8 ++++---\n drivers/net/ethernet/intel/fm10k/fm10k_pf.c | 12 ++++++-----\n drivers/net/ethernet/intel/fm10k/fm10k_tlv.c | 24 +++++++++++-----------\n drivers/net/ethernet/intel/fm10k/fm10k_type.h | 8 ++++---\n 8 files changed, 52 insertions(+), 54 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/fm10k/fm10k.h b/drivers/net/ethernet/intel/fm10k/fm10k.h\nindex b34bb00..83f3867 100644\n--- a/drivers/net/ethernet/intel/fm10k/fm10k.h\n+++ b/drivers/net/ethernet/intel/fm10k/fm10k.h\n@@ -262,12 +262,12 @@ struct fm10k_intfc {\n \tunsigned long state;\n \n \tu32 flags;\n-#define FM10K_FLAG_RESET_REQUESTED\t\t(u32)(1 << 0)\n-#define FM10K_FLAG_RSS_FIELD_IPV4_UDP\t\t(u32)(1 << 1)\n-#define FM10K_FLAG_RSS_FIELD_IPV6_UDP\t\t(u32)(1 << 2)\n-#define FM10K_FLAG_RX_TS_ENABLED\t\t(u32)(1 << 3)\n-#define FM10K_FLAG_SWPRI_CONFIG\t\t\t(u32)(1 << 4)\n-#define FM10K_FLAG_DEBUG_STATS\t\t\t(u32)(1 << 5)\n+#define FM10K_FLAG_RESET_REQUESTED\t\t(u32)(BIT(0))\n+#define FM10K_FLAG_RSS_FIELD_IPV4_UDP\t\t(u32)(BIT(1))\n+#define FM10K_FLAG_RSS_FIELD_IPV6_UDP\t\t(u32)(BIT(2))\n+#define FM10K_FLAG_RX_TS_ENABLED\t\t(u32)(BIT(3))\n+#define FM10K_FLAG_SWPRI_CONFIG\t\t\t(u32)(BIT(4))\n+#define FM10K_FLAG_DEBUG_STATS\t\t\t(u32)(BIT(5))\n \tint xcast_mode;\n \n \t/* Tx fast path data */\ndiff --git a/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c b/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c\nindex 2f6a05b..28837ae 100644\n--- a/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c\n+++ b/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c\n@@ -425,7 +425,7 @@ static void fm10k_get_regs(struct net_device *netdev,\n \tu32 *buff = p;\n \tu16 i;\n \n-\tregs->version = (1 << 24) | (hw->revision_id << 16) | hw->device_id;\n+\tregs->version = BIT(24) | (hw->revision_id << 16) | hw->device_id;\n \n \tswitch (hw->mac.type) {\n \tcase fm10k_mac_pf:\n@@ -942,8 +942,8 @@ static int fm10k_mbx_test(struct fm10k_intfc *interface, u64 *data)\n \t\treturn 0;\n \n \t/* loop through both nested and unnested attribute types */\n-\tfor (attr_flag = (1 << FM10K_TEST_MSG_UNSET);\n-\t attr_flag < (1 << (2 * FM10K_TEST_MSG_NESTED));\n+\tfor (attr_flag = BIT(FM10K_TEST_MSG_UNSET);\n+\t attr_flag < BIT(2 * FM10K_TEST_MSG_NESTED);\n \t attr_flag += attr_flag) {\n \t\t/* generate message to be tested */\n \t\tfm10k_tlv_msg_test_create(test_msg, attr_flag);\n@@ -1005,7 +1005,7 @@ static u32 fm10k_get_priv_flags(struct net_device *netdev)\n \tu32 priv_flags = 0;\n \n \tif (interface->flags & FM10K_FLAG_DEBUG_STATS)\n-\t\tpriv_flags |= 1 << FM10K_PRV_FLAG_DEBUG_STATS;\n+\t\tpriv_flags |= BIT(FM10K_PRV_FLAG_DEBUG_STATS);\n \n \treturn priv_flags;\n }\n@@ -1014,10 +1014,10 @@ static int fm10k_set_priv_flags(struct net_device *netdev, u32 priv_flags)\n {\n \tstruct fm10k_intfc *interface = netdev_priv(netdev);\n \n-\tif (priv_flags >= (1 << FM10K_PRV_FLAG_LEN))\n+\tif (priv_flags >= BIT(FM10K_PRV_FLAG_LEN))\n \t\treturn -EINVAL;\n \n-\tif (priv_flags & (1 << FM10K_PRV_FLAG_DEBUG_STATS))\n+\tif (priv_flags & BIT(FM10K_PRV_FLAG_DEBUG_STATS))\n \t\tinterface->flags |= FM10K_FLAG_DEBUG_STATS;\n \telse\n \t\tinterface->flags &= ~FM10K_FLAG_DEBUG_STATS;\n@@ -1145,7 +1145,7 @@ static unsigned int fm10k_max_channels(struct net_device *dev)\n \n \t/* For QoS report channels per traffic class */\n \tif (tcs > 1)\n-\t\tmax_combined = 1 << (fls(max_combined / tcs) - 1);\n+\t\tmax_combined = BIT((fls(max_combined / tcs) - 1));\n \n \treturn max_combined;\n }\n@@ -1210,11 +1210,9 @@ static int fm10k_get_ts_info(struct net_device *dev,\n \telse\n \t\tinfo->phc_index = -1;\n \n-\tinfo->tx_types = (1 << HWTSTAMP_TX_OFF) |\n-\t\t\t (1 << HWTSTAMP_TX_ON);\n+\tinfo->tx_types = BIT(HWTSTAMP_TX_OFF) | BIT(HWTSTAMP_TX_ON);\n \n-\tinfo->rx_filters = (1 << HWTSTAMP_FILTER_NONE) |\n-\t\t\t (1 << HWTSTAMP_FILTER_ALL);\n+\tinfo->rx_filters = BIT(HWTSTAMP_FILTER_NONE) | BIT(HWTSTAMP_FILTER_ALL);\n \n \treturn 0;\n }\ndiff --git a/drivers/net/ethernet/intel/fm10k/fm10k_main.c b/drivers/net/ethernet/intel/fm10k/fm10k_main.c\nindex d74d42a..ba469db 100644\n--- a/drivers/net/ethernet/intel/fm10k/fm10k_main.c\n+++ b/drivers/net/ethernet/intel/fm10k/fm10k_main.c\n@@ -401,10 +401,10 @@ static inline void fm10k_rx_checksum(struct fm10k_ring *ring,\n }\n \n #define FM10K_RSS_L4_TYPES_MASK \\\n-\t((1ul << FM10K_RSSTYPE_IPV4_TCP) | \\\n-\t (1ul << FM10K_RSSTYPE_IPV4_UDP) | \\\n-\t (1ul << FM10K_RSSTYPE_IPV6_TCP) | \\\n-\t (1ul << FM10K_RSSTYPE_IPV6_UDP))\n+\t(BIT(FM10K_RSSTYPE_IPV4_TCP) | \\\n+\t BIT(FM10K_RSSTYPE_IPV4_UDP) | \\\n+\t BIT(FM10K_RSSTYPE_IPV6_TCP) | \\\n+\t BIT(FM10K_RSSTYPE_IPV6_UDP))\n \n static inline void fm10k_rx_hash(struct fm10k_ring *ring,\n \t\t\t\t union fm10k_rx_desc *rx_desc,\n@@ -420,7 +420,7 @@ static inline void fm10k_rx_hash(struct fm10k_ring *ring,\n \t\treturn;\n \n \tskb_set_hash(skb, le32_to_cpu(rx_desc->d.rss),\n-\t\t ((1ul << rss_type) & FM10K_RSS_L4_TYPES_MASK) ?\n+\t\t (BIT(rss_type) & FM10K_RSS_L4_TYPES_MASK) ?\n \t\t PKT_HASH_TYPE_L4 : PKT_HASH_TYPE_L3);\n }\n \n@@ -1413,7 +1413,7 @@ static void fm10k_update_itr(struct fm10k_ring_container *ring_container)\n \t * accounts for changes in the ITR due to PCIe link speed.\n \t */\n \titr_round = ACCESS_ONCE(ring_container->itr_scale) + 8;\n-\tavg_wire_size += (1 << itr_round) - 1;\n+\tavg_wire_size += BIT(itr_round) - 1;\n \tavg_wire_size >>= itr_round;\n \n \t/* write back value and retain adaptive flag */\n@@ -1515,17 +1515,17 @@ static bool fm10k_set_qos_queues(struct fm10k_intfc *interface)\n \t/* set QoS mask and indices */\n \tf = &interface->ring_feature[RING_F_QOS];\n \tf->indices = pcs;\n-\tf->mask = (1 << fls(pcs - 1)) - 1;\n+\tf->mask = BIT(fls(pcs - 1)) - 1;\n \n \t/* determine the upper limit for our current DCB mode */\n \trss_i = interface->hw.mac.max_queues / pcs;\n-\trss_i = 1 << (fls(rss_i) - 1);\n+\trss_i = BIT(fls(rss_i) - 1);\n \n \t/* set RSS mask and indices */\n \tf = &interface->ring_feature[RING_F_RSS];\n \trss_i = min_t(u16, rss_i, f->limit);\n \tf->indices = rss_i;\n-\tf->mask = (1 << fls(rss_i - 1)) - 1;\n+\tf->mask = BIT(fls(rss_i - 1)) - 1;\n \n \t/* configure pause class to queue mapping */\n \tfor (i = 0; i < pcs; i++)\n@@ -1555,7 +1555,7 @@ static bool fm10k_set_rss_queues(struct fm10k_intfc *interface)\n \n \t/* record indices and power of 2 mask for RSS */\n \tf->indices = rss_i;\n-\tf->mask = (1 << fls(rss_i - 1)) - 1;\n+\tf->mask = BIT(fls(rss_i - 1)) - 1;\n \n \tinterface->num_rx_queues = rss_i;\n \tinterface->num_tx_queues = rss_i;\ndiff --git a/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c b/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c\nindex 662569d..aa53a6e 100644\n--- a/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c\n+++ b/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c\n@@ -1420,7 +1420,7 @@ struct net_device *fm10k_alloc_netdev(const struct fm10k_info *info)\n \n \t/* configure default debug level */\n \tinterface = netdev_priv(dev);\n-\tinterface->msg_enable = (1 << DEFAULT_DEBUG_LEVEL_SHIFT) - 1;\n+\tinterface->msg_enable = BIT(DEFAULT_DEBUG_LEVEL_SHIFT) - 1;\n \n \t/* configure default features */\n \tdev->features |= NETIF_F_IP_CSUM |\ndiff --git a/drivers/net/ethernet/intel/fm10k/fm10k_pci.c b/drivers/net/ethernet/intel/fm10k/fm10k_pci.c\nindex 86700a4..c9324c7 100644\n--- a/drivers/net/ethernet/intel/fm10k/fm10k_pci.c\n+++ b/drivers/net/ethernet/intel/fm10k/fm10k_pci.c\n@@ -579,7 +579,7 @@ static void fm10k_configure_tx_ring(struct fm10k_intfc *interface,\n \tu64 tdba = ring->dma;\n \tu32 size = ring->count * sizeof(struct fm10k_tx_desc);\n \tu32 txint = FM10K_INT_MAP_DISABLE;\n-\tu32 txdctl = (1 << FM10K_TXDCTL_MAX_TIME_SHIFT) | FM10K_TXDCTL_ENABLE;\n+\tu32 txdctl = BIT(FM10K_TXDCTL_MAX_TIME_SHIFT) | FM10K_TXDCTL_ENABLE;\n \tu8 reg_idx = ring->reg_idx;\n \n \t/* disable queue to avoid issues while updating state */\n@@ -730,7 +730,7 @@ static void fm10k_configure_rx_ring(struct fm10k_intfc *interface,\n \tif (interface->pfc_en)\n \t\trx_pause = interface->pfc_en;\n #endif\n-\tif (!(rx_pause & (1 << ring->qos_pc)))\n+\tif (!(rx_pause & BIT(ring->qos_pc)))\n \t\trxdctl |= FM10K_RXDCTL_DROP_ON_EMPTY;\n \n \tfm10k_write_reg(hw, FM10K_RXDCTL(reg_idx), rxdctl);\n@@ -779,7 +779,7 @@ void fm10k_update_rx_drop_en(struct fm10k_intfc *interface)\n \t\tu32 rxdctl = FM10K_RXDCTL_WRITE_BACK_MIN_DELAY;\n \t\tu8 reg_idx = ring->reg_idx;\n \n-\t\tif (!(rx_pause & (1 << ring->qos_pc)))\n+\t\tif (!(rx_pause & BIT(ring->qos_pc)))\n \t\t\trxdctl |= FM10K_RXDCTL_DROP_ON_EMPTY;\n \n \t\tfm10k_write_reg(hw, FM10K_RXDCTL(reg_idx), rxdctl);\n@@ -1065,7 +1065,7 @@ static void fm10k_reset_drop_on_empty(struct fm10k_intfc *interface, u32 eicr)\n \tif (maxholdq)\n \t\tfm10k_write_reg(hw, FM10K_MAXHOLDQ(7), maxholdq);\n \tfor (q = 255;;) {\n-\t\tif (maxholdq & (1 << 31)) {\n+\t\tif (maxholdq & BIT(31)) {\n \t\t\tif (q < FM10K_MAX_QUEUES_PF) {\n \t\t\t\tinterface->rx_overrun_pf++;\n \t\t\t\tfm10k_write_reg(hw, FM10K_RXDCTL(q), rxdctl);\ndiff --git a/drivers/net/ethernet/intel/fm10k/fm10k_pf.c b/drivers/net/ethernet/intel/fm10k/fm10k_pf.c\nindex 34a0b03..23de956 100644\n--- a/drivers/net/ethernet/intel/fm10k/fm10k_pf.c\n+++ b/drivers/net/ethernet/intel/fm10k/fm10k_pf.c\n@@ -527,8 +527,8 @@ static s32 fm10k_configure_dglort_map_pf(struct fm10k_hw *hw,\n \t\treturn FM10K_ERR_PARAM;\n \n \t/* determine count of VSIs and queues */\n-\tqueue_count = 1 << (dglort->rss_l + dglort->pc_l);\n-\tvsi_count = 1 << (dglort->vsi_l + dglort->queue_l);\n+\tqueue_count = BIT(dglort->rss_l + dglort->pc_l);\n+\tvsi_count = BIT(dglort->vsi_l + dglort->queue_l);\n \tglort = dglort->glort;\n \tq_idx = dglort->queue_b;\n \n@@ -544,8 +544,8 @@ static s32 fm10k_configure_dglort_map_pf(struct fm10k_hw *hw,\n \t}\n \n \t/* determine count of PCs and queues */\n-\tqueue_count = 1 << (dglort->queue_l + dglort->rss_l + dglort->vsi_l);\n-\tpc_count = 1 << dglort->pc_l;\n+\tqueue_count = BIT(dglort->queue_l + dglort->rss_l + dglort->vsi_l);\n+\tpc_count = BIT(dglort->pc_l);\n \n \t/* configure PC for Tx queues */\n \tfor (pc = 0; pc < pc_count; pc++) {\n@@ -952,7 +952,7 @@ static s32 fm10k_iov_reset_resources_pf(struct fm10k_hw *hw,\n \t\treturn FM10K_ERR_PARAM;\n \n \t/* clear event notification of VF FLR */\n-\tfm10k_write_reg(hw, FM10K_PFVFLREC(vf_idx / 32), 1 << (vf_idx % 32));\n+\tfm10k_write_reg(hw, FM10K_PFVFLREC(vf_idx / 32), BIT(vf_idx % 32));\n \n \t/* force timeout and then disconnect the mailbox */\n \tvf_info->mbx.timeout = 0;\n@@ -1370,7 +1370,7 @@ s32 fm10k_iov_msg_lport_state_pf(struct fm10k_hw *hw, u32 **results,\n \t\tmode = fm10k_iov_supported_xcast_mode_pf(vf_info, mode);\n \n \t\t/* if mode is not currently enabled, enable it */\n-\t\tif (!(FM10K_VF_FLAG_ENABLED(vf_info) & (1 << mode)))\n+\t\tif (!(FM10K_VF_FLAG_ENABLED(vf_info) & BIT(mode)))\n \t\t\tfm10k_update_xcast_mode_pf(hw, vf_info->glort, mode);\n \n \t\t/* swap mode back to a bit flag */\ndiff --git a/drivers/net/ethernet/intel/fm10k/fm10k_tlv.c b/drivers/net/ethernet/intel/fm10k/fm10k_tlv.c\nindex ab01bb3..b999897 100644\n--- a/drivers/net/ethernet/intel/fm10k/fm10k_tlv.c\n+++ b/drivers/net/ethernet/intel/fm10k/fm10k_tlv.c\n@@ -222,7 +222,7 @@ s32 fm10k_tlv_attr_put_value(u32 *msg, u16 attr_id, s64 value, u32 len)\n \tattr = &msg[FM10K_TLV_DWORD_LEN(*msg)];\n \n \tif (len < 4) {\n-\t\tattr[1] = (u32)value & ((0x1ul << (8 * len)) - 1);\n+\t\tattr[1] = (u32)value & (BIT(8 * len) - 1);\n \t} else {\n \t\tattr[1] = (u32)value;\n \t\tif (len > 4)\n@@ -652,29 +652,29 @@ const struct fm10k_tlv_attr fm10k_tlv_msg_test_attr[] = {\n **/\n static void fm10k_tlv_msg_test_generate_data(u32 *msg, u32 attr_flags)\n {\n-\tif (attr_flags & (1 << FM10K_TEST_MSG_STRING))\n+\tif (attr_flags & BIT(FM10K_TEST_MSG_STRING))\n \t\tfm10k_tlv_attr_put_null_string(msg, FM10K_TEST_MSG_STRING,\n \t\t\t\t\t test_str);\n-\tif (attr_flags & (1 << FM10K_TEST_MSG_MAC_ADDR))\n+\tif (attr_flags & BIT(FM10K_TEST_MSG_MAC_ADDR))\n \t\tfm10k_tlv_attr_put_mac_vlan(msg, FM10K_TEST_MSG_MAC_ADDR,\n \t\t\t\t\t test_mac, test_vlan);\n-\tif (attr_flags & (1 << FM10K_TEST_MSG_U8))\n+\tif (attr_flags & BIT(FM10K_TEST_MSG_U8))\n \t\tfm10k_tlv_attr_put_u8(msg, FM10K_TEST_MSG_U8, test_u8);\n-\tif (attr_flags & (1 << FM10K_TEST_MSG_U16))\n+\tif (attr_flags & BIT(FM10K_TEST_MSG_U16))\n \t\tfm10k_tlv_attr_put_u16(msg, FM10K_TEST_MSG_U16, test_u16);\n-\tif (attr_flags & (1 << FM10K_TEST_MSG_U32))\n+\tif (attr_flags & BIT(FM10K_TEST_MSG_U32))\n \t\tfm10k_tlv_attr_put_u32(msg, FM10K_TEST_MSG_U32, test_u32);\n-\tif (attr_flags & (1 << FM10K_TEST_MSG_U64))\n+\tif (attr_flags & BIT(FM10K_TEST_MSG_U64))\n \t\tfm10k_tlv_attr_put_u64(msg, FM10K_TEST_MSG_U64, test_u64);\n-\tif (attr_flags & (1 << FM10K_TEST_MSG_S8))\n+\tif (attr_flags & BIT(FM10K_TEST_MSG_S8))\n \t\tfm10k_tlv_attr_put_s8(msg, FM10K_TEST_MSG_S8, test_s8);\n-\tif (attr_flags & (1 << FM10K_TEST_MSG_S16))\n+\tif (attr_flags & BIT(FM10K_TEST_MSG_S16))\n \t\tfm10k_tlv_attr_put_s16(msg, FM10K_TEST_MSG_S16, test_s16);\n-\tif (attr_flags & (1 << FM10K_TEST_MSG_S32))\n+\tif (attr_flags & BIT(FM10K_TEST_MSG_S32))\n \t\tfm10k_tlv_attr_put_s32(msg, FM10K_TEST_MSG_S32, test_s32);\n-\tif (attr_flags & (1 << FM10K_TEST_MSG_S64))\n+\tif (attr_flags & BIT(FM10K_TEST_MSG_S64))\n \t\tfm10k_tlv_attr_put_s64(msg, FM10K_TEST_MSG_S64, test_s64);\n-\tif (attr_flags & (1 << FM10K_TEST_MSG_LE_STRUCT))\n+\tif (attr_flags & BIT(FM10K_TEST_MSG_LE_STRUCT))\n \t\tfm10k_tlv_attr_put_le_struct(msg, FM10K_TEST_MSG_LE_STRUCT,\n \t\t\t\t\t test_le, 8);\n }\ndiff --git a/drivers/net/ethernet/intel/fm10k/fm10k_type.h b/drivers/net/ethernet/intel/fm10k/fm10k_type.h\nindex 854ebb1..5c05330 100644\n--- a/drivers/net/ethernet/intel/fm10k/fm10k_type.h\n+++ b/drivers/net/ethernet/intel/fm10k/fm10k_type.h\n@@ -617,10 +617,10 @@ struct fm10k_vf_info {\n \t\t\t\t\t\t */\n };\n \n-#define FM10K_VF_FLAG_ALLMULTI_CAPABLE\t((u8)1 << FM10K_XCAST_MODE_ALLMULTI)\n-#define FM10K_VF_FLAG_MULTI_CAPABLE\t((u8)1 << FM10K_XCAST_MODE_MULTI)\n-#define FM10K_VF_FLAG_PROMISC_CAPABLE\t((u8)1 << FM10K_XCAST_MODE_PROMISC)\n-#define FM10K_VF_FLAG_NONE_CAPABLE\t((u8)1 << FM10K_XCAST_MODE_NONE)\n+#define FM10K_VF_FLAG_ALLMULTI_CAPABLE\t(u8)(BIT(FM10K_XCAST_MODE_ALLMULTI))\n+#define FM10K_VF_FLAG_MULTI_CAPABLE\t(u8)(BIT(FM10K_XCAST_MODE_MULTI))\n+#define FM10K_VF_FLAG_PROMISC_CAPABLE\t(u8)(BIT(FM10K_XCAST_MODE_PROMISC))\n+#define FM10K_VF_FLAG_NONE_CAPABLE\t(u8)(BIT(FM10K_XCAST_MODE_NONE))\n #define FM10K_VF_FLAG_CAPABLE(vf_info)\t((vf_info)->vf_flags & (u8)0xF)\n #define FM10K_VF_FLAG_ENABLED(vf_info)\t((vf_info)->vf_flags >> 4)\n #define FM10K_VF_FLAG_SET_MODE(mode)\t((u8)0x10 << (mode))\n", "prefixes": [ "next-queue", "2/2" ] }