Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1048617/?format=api
{ "id": 1048617, "url": "http://patchwork.ozlabs.org/api/patches/1048617/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20190227003523.28733-6-anirudh.venkataramanan@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": "<20190227003523.28733-6-anirudh.venkataramanan@intel.com>", "list_archive_url": null, "date": "2019-02-27T00:35:11", "name": "[S13,v2,05/17] ice: fix some function prototype and signature style issues", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "c768ac844adf1fde35006c0dba8333c77e29179f", "submitter": { "id": 73601, "url": "http://patchwork.ozlabs.org/api/people/73601/?format=api", "name": "Anirudh Venkataramanan", "email": "anirudh.venkataramanan@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/20190227003523.28733-6-anirudh.venkataramanan@intel.com/mbox/", "series": [ { "id": 94355, "url": "http://patchwork.ozlabs.org/api/series/94355/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=94355", "date": "2019-02-27T00:35:10", "name": "Bug fixes and minor feature updates for ice", "version": 2, "mbox": "http://patchwork.ozlabs.org/series/94355/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1048617/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1048617/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<intel-wired-lan-bounces@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" ], "Authentication-Results": [ "ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=osuosl.org\n\t(client-ip=140.211.166.133; helo=hemlock.osuosl.org;\n\tenvelope-from=intel-wired-lan-bounces@osuosl.org;\n\treceiver=<UNKNOWN>)", "ozlabs.org;\n\tdmarc=fail (p=none dis=none) header.from=intel.com" ], "Received": [ "from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256\n\tbits)) (No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 448Gtg2Hdlz9s9y\n\tfor <incoming@patchwork.ozlabs.org>;\n\tWed, 27 Feb 2019 11:35:39 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id EB21386FB0;\n\tWed, 27 Feb 2019 00:35:37 +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 Uk6noi-Ea0DU; Wed, 27 Feb 2019 00:35:33 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 59E0387216;\n\tWed, 27 Feb 2019 00:35:33 +0000 (UTC)", "from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n\tby ash.osuosl.org (Postfix) with ESMTP id 7D1A81BF2A0\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 27 Feb 2019 00:35:29 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 7A5C78559F\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 27 Feb 2019 00:35:29 +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 RTnU86ugM2Kg for <intel-wired-lan@lists.osuosl.org>;\n\tWed, 27 Feb 2019 00:35:25 +0000 (UTC)", "from mga12.intel.com (mga12.intel.com [192.55.52.136])\n\tby whitealder.osuosl.org (Postfix) with ESMTPS id C21B585682\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 27 Feb 2019 00:35:24 +0000 (UTC)", "from fmsmga001.fm.intel.com ([10.253.24.23])\n\tby fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t26 Feb 2019 16:35:24 -0800", "from shasta.jf.intel.com ([10.166.241.11])\n\tby fmsmga001.fm.intel.com with ESMTP; 26 Feb 2019 16:35:24 -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-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.58,417,1544515200\"; d=\"scan'208\";a=\"150284164\"", "From": "Anirudh Venkataramanan <anirudh.venkataramanan@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Tue, 26 Feb 2019 16:35:11 -0800", "Message-Id": "<20190227003523.28733-6-anirudh.venkataramanan@intel.com>", "X-Mailer": "git-send-email 2.14.5", "In-Reply-To": "<20190227003523.28733-1-anirudh.venkataramanan@intel.com>", "References": "<20190227003523.28733-1-anirudh.venkataramanan@intel.com>", "Subject": "[Intel-wired-lan] [PATCH S13 v2 05/17] ice: fix some function\n\tprototype and signature style issues", "X-BeenThere": "intel-wired-lan@osuosl.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "Intel Wired Ethernet Linux Kernel Driver Development\n\t<intel-wired-lan.osuosl.org>", "List-Unsubscribe": "<https://lists.osuosl.org/mailman/options/intel-wired-lan>, \n\t<mailto:intel-wired-lan-request@osuosl.org?subject=unsubscribe>", "List-Archive": "<http://lists.osuosl.org/pipermail/intel-wired-lan/>", "List-Post": "<mailto:intel-wired-lan@osuosl.org>", "List-Help": "<mailto:intel-wired-lan-request@osuosl.org?subject=help>", "List-Subscribe": "<https://lists.osuosl.org/mailman/listinfo/intel-wired-lan>, \n\t<mailto:intel-wired-lan-request@osuosl.org?subject=subscribe>", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=\"us-ascii\"", "Content-Transfer-Encoding": "7bit", "Errors-To": "intel-wired-lan-bounces@osuosl.org", "Sender": "\"Intel-wired-lan\" <intel-wired-lan-bounces@osuosl.org>" }, "content": "From: Bruce Allan <bruce.w.allan@intel.com>\n\nPut the return type on a separate line for function prototypes and\nsignatures that would exceed the 80-character limit if both were on\nthe same line.\n\nSigned-off-by: Bruce Allan <bruce.w.allan@intel.com>\nSigned-off-by: Anirudh Venkataramanan <anirudh.venkataramanan@intel.com>\n---\n[Anirudh Venkataramanan <anirudh.venkataramanan@intel.com> cleaned up commit message]\n---\n drivers/net/ethernet/intel/ice/ice.h | 5 ++-\n drivers/net/ethernet/intel/ice/ice_common.c | 35 +++++++++--------\n drivers/net/ethernet/intel/ice/ice_common.h | 18 +++++----\n drivers/net/ethernet/intel/ice/ice_ethtool.c | 25 +++++++-----\n drivers/net/ethernet/intel/ice/ice_lib.c | 5 ++-\n drivers/net/ethernet/intel/ice/ice_main.c | 34 +++++++++--------\n drivers/net/ethernet/intel/ice/ice_switch.c | 4 +-\n drivers/net/ethernet/intel/ice/ice_switch.h | 3 +-\n drivers/net/ethernet/intel/ice/ice_txrx.c | 48 ++++++++++++------------\n drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c | 9 +++--\n drivers/net/ethernet/intel/ice/ice_virtchnl_pf.h | 9 +++--\n 11 files changed, 108 insertions(+), 87 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/ice/ice.h b/drivers/net/ethernet/intel/ice/ice.h\nindex 38a5aafb8840..2bb2898efb82 100644\n--- a/drivers/net/ethernet/intel/ice/ice.h\n+++ b/drivers/net/ethernet/intel/ice/ice.h\n@@ -367,8 +367,9 @@ struct ice_netdev_priv {\n * @vsi: pointer to vsi struct, can be NULL\n * @q_vector: pointer to q_vector, can be NULL\n */\n-static inline void ice_irq_dynamic_ena(struct ice_hw *hw, struct ice_vsi *vsi,\n-\t\t\t\t struct ice_q_vector *q_vector)\n+static inline void\n+ice_irq_dynamic_ena(struct ice_hw *hw, struct ice_vsi *vsi,\n+\t\t struct ice_q_vector *q_vector)\n {\n \tu32 vector = (vsi && q_vector) ? vsi->hw_base_vector + q_vector->v_idx :\n \t\t\t\t((struct ice_pf *)hw->back)->hw_oicr_idx;\ndiff --git a/drivers/net/ethernet/intel/ice/ice_common.c b/drivers/net/ethernet/intel/ice/ice_common.c\nindex db6ec77506df..06a1a2cb5358 100644\n--- a/drivers/net/ethernet/intel/ice/ice_common.c\n+++ b/drivers/net/ethernet/intel/ice/ice_common.c\n@@ -1100,8 +1100,9 @@ const struct ice_ctx_ele ice_tlan_ctx_info[] = {\n *\n * Dumps debug log about control command with descriptor contents.\n */\n-void ice_debug_cq(struct ice_hw *hw, u32 __maybe_unused mask, void *desc,\n-\t\t void *buf, u16 buf_len)\n+void\n+ice_debug_cq(struct ice_hw *hw, u32 __maybe_unused mask, void *desc, void *buf,\n+\t u16 buf_len)\n {\n \tstruct ice_aq_desc *cq_desc = (struct ice_aq_desc *)desc;\n \tu16 len;\n@@ -1620,8 +1621,8 @@ ice_aq_discover_caps(struct ice_hw *hw, void *buf, u16 buf_size, u32 *cap_count,\n * @hw: pointer to the hardware structure\n * @opc: capabilities type to discover - pass in the command opcode\n */\n-static enum ice_status ice_discover_caps(struct ice_hw *hw,\n-\t\t\t\t\t enum ice_adminq_opc opc)\n+static enum ice_status\n+ice_discover_caps(struct ice_hw *hw, enum ice_adminq_opc opc)\n {\n \tenum ice_status status;\n \tu32 cap_count;\n@@ -2548,8 +2549,8 @@ ice_aq_dis_lan_txq(struct ice_hw *hw, u8 num_qgrps,\n * @dest_ctx: the context to be written to\n * @ce_info: a description of the struct to be filled\n */\n-static void ice_write_byte(u8 *src_ctx, u8 *dest_ctx,\n-\t\t\t const struct ice_ctx_ele *ce_info)\n+static void\n+ice_write_byte(u8 *src_ctx, u8 *dest_ctx, const struct ice_ctx_ele *ce_info)\n {\n \tu8 src_byte, dest_byte, mask;\n \tu8 *from, *dest;\n@@ -2587,8 +2588,8 @@ static void ice_write_byte(u8 *src_ctx, u8 *dest_ctx,\n * @dest_ctx: the context to be written to\n * @ce_info: a description of the struct to be filled\n */\n-static void ice_write_word(u8 *src_ctx, u8 *dest_ctx,\n-\t\t\t const struct ice_ctx_ele *ce_info)\n+static void\n+ice_write_word(u8 *src_ctx, u8 *dest_ctx, const struct ice_ctx_ele *ce_info)\n {\n \tu16 src_word, mask;\n \t__le16 dest_word;\n@@ -2630,8 +2631,8 @@ static void ice_write_word(u8 *src_ctx, u8 *dest_ctx,\n * @dest_ctx: the context to be written to\n * @ce_info: a description of the struct to be filled\n */\n-static void ice_write_dword(u8 *src_ctx, u8 *dest_ctx,\n-\t\t\t const struct ice_ctx_ele *ce_info)\n+static void\n+ice_write_dword(u8 *src_ctx, u8 *dest_ctx, const struct ice_ctx_ele *ce_info)\n {\n \tu32 src_dword, mask;\n \t__le32 dest_dword;\n@@ -2681,8 +2682,8 @@ static void ice_write_dword(u8 *src_ctx, u8 *dest_ctx,\n * @dest_ctx: the context to be written to\n * @ce_info: a description of the struct to be filled\n */\n-static void ice_write_qword(u8 *src_ctx, u8 *dest_ctx,\n-\t\t\t const struct ice_ctx_ele *ce_info)\n+static void\n+ice_write_qword(u8 *src_ctx, u8 *dest_ctx, const struct ice_ctx_ele *ce_info)\n {\n \tu64 src_qword, mask;\n \t__le64 dest_qword;\n@@ -3026,8 +3027,9 @@ void ice_replay_post(struct ice_hw *hw)\n * @prev_stat: ptr to previous loaded stat value\n * @cur_stat: ptr to current stat value\n */\n-void ice_stat_update40(struct ice_hw *hw, u32 hireg, u32 loreg,\n-\t\t bool prev_stat_loaded, u64 *prev_stat, u64 *cur_stat)\n+void\n+ice_stat_update40(struct ice_hw *hw, u32 hireg, u32 loreg,\n+\t\t bool prev_stat_loaded, u64 *prev_stat, u64 *cur_stat)\n {\n \tu64 new_data;\n \n@@ -3057,8 +3059,9 @@ void ice_stat_update40(struct ice_hw *hw, u32 hireg, u32 loreg,\n * @prev_stat: ptr to previous loaded stat value\n * @cur_stat: ptr to current stat value\n */\n-void ice_stat_update32(struct ice_hw *hw, u32 reg, bool prev_stat_loaded,\n-\t\t u64 *prev_stat, u64 *cur_stat)\n+void\n+ice_stat_update32(struct ice_hw *hw, u32 reg, bool prev_stat_loaded,\n+\t\t u64 *prev_stat, u64 *cur_stat)\n {\n \tu32 new_data;\n \ndiff --git a/drivers/net/ethernet/intel/ice/ice_common.h b/drivers/net/ethernet/intel/ice/ice_common.h\nindex d7c7c2ed8823..38578f7c3622 100644\n--- a/drivers/net/ethernet/intel/ice/ice_common.h\n+++ b/drivers/net/ethernet/intel/ice/ice_common.h\n@@ -9,8 +9,8 @@\n #include \"ice_switch.h\"\n #include <linux/avf/virtchnl.h>\n \n-void ice_debug_cq(struct ice_hw *hw, u32 mask, void *desc, void *buf,\n-\t\t u16 buf_len);\n+void\n+ice_debug_cq(struct ice_hw *hw, u32 mask, void *desc, void *buf, u16 buf_len);\n enum ice_status ice_init_hw(struct ice_hw *hw);\n void ice_deinit_hw(struct ice_hw *hw);\n enum ice_status ice_check_reset(struct ice_hw *hw);\n@@ -28,8 +28,8 @@ ice_acquire_res(struct ice_hw *hw, enum ice_aq_res_ids res,\n \t\tenum ice_aq_res_access_type access, u32 timeout);\n void ice_release_res(struct ice_hw *hw, enum ice_aq_res_ids res);\n enum ice_status ice_init_nvm(struct ice_hw *hw);\n-enum ice_status ice_read_sr_buf(struct ice_hw *hw, u16 offset, u16 *words,\n-\t\t\t\tu16 *data);\n+enum ice_status\n+ice_read_sr_buf(struct ice_hw *hw, u16 offset, u16 *words, u16 *data);\n enum ice_status\n ice_sq_send_cmd(struct ice_hw *hw, struct ice_ctl_q_info *cq,\n \t\tstruct ice_aq_desc *desc, void *buf, u16 buf_size,\n@@ -106,8 +106,10 @@ ice_ena_vsi_txq(struct ice_port_info *pi, u16 vsi_handle, u8 tc, u8 num_qgrps,\n enum ice_status ice_replay_vsi(struct ice_hw *hw, u16 vsi_handle);\n void ice_replay_post(struct ice_hw *hw);\n void ice_output_fw_log(struct ice_hw *hw, struct ice_aq_desc *desc, void *buf);\n-void ice_stat_update40(struct ice_hw *hw, u32 hireg, u32 loreg,\n-\t\t bool prev_stat_loaded, u64 *prev_stat, u64 *cur_stat);\n-void ice_stat_update32(struct ice_hw *hw, u32 reg, bool prev_stat_loaded,\n-\t\t u64 *prev_stat, u64 *cur_stat);\n+void\n+ice_stat_update40(struct ice_hw *hw, u32 hireg, u32 loreg,\n+\t\t bool prev_stat_loaded, u64 *prev_stat, u64 *cur_stat);\n+void\n+ice_stat_update32(struct ice_hw *hw, u32 reg, bool prev_stat_loaded,\n+\t\t u64 *prev_stat, u64 *cur_stat);\n #endif /* _ICE_COMMON_H_ */\ndiff --git a/drivers/net/ethernet/intel/ice/ice_ethtool.c b/drivers/net/ethernet/intel/ice/ice_ethtool.c\nindex 1bb333c3fdc5..4a1920e8f168 100644\n--- a/drivers/net/ethernet/intel/ice/ice_ethtool.c\n+++ b/drivers/net/ethernet/intel/ice/ice_ethtool.c\n@@ -1156,8 +1156,9 @@ ice_get_settings_link_down(struct ethtool_link_ksettings *ks,\n *\n * Reports speed/duplex settings based on media_type\n */\n-static int ice_get_link_ksettings(struct net_device *netdev,\n-\t\t\t\t struct ethtool_link_ksettings *ks)\n+static int\n+ice_get_link_ksettings(struct net_device *netdev,\n+\t\t struct ethtool_link_ksettings *ks)\n {\n \tstruct ice_netdev_priv *np = netdev_priv(netdev);\n \tstruct ice_link_status *hw_link_info;\n@@ -1565,8 +1566,9 @@ ice_set_link_ksettings(struct net_device *netdev,\n *\n * Returns Success if the command is supported.\n */\n-static int ice_get_rxnfc(struct net_device *netdev, struct ethtool_rxnfc *cmd,\n-\t\t\t u32 __always_unused *rule_locs)\n+static int\n+ice_get_rxnfc(struct net_device *netdev, struct ethtool_rxnfc *cmd,\n+\t u32 __always_unused *rule_locs)\n {\n \tstruct ice_netdev_priv *np = netdev_priv(netdev);\n \tstruct ice_vsi *vsi = np->vsi;\n@@ -2023,8 +2025,9 @@ ice_get_rxfh(struct net_device *netdev, u32 *indir, u8 *key, u8 *hfunc)\n * Returns -EINVAL if the table specifies an invalid queue id, otherwise\n * returns 0 after programming the table.\n */\n-static int ice_set_rxfh(struct net_device *netdev, const u32 *indir,\n-\t\t\tconst u8 *key, const u8 hfunc)\n+static int\n+ice_set_rxfh(struct net_device *netdev, const u32 *indir, const u8 *key,\n+\t const u8 hfunc)\n {\n \tstruct ice_netdev_priv *np = netdev_priv(netdev);\n \tstruct ice_vsi *vsi = np->vsi;\n@@ -2179,8 +2182,9 @@ ice_get_coalesce(struct net_device *netdev, struct ethtool_coalesce *ec)\n \treturn __ice_get_coalesce(netdev, ec, -1);\n }\n \n-static int ice_get_per_q_coalesce(struct net_device *netdev, u32 q_num,\n-\t\t\t\t struct ethtool_coalesce *ec)\n+static int\n+ice_get_per_q_coalesce(struct net_device *netdev, u32 q_num,\n+\t\t struct ethtool_coalesce *ec)\n {\n \treturn __ice_get_coalesce(netdev, ec, q_num);\n }\n@@ -2324,8 +2328,9 @@ ice_set_coalesce(struct net_device *netdev, struct ethtool_coalesce *ec)\n \treturn __ice_set_coalesce(netdev, ec, -1);\n }\n \n-static int ice_set_per_q_coalesce(struct net_device *netdev, u32 q_num,\n-\t\t\t\t struct ethtool_coalesce *ec)\n+static int\n+ice_set_per_q_coalesce(struct net_device *netdev, u32 q_num,\n+\t\t struct ethtool_coalesce *ec)\n {\n \treturn __ice_set_coalesce(netdev, ec, q_num);\n }\ndiff --git a/drivers/net/ethernet/intel/ice/ice_lib.c b/drivers/net/ethernet/intel/ice/ice_lib.c\nindex 5d364b79eb4d..87e57328a81b 100644\n--- a/drivers/net/ethernet/intel/ice/ice_lib.c\n+++ b/drivers/net/ethernet/intel/ice/ice_lib.c\n@@ -2107,8 +2107,9 @@ ice_vsi_stop_tx_rings(struct ice_vsi *vsi, enum ice_disq_rst_src rst_src,\n * @rst_src: reset source\n * @rel_vmvf_num: Relative id of VF/VM\n */\n-int ice_vsi_stop_lan_tx_rings(struct ice_vsi *vsi,\n-\t\t\t enum ice_disq_rst_src rst_src, u16 rel_vmvf_num)\n+int\n+ice_vsi_stop_lan_tx_rings(struct ice_vsi *vsi, enum ice_disq_rst_src rst_src,\n+\t\t\t u16 rel_vmvf_num)\n {\n \treturn ice_vsi_stop_tx_rings(vsi, rst_src, rel_vmvf_num, vsi->tx_rings,\n \t\t\t\t 0);\ndiff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c\nindex 3fb01eb4d19e..34712e38121e 100644\n--- a/drivers/net/ethernet/intel/ice/ice_main.c\n+++ b/drivers/net/ethernet/intel/ice/ice_main.c\n@@ -1113,8 +1113,9 @@ static void ice_set_ctrlq_len(struct ice_hw *hw)\n * This is a callback function used by the irq_set_affinity_notifier function\n * so that we may register to receive changes to the irq affinity masks.\n */\n-static void ice_irq_affinity_notify(struct irq_affinity_notify *notify,\n-\t\t\t\t const cpumask_t *mask)\n+static void\n+ice_irq_affinity_notify(struct irq_affinity_notify *notify,\n+\t\t\tconst cpumask_t *mask)\n {\n \tstruct ice_q_vector *q_vector =\n \t\tcontainer_of(notify, struct ice_q_vector, affinity_notify);\n@@ -1658,8 +1659,9 @@ ice_pf_vsi_setup(struct ice_pf *pf, struct ice_port_info *pi)\n *\n * net_device_ops implementation for adding vlan ids\n */\n-static int ice_vlan_rx_add_vid(struct net_device *netdev,\n-\t\t\t __always_unused __be16 proto, u16 vid)\n+static int\n+ice_vlan_rx_add_vid(struct net_device *netdev, __always_unused __be16 proto,\n+\t\t u16 vid)\n {\n \tstruct ice_netdev_priv *np = netdev_priv(netdev);\n \tstruct ice_vsi *vsi = np->vsi;\n@@ -1696,8 +1698,9 @@ static int ice_vlan_rx_add_vid(struct net_device *netdev,\n *\n * net_device_ops implementation for removing vlan ids\n */\n-static int ice_vlan_rx_kill_vid(struct net_device *netdev,\n-\t\t\t\t__always_unused __be16 proto, u16 vid)\n+static int\n+ice_vlan_rx_kill_vid(struct net_device *netdev, __always_unused __be16 proto,\n+\t\t u16 vid)\n {\n \tstruct ice_netdev_priv *np = netdev_priv(netdev);\n \tstruct ice_vsi *vsi = np->vsi;\n@@ -2057,8 +2060,8 @@ static void ice_verify_cacheline_size(struct ice_pf *pf)\n *\n * Returns 0 on success, negative on failure\n */\n-static int ice_probe(struct pci_dev *pdev,\n-\t\t const struct pci_device_id __always_unused *ent)\n+static int\n+ice_probe(struct pci_dev *pdev, const struct pci_device_id __always_unused *ent)\n {\n \tstruct device *dev = &pdev->dev;\n \tstruct ice_pf *pf;\n@@ -2493,9 +2496,10 @@ ice_fdb_add(struct ndmsg *ndm, struct nlattr __always_unused *tb[],\n * @addr: the MAC address entry being added\n * @vid: VLAN id\n */\n-static int ice_fdb_del(struct ndmsg *ndm, __always_unused struct nlattr *tb[],\n-\t\t struct net_device *dev, const unsigned char *addr,\n-\t\t __always_unused u16 vid)\n+static int\n+ice_fdb_del(struct ndmsg *ndm, __always_unused struct nlattr *tb[],\n+\t struct net_device *dev, const unsigned char *addr,\n+\t __always_unused u16 vid)\n {\n \tint err;\n \n@@ -2519,8 +2523,8 @@ static int ice_fdb_del(struct ndmsg *ndm, __always_unused struct nlattr *tb[],\n * @netdev: ptr to the netdev being adjusted\n * @features: the feature set that the stack is suggesting\n */\n-static int ice_set_features(struct net_device *netdev,\n-\t\t\t netdev_features_t features)\n+static int\n+ice_set_features(struct net_device *netdev, netdev_features_t features)\n {\n \tstruct ice_netdev_priv *np = netdev_priv(netdev);\n \tstruct ice_vsi *vsi = np->vsi;\n@@ -2674,8 +2678,8 @@ int ice_up(struct ice_vsi *vsi)\n * This function fetches stats from the ring considering the atomic operations\n * that needs to be performed to read u64 values in 32 bit machine.\n */\n-static void ice_fetch_u64_stats_per_ring(struct ice_ring *ring, u64 *pkts,\n-\t\t\t\t\t u64 *bytes)\n+static void\n+ice_fetch_u64_stats_per_ring(struct ice_ring *ring, u64 *pkts, u64 *bytes)\n {\n \tunsigned int start;\n \t*pkts = 0;\ndiff --git a/drivers/net/ethernet/intel/ice/ice_switch.c b/drivers/net/ethernet/intel/ice/ice_switch.c\nindex 2a30caef6687..cf5bada75a7e 100644\n--- a/drivers/net/ethernet/intel/ice/ice_switch.c\n+++ b/drivers/net/ethernet/intel/ice/ice_switch.c\n@@ -322,8 +322,8 @@ struct ice_vsi_ctx *ice_get_vsi_ctx(struct ice_hw *hw, u16 vsi_handle)\n *\n * save the VSI context entry for a given VSI handle\n */\n-static void ice_save_vsi_ctx(struct ice_hw *hw, u16 vsi_handle,\n-\t\t\t struct ice_vsi_ctx *vsi)\n+static void\n+ice_save_vsi_ctx(struct ice_hw *hw, u16 vsi_handle, struct ice_vsi_ctx *vsi)\n {\n \thw->vsi_ctx[vsi_handle] = vsi;\n }\ndiff --git a/drivers/net/ethernet/intel/ice/ice_switch.h b/drivers/net/ethernet/intel/ice/ice_switch.h\nindex d5ef0bd58bf9..2d3a2dfcb0de 100644\n--- a/drivers/net/ethernet/intel/ice/ice_switch.h\n+++ b/drivers/net/ethernet/intel/ice/ice_switch.h\n@@ -199,7 +199,8 @@ enum ice_status ice_update_sw_rule_bridge_mode(struct ice_hw *hw);\n enum ice_status ice_add_mac(struct ice_hw *hw, struct list_head *m_lst);\n enum ice_status ice_remove_mac(struct ice_hw *hw, struct list_head *m_lst);\n void ice_remove_vsi_fltr(struct ice_hw *hw, u16 vsi_handle);\n-enum ice_status ice_add_vlan(struct ice_hw *hw, struct list_head *m_list);\n+enum ice_status\n+ice_add_vlan(struct ice_hw *hw, struct list_head *m_list);\n enum ice_status ice_remove_vlan(struct ice_hw *hw, struct list_head *v_list);\n enum ice_status\n ice_cfg_dflt_vsi(struct ice_hw *hw, u16 vsi_handle, bool set, u8 direction);\ndiff --git a/drivers/net/ethernet/intel/ice/ice_txrx.c b/drivers/net/ethernet/intel/ice/ice_txrx.c\nindex fad308c936b2..64baedee6336 100644\n--- a/drivers/net/ethernet/intel/ice/ice_txrx.c\n+++ b/drivers/net/ethernet/intel/ice/ice_txrx.c\n@@ -100,8 +100,8 @@ void ice_free_tx_ring(struct ice_ring *tx_ring)\n *\n * Returns true if there's any budget left (e.g. the clean is finished)\n */\n-static bool ice_clean_tx_irq(struct ice_vsi *vsi, struct ice_ring *tx_ring,\n-\t\t\t int napi_budget)\n+static bool\n+ice_clean_tx_irq(struct ice_vsi *vsi, struct ice_ring *tx_ring, int napi_budget)\n {\n \tunsigned int total_bytes = 0, total_pkts = 0;\n \tunsigned int budget = vsi->work_lmt;\n@@ -389,8 +389,8 @@ static void ice_release_rx_desc(struct ice_ring *rx_ring, u32 val)\n * Returns true if the page was successfully allocated or\n * reused.\n */\n-static bool ice_alloc_mapped_page(struct ice_ring *rx_ring,\n-\t\t\t\t struct ice_rx_buf *bi)\n+static bool\n+ice_alloc_mapped_page(struct ice_ring *rx_ring, struct ice_rx_buf *bi)\n {\n \tstruct page *page = bi->page;\n \tdma_addr_t dma;\n@@ -510,9 +510,9 @@ static bool ice_page_is_reserved(struct page *page)\n * The function will then update the page offset if necessary and return\n * true if the buffer can be reused by the adapter.\n */\n-static bool ice_add_rx_frag(struct ice_rx_buf *rx_buf,\n-\t\t\t union ice_32b_rx_flex_desc *rx_desc,\n-\t\t\t struct sk_buff *skb)\n+static bool\n+ice_add_rx_frag(struct ice_rx_buf *rx_buf, union ice_32b_rx_flex_desc *rx_desc,\n+\t\tstruct sk_buff *skb)\n {\n #if (PAGE_SIZE < 8192)\n \tunsigned int truesize = ICE_RXBUF_2048;\n@@ -587,8 +587,8 @@ static bool ice_add_rx_frag(struct ice_rx_buf *rx_buf,\n *\n * Synchronizes page for reuse by the adapter\n */\n-static void ice_reuse_rx_page(struct ice_ring *rx_ring,\n-\t\t\t struct ice_rx_buf *old_buf)\n+static void\n+ice_reuse_rx_page(struct ice_ring *rx_ring, struct ice_rx_buf *old_buf)\n {\n \tu16 nta = rx_ring->next_to_alloc;\n \tstruct ice_rx_buf *new_buf;\n@@ -613,8 +613,8 @@ static void ice_reuse_rx_page(struct ice_ring *rx_ring,\n * correctly, as well as handling calling the page recycle function if\n * necessary.\n */\n-static struct sk_buff *ice_fetch_rx_buf(struct ice_ring *rx_ring,\n-\t\t\t\t\tunion ice_32b_rx_flex_desc *rx_desc)\n+static struct sk_buff *\n+ice_fetch_rx_buf(struct ice_ring *rx_ring, union ice_32b_rx_flex_desc *rx_desc)\n {\n \tstruct ice_rx_buf *rx_buf;\n \tstruct sk_buff *skb;\n@@ -751,8 +751,8 @@ static bool ice_cleanup_headers(struct sk_buff *skb)\n * The status_error_len doesn't need to be shifted because it begins\n * at offset zero.\n */\n-static bool ice_test_staterr(union ice_32b_rx_flex_desc *rx_desc,\n-\t\t\t const u16 stat_err_bits)\n+static bool\n+ice_test_staterr(union ice_32b_rx_flex_desc *rx_desc, const u16 stat_err_bits)\n {\n \treturn !!(rx_desc->wb.status_error0 &\n \t\t cpu_to_le16(stat_err_bits));\n@@ -769,9 +769,9 @@ static bool ice_test_staterr(union ice_32b_rx_flex_desc *rx_desc,\n * sk_buff in the next buffer to be chained and return true indicating\n * that this is in fact a non-EOP buffer.\n */\n-static bool ice_is_non_eop(struct ice_ring *rx_ring,\n-\t\t\t union ice_32b_rx_flex_desc *rx_desc,\n-\t\t\t struct sk_buff *skb)\n+static bool\n+ice_is_non_eop(struct ice_ring *rx_ring, union ice_32b_rx_flex_desc *rx_desc,\n+\t struct sk_buff *skb)\n {\n \tu32 ntc = rx_ring->next_to_clean + 1;\n \n@@ -838,8 +838,9 @@ ice_rx_hash(struct ice_ring *rx_ring, union ice_32b_rx_flex_desc *rx_desc,\n *\n * skb->protocol must be set before this function is called\n */\n-static void ice_rx_csum(struct ice_vsi *vsi, struct sk_buff *skb,\n-\t\t\tunion ice_32b_rx_flex_desc *rx_desc, u8 ptype)\n+static void\n+ice_rx_csum(struct ice_vsi *vsi, struct sk_buff *skb,\n+\t union ice_32b_rx_flex_desc *rx_desc, u8 ptype)\n {\n \tstruct ice_rx_ptype_decoded decoded;\n \tu32 rx_error, rx_status;\n@@ -909,9 +910,10 @@ static void ice_rx_csum(struct ice_vsi *vsi, struct sk_buff *skb,\n * order to populate the hash, checksum, VLAN, protocol, and\n * other fields within the skb.\n */\n-static void ice_process_skb_fields(struct ice_ring *rx_ring,\n-\t\t\t\t union ice_32b_rx_flex_desc *rx_desc,\n-\t\t\t\t struct sk_buff *skb, u8 ptype)\n+static void\n+ice_process_skb_fields(struct ice_ring *rx_ring,\n+\t\t union ice_32b_rx_flex_desc *rx_desc,\n+\t\t struct sk_buff *skb, u8 ptype)\n {\n \tice_rx_hash(rx_ring, rx_desc, skb, ptype);\n \n@@ -930,8 +932,8 @@ static void ice_process_skb_fields(struct ice_ring *rx_ring,\n * This function sends the completed packet (via. skb) up the stack using\n * gro receive functions (with/without vlan tag)\n */\n-static void ice_receive_skb(struct ice_ring *rx_ring, struct sk_buff *skb,\n-\t\t\t u16 vlan_tag)\n+static void\n+ice_receive_skb(struct ice_ring *rx_ring, struct sk_buff *skb, u16 vlan_tag)\n {\n \tif ((rx_ring->netdev->features & NETIF_F_HW_VLAN_CTAG_RX) &&\n \t (vlan_tag & VLAN_VID_MASK)) {\ndiff --git a/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c b/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c\nindex c4f2bea0b670..62201977b074 100644\n--- a/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c\n+++ b/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c\n@@ -1227,8 +1227,9 @@ static void ice_vc_dis_vf(struct ice_vf *vf)\n *\n * send msg to VF\n */\n-static int ice_vc_send_msg_to_vf(struct ice_vf *vf, u32 v_opcode,\n-\t\t\t\t enum ice_status v_retval, u8 *msg, u16 msglen)\n+static int\n+ice_vc_send_msg_to_vf(struct ice_vf *vf, u32 v_opcode, enum ice_status v_retval,\n+\t\t u8 *msg, u16 msglen)\n {\n \tenum ice_status aq_ret;\n \tstruct ice_pf *pf;\n@@ -2498,8 +2499,8 @@ void ice_vc_process_vf_msg(struct ice_pf *pf, struct ice_rq_event_info *event)\n *\n * return VF configuration\n */\n-int ice_get_vf_cfg(struct net_device *netdev, int vf_id,\n-\t\t struct ifla_vf_info *ivi)\n+int\n+ice_get_vf_cfg(struct net_device *netdev, int vf_id, struct ifla_vf_info *ivi)\n {\n \tstruct ice_netdev_priv *np = netdev_priv(netdev);\n \tstruct ice_vsi *vsi = np->vsi;\ndiff --git a/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.h b/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.h\nindex b1d28ec11058..932e2ab3380b 100644\n--- a/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.h\n+++ b/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.h\n@@ -78,8 +78,8 @@ struct ice_vf {\n void ice_process_vflr_event(struct ice_pf *pf);\n int ice_sriov_configure(struct pci_dev *pdev, int num_vfs);\n int ice_set_vf_mac(struct net_device *netdev, int vf_id, u8 *mac);\n-int ice_get_vf_cfg(struct net_device *netdev, int vf_id,\n-\t\t struct ifla_vf_info *ivi);\n+int\n+ice_get_vf_cfg(struct net_device *netdev, int vf_id, struct ifla_vf_info *ivi);\n \n void ice_free_vfs(struct ice_pf *pf);\n void ice_vc_process_vf_msg(struct ice_pf *pf, struct ice_rq_event_info *event);\n@@ -87,8 +87,9 @@ void ice_vc_notify_link_state(struct ice_pf *pf);\n void ice_vc_notify_reset(struct ice_pf *pf);\n bool ice_reset_all_vfs(struct ice_pf *pf, bool is_vflr);\n \n-int ice_set_vf_port_vlan(struct net_device *netdev, int vf_id,\n-\t\t\t u16 vlan_id, u8 qos, __be16 vlan_proto);\n+int\n+ice_set_vf_port_vlan(struct net_device *netdev, int vf_id, u16 vlan_id, u8 qos,\n+\t\t __be16 vlan_proto);\n \n int ice_set_vf_trust(struct net_device *netdev, int vf_id, bool trusted);\n \n", "prefixes": [ "S13", "v2", "05/17" ] }