Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c8b7abdd authored by Bruce Allan's avatar Bruce Allan Committed by Jeff Kirsher
Browse files

ice: fix some function prototype and signature style issues 



Put the return type on a separate line for function prototypes and
signatures that would exceed the 80-character limit if both were on
the same line.

Signed-off-by: default avatarBruce Allan <bruce.w.allan@intel.com>
Signed-off-by: default avatarAnirudh Venkataramanan <anirudh.venkataramanan@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 60dcc39e

drivers/net/ethernet/intel/ice/ice.h

+3 −2
Original line number Diff line number Diff line
@@ -367,7 +367,8 @@ struct ice_netdev_priv { 
 * @vsi: pointer to vsi struct, can be NULL

 * @q_vector: pointer to q_vector, can be NULL

 */

static inline void ice_irq_dynamic_ena(struct ice_hw *hw, struct ice_vsi *vsi,

static inline void

ice_irq_dynamic_ena(struct ice_hw *hw, struct ice_vsi *vsi,

		    struct ice_q_vector *q_vector)

{

	u32 vector = (vsi && q_vector) ? vsi->hw_base_vector + q_vector->v_idx :

drivers/net/ethernet/intel/ice/ice_common.c

+19 −16
Original line number Diff line number Diff line
@@ -1100,8 +1100,9 @@ const struct ice_ctx_ele ice_tlan_ctx_info[] = { 
 *

 * Dumps debug log about control command with descriptor contents.

 */

void ice_debug_cq(struct ice_hw *hw, u32 __maybe_unused mask, void *desc,

		  void *buf, u16 buf_len)

void

ice_debug_cq(struct ice_hw *hw, u32 __maybe_unused mask, void *desc, void *buf,

	     u16 buf_len)

{

	struct ice_aq_desc *cq_desc = (struct ice_aq_desc *)desc;

	u16 len;
@@ -1620,8 +1621,8 @@ ice_aq_discover_caps(struct ice_hw *hw, void *buf, u16 buf_size, u32 *cap_count, 
 * @hw: pointer to the hardware structure

 * @opc: capabilities type to discover - pass in the command opcode

 */

static enum ice_status ice_discover_caps(struct ice_hw *hw,

					 enum ice_adminq_opc opc)

static enum ice_status

ice_discover_caps(struct ice_hw *hw, enum ice_adminq_opc opc)

{

	enum ice_status status;

	u32 cap_count;
@@ -2548,8 +2549,8 @@ ice_aq_dis_lan_txq(struct ice_hw *hw, u8 num_qgrps, 
 * @dest_ctx: the context to be written to

 * @ce_info:  a description of the struct to be filled

 */

static void ice_write_byte(u8 *src_ctx, u8 *dest_ctx,

			   const struct ice_ctx_ele *ce_info)

static void

ice_write_byte(u8 *src_ctx, u8 *dest_ctx, const struct ice_ctx_ele *ce_info)

{

	u8 src_byte, dest_byte, mask;

	u8 *from, *dest;
@@ -2587,8 +2588,8 @@ static void ice_write_byte(u8 *src_ctx, u8 *dest_ctx, 
 * @dest_ctx: the context to be written to

 * @ce_info:  a description of the struct to be filled

 */

static void ice_write_word(u8 *src_ctx, u8 *dest_ctx,

			   const struct ice_ctx_ele *ce_info)

static void

ice_write_word(u8 *src_ctx, u8 *dest_ctx, const struct ice_ctx_ele *ce_info)

{

	u16 src_word, mask;

	__le16 dest_word;
@@ -2630,8 +2631,8 @@ static void ice_write_word(u8 *src_ctx, u8 *dest_ctx, 
 * @dest_ctx: the context to be written to

 * @ce_info:  a description of the struct to be filled

 */

static void ice_write_dword(u8 *src_ctx, u8 *dest_ctx,

			    const struct ice_ctx_ele *ce_info)

static void

ice_write_dword(u8 *src_ctx, u8 *dest_ctx, const struct ice_ctx_ele *ce_info)

{

	u32 src_dword, mask;

	__le32 dest_dword;
@@ -2681,8 +2682,8 @@ static void ice_write_dword(u8 *src_ctx, u8 *dest_ctx, 
 * @dest_ctx: the context to be written to

 * @ce_info:  a description of the struct to be filled

 */

static void ice_write_qword(u8 *src_ctx, u8 *dest_ctx,

			    const struct ice_ctx_ele *ce_info)

static void

ice_write_qword(u8 *src_ctx, u8 *dest_ctx, const struct ice_ctx_ele *ce_info)

{

	u64 src_qword, mask;

	__le64 dest_qword;
@@ -3026,7 +3027,8 @@ void ice_replay_post(struct ice_hw *hw) 
 * @prev_stat: ptr to previous loaded stat value

 * @cur_stat: ptr to current stat value

 */

void ice_stat_update40(struct ice_hw *hw, u32 hireg, u32 loreg,

void

ice_stat_update40(struct ice_hw *hw, u32 hireg, u32 loreg,

		  bool prev_stat_loaded, u64 *prev_stat, u64 *cur_stat)

{

	u64 new_data;
@@ -3057,7 +3059,8 @@ void ice_stat_update40(struct ice_hw *hw, u32 hireg, u32 loreg, 
 * @prev_stat: ptr to previous loaded stat value

 * @cur_stat: ptr to current stat value

 */

void ice_stat_update32(struct ice_hw *hw, u32 reg, bool prev_stat_loaded,

void

ice_stat_update32(struct ice_hw *hw, u32 reg, bool prev_stat_loaded,

		  u64 *prev_stat, u64 *cur_stat)

{

	u32 new_data;

drivers/net/ethernet/intel/ice/ice_common.h

+10 −8
Original line number Diff line number Diff line
@@ -9,8 +9,8 @@ 
#include "ice_switch.h"

#include <linux/avf/virtchnl.h>



void ice_debug_cq(struct ice_hw *hw, u32 mask, void *desc, void *buf,

		  u16 buf_len);

void

ice_debug_cq(struct ice_hw *hw, u32 mask, void *desc, void *buf, u16 buf_len);

enum ice_status ice_init_hw(struct ice_hw *hw);

void ice_deinit_hw(struct ice_hw *hw);

enum ice_status ice_check_reset(struct ice_hw *hw);
@@ -28,8 +28,8 @@ ice_acquire_res(struct ice_hw *hw, enum ice_aq_res_ids res, 
		enum ice_aq_res_access_type access, u32 timeout);

void ice_release_res(struct ice_hw *hw, enum ice_aq_res_ids res);

enum ice_status ice_init_nvm(struct ice_hw *hw);

enum ice_status ice_read_sr_buf(struct ice_hw *hw, u16 offset, u16 *words,

				u16 *data);

enum ice_status

ice_read_sr_buf(struct ice_hw *hw, u16 offset, u16 *words, u16 *data);

enum ice_status

ice_sq_send_cmd(struct ice_hw *hw, struct ice_ctl_q_info *cq,

		struct ice_aq_desc *desc, void *buf, u16 buf_size,
@@ -106,8 +106,10 @@ ice_ena_vsi_txq(struct ice_port_info *pi, u16 vsi_handle, u8 tc, u8 num_qgrps, 
enum ice_status ice_replay_vsi(struct ice_hw *hw, u16 vsi_handle);

void ice_replay_post(struct ice_hw *hw);

void ice_output_fw_log(struct ice_hw *hw, struct ice_aq_desc *desc, void *buf);

void ice_stat_update40(struct ice_hw *hw, u32 hireg, u32 loreg,

void

ice_stat_update40(struct ice_hw *hw, u32 hireg, u32 loreg,

		  bool prev_stat_loaded, u64 *prev_stat, u64 *cur_stat);

void ice_stat_update32(struct ice_hw *hw, u32 reg, bool prev_stat_loaded,

void

ice_stat_update32(struct ice_hw *hw, u32 reg, bool prev_stat_loaded,

		  u64 *prev_stat, u64 *cur_stat);

#endif /* _ICE_COMMON_H_ */

drivers/net/ethernet/intel/ice/ice_ethtool.c

+15 −10
Original line number Diff line number Diff line
@@ -1156,7 +1156,8 @@ ice_get_settings_link_down(struct ethtool_link_ksettings *ks, 
 *

 * Reports speed/duplex settings based on media_type

 */

static int ice_get_link_ksettings(struct net_device *netdev,

static int

ice_get_link_ksettings(struct net_device *netdev,

		       struct ethtool_link_ksettings *ks)

{

	struct ice_netdev_priv *np = netdev_priv(netdev);
@@ -1565,7 +1566,8 @@ ice_set_link_ksettings(struct net_device *netdev, 
 *

 * Returns Success if the command is supported.

 */

static int ice_get_rxnfc(struct net_device *netdev, struct ethtool_rxnfc *cmd,

static int

ice_get_rxnfc(struct net_device *netdev, struct ethtool_rxnfc *cmd,

	      u32 __always_unused *rule_locs)

{

	struct ice_netdev_priv *np = netdev_priv(netdev);
@@ -2023,8 +2025,9 @@ ice_get_rxfh(struct net_device *netdev, u32 *indir, u8 *key, u8 *hfunc) 
 * Returns -EINVAL if the table specifies an invalid queue id, otherwise

 * returns 0 after programming the table.

 */

static int ice_set_rxfh(struct net_device *netdev, const u32 *indir,

			const u8 *key, const u8 hfunc)

static int

ice_set_rxfh(struct net_device *netdev, const u32 *indir, const u8 *key,

	     const u8 hfunc)

{

	struct ice_netdev_priv *np = netdev_priv(netdev);

	struct ice_vsi *vsi = np->vsi;
@@ -2179,7 +2182,8 @@ ice_get_coalesce(struct net_device *netdev, struct ethtool_coalesce *ec) 
	return __ice_get_coalesce(netdev, ec, -1);

}



static int ice_get_per_q_coalesce(struct net_device *netdev, u32 q_num,

static int

ice_get_per_q_coalesce(struct net_device *netdev, u32 q_num,

		       struct ethtool_coalesce *ec)

{

	return __ice_get_coalesce(netdev, ec, q_num);
@@ -2324,7 +2328,8 @@ ice_set_coalesce(struct net_device *netdev, struct ethtool_coalesce *ec) 
	return __ice_set_coalesce(netdev, ec, -1);

}



static int ice_set_per_q_coalesce(struct net_device *netdev, u32 q_num,

static int

ice_set_per_q_coalesce(struct net_device *netdev, u32 q_num,

		       struct ethtool_coalesce *ec)

{

	return __ice_set_coalesce(netdev, ec, q_num);

drivers/net/ethernet/intel/ice/ice_lib.c

+3 −2
Original line number Diff line number Diff line
@@ -2107,8 +2107,9 @@ ice_vsi_stop_tx_rings(struct ice_vsi *vsi, enum ice_disq_rst_src rst_src, 
 * @rst_src: reset source

 * @rel_vmvf_num: Relative id of VF/VM

 */

int ice_vsi_stop_lan_tx_rings(struct ice_vsi *vsi,

			      enum ice_disq_rst_src rst_src, u16 rel_vmvf_num)

int

ice_vsi_stop_lan_tx_rings(struct ice_vsi *vsi, enum ice_disq_rst_src rst_src,

			  u16 rel_vmvf_num)

{

	return ice_vsi_stop_tx_rings(vsi, rst_src, rel_vmvf_num, vsi->tx_rings,

				     0);