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

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

fm10k: cleanup namespace pollution 



Make functions that should be static.  While we're at it, fix the function
header comment for fm10k_tlv_attr_nest_stop(), and update the copyright
header for fm10k_pf.h, fm10k_tlv.c and fm10k_tlv.h.

Signed-off-by: default avatarBruce Allan <bruce.w.allan@intel.com>
Tested-by: default avatarKrishneil Singh <Krishneil.k.singh@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 3e515645

drivers/net/ethernet/intel/fm10k/fm10k_pf.c

+2 −2
Original line number Diff line number Diff line
@@ -1688,7 +1688,7 @@ const struct fm10k_tlv_attr fm10k_update_pvid_msg_attr[] = { 
 *

 *  This handler configures the default VLAN for the PF

 **/

s32 fm10k_msg_update_pvid_pf(struct fm10k_hw *hw, u32 **results,

static s32 fm10k_msg_update_pvid_pf(struct fm10k_hw *hw, u32 **results,

				    struct fm10k_mbx_info *mbx)

{

	u16 glort, pvid;

drivers/net/ethernet/intel/fm10k/fm10k_pf.h

+1 −3
Original line number Diff line number Diff line 
/* Intel Ethernet Switch Host Interface Driver

 * Copyright(c) 2013 - 2014 Intel Corporation.

 * Copyright(c) 2013 - 2015 Intel Corporation.

 *

 * This program is free software; you can redistribute it and/or modify it

 * under the terms and conditions of the GNU General Public License,
@@ -107,8 +107,6 @@ extern const struct fm10k_tlv_attr fm10k_lport_map_msg_attr[]; 
#define FM10K_PF_MSG_LPORT_MAP_HANDLER(func) \

	FM10K_MSG_HANDLER(FM10K_PF_MSG_ID_LPORT_MAP, \

			  fm10k_lport_map_msg_attr, func)

s32 fm10k_msg_update_pvid_pf(struct fm10k_hw *, u32 **,

			     struct fm10k_mbx_info *);

extern const struct fm10k_tlv_attr fm10k_update_pvid_msg_attr[];

#define FM10K_PF_MSG_UPDATE_PVID_HANDLER(func) \

	FM10K_MSG_HANDLER(FM10K_PF_MSG_ID_UPDATE_PVID, \

drivers/net/ethernet/intel/fm10k/fm10k_tlv.c

+9 −9
Original line number Diff line number Diff line 
/* Intel Ethernet Switch Host Interface Driver

 * Copyright(c) 2013 - 2014 Intel Corporation.

 * Copyright(c) 2013 - 2015 Intel Corporation.

 *

 * This program is free software; you can redistribute it and/or modify it

 * under the terms and conditions of the GNU General Public License,
@@ -48,7 +48,7 @@ s32 fm10k_tlv_msg_init(u32 *msg, u16 msg_id) 
 *  the attribute buffer.  It will return success if provided with a valid

 *  pointers.

 **/

s32 fm10k_tlv_attr_put_null_string(u32 *msg, u16 attr_id,

static s32 fm10k_tlv_attr_put_null_string(u32 *msg, u16 attr_id,

					  const unsigned char *string)

{

	u32 attr_data = 0, len = 0;
@@ -98,7 +98,7 @@ s32 fm10k_tlv_attr_put_null_string(u32 *msg, u16 attr_id, 
 *  it in the array pointed by by string.  It will return success if provided

 *  with a valid pointers.

 **/

s32 fm10k_tlv_attr_get_null_string(u32 *attr, unsigned char *string)

static s32 fm10k_tlv_attr_get_null_string(u32 *attr, unsigned char *string)

{

	u32 len;
@@ -353,7 +353,7 @@ s32 fm10k_tlv_attr_get_le_struct(u32 *attr, void *le_struct, u32 len) 
 *  function will return NULL on failure, and a pointer to the start

 *  of the nested attributes on success.

 **/

u32 *fm10k_tlv_attr_nest_start(u32 *msg, u16 attr_id)

static u32 *fm10k_tlv_attr_nest_start(u32 *msg, u16 attr_id)

{

	u32 *attr;
@@ -370,7 +370,7 @@ u32 *fm10k_tlv_attr_nest_start(u32 *msg, u16 attr_id) 
}



/**

 *  fm10k_tlv_attr_nest_start - Start a set of nested attributes

 *  fm10k_tlv_attr_nest_stop - Stop a set of nested attributes

 *  @msg: Pointer to message block

 *

 *  This function closes off an existing set of nested attributes.  The
@@ -378,7 +378,7 @@ u32 *fm10k_tlv_attr_nest_start(u32 *msg, u16 attr_id) 
 *  the case of a nest within the nest this would be the outer nest pointer.

 *  This function will return success provided all pointers are valid.

 **/

s32 fm10k_tlv_attr_nest_stop(u32 *msg)

static s32 fm10k_tlv_attr_nest_stop(u32 *msg)

{

	u32 *attr;

	u32 len;
@@ -483,7 +483,7 @@ static s32 fm10k_tlv_attr_validate(u32 *attr, 
 *  FM10K_NOT_IMPLEMENTED for any attribute that is outside of the array

 *  and 0 on success.

 **/

s32 fm10k_tlv_attr_parse(u32 *attr, u32 **results,

static s32 fm10k_tlv_attr_parse(u32 *attr, u32 **results,

				const struct fm10k_tlv_attr *tlv_attr)

{

	u32 i, attr_id, offset = 0;

drivers/net/ethernet/intel/fm10k/fm10k_tlv.h

+1 −6
Original line number Diff line number Diff line 
/* Intel Ethernet Switch Host Interface Driver

 * Copyright(c) 2013 - 2014 Intel Corporation.

 * Copyright(c) 2013 - 2015 Intel Corporation.

 *

 * This program is free software; you can redistribute it and/or modify it

 * under the terms and conditions of the GNU General Public License,
@@ -106,8 +106,6 @@ struct fm10k_msg_data { 
#define FM10K_MSG_HANDLER(id, attr, func) { id, attr, func }



s32 fm10k_tlv_msg_init(u32 *, u16);

s32 fm10k_tlv_attr_put_null_string(u32 *, u16, const unsigned char *);

s32 fm10k_tlv_attr_get_null_string(u32 *, unsigned char *);

s32 fm10k_tlv_attr_put_mac_vlan(u32 *, u16, const u8 *, u16);

s32 fm10k_tlv_attr_get_mac_vlan(u32 *, u8 *, u16 *);

s32 fm10k_tlv_attr_put_bool(u32 *, u16);
@@ -147,9 +145,6 @@ s32 fm10k_tlv_attr_get_value(u32 *, void *, u32); 
		fm10k_tlv_attr_get_value(attr, ptr, sizeof(s64))

s32 fm10k_tlv_attr_put_le_struct(u32 *, u16, const void *, u32);

s32 fm10k_tlv_attr_get_le_struct(u32 *, void *, u32);

u32 *fm10k_tlv_attr_nest_start(u32 *, u16);

s32 fm10k_tlv_attr_nest_stop(u32 *);

s32 fm10k_tlv_attr_parse(u32 *, u32 **, const struct fm10k_tlv_attr *);

s32 fm10k_tlv_msg_parse(struct fm10k_hw *, u32 *, struct fm10k_mbx_info *,

			const struct fm10k_msg_data *);

s32 fm10k_tlv_msg_error(struct fm10k_hw *hw, u32 **results,