Commit ddc2118e authored by YueHaibing's avatar YueHaibing Committed by David S. Miller
Browse files

hinic: make a bunch of functions static



These fucntions is used only in hinic_sriov.c,
so make them static to fix sparse warnings.

Reported-by: default avatarHulk Robot <hulkci@huawei.com>
Signed-off-by: default avatarYueHaibing <yuehaibing@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9e9f6e72
Loading
Loading
Loading
Loading
+48 −43
Original line number Diff line number Diff line
@@ -23,8 +23,8 @@ MODULE_PARM_DESC(set_vf_link_state, "Set vf link state, 0 represents link auto,
#define HINIC_VLAN_PRIORITY_SHIFT 13
#define HINIC_ADD_VLAN_IN_MAC 0x8000

int hinic_set_mac(struct hinic_hwdev *hwdev, const u8 *mac_addr, u16 vlan_id,
		  u16 func_id)
static int hinic_set_mac(struct hinic_hwdev *hwdev, const u8 *mac_addr,
			 u16 vlan_id, u16 func_id)
{
	struct hinic_port_mac_cmd mac_info = {0};
	u16 out_size = sizeof(mac_info);
@@ -84,7 +84,7 @@ void hinic_notify_all_vfs_link_changed(struct hinic_hwdev *hwdev,
	}
}

u16 hinic_vf_info_vlanprio(struct hinic_hwdev *hwdev, int vf_id)
static u16 hinic_vf_info_vlanprio(struct hinic_hwdev *hwdev, int vf_id)
{
	struct hinic_func_to_io *nic_io = &hwdev->func_to_io;
	u16 pf_vlan, vlanprio;
@@ -97,7 +97,7 @@ u16 hinic_vf_info_vlanprio(struct hinic_hwdev *hwdev, int vf_id)
	return vlanprio;
}

int hinic_set_vf_vlan(struct hinic_hwdev *hwdev, bool add, u16 vid,
static int hinic_set_vf_vlan(struct hinic_hwdev *hwdev, bool add, u16 vid,
			     u8 qos, int vf_id)
{
	struct hinic_vf_vlan_config vf_vlan = {0};
@@ -163,7 +163,7 @@ static int hinic_init_vf_config(struct hinic_hwdev *hwdev, u16 vf_id)
	return 0;
}

int hinic_register_vf_msg_handler(void *hwdev, u16 vf_id,
static int hinic_register_vf_msg_handler(void *hwdev, u16 vf_id,
					 void *buf_in, u16 in_size,
					 void *buf_out, u16 *out_size)
{
@@ -192,7 +192,7 @@ int hinic_register_vf_msg_handler(void *hwdev, u16 vf_id,
	return 0;
}

int hinic_unregister_vf_msg_handler(void *hwdev, u16 vf_id,
static int hinic_unregister_vf_msg_handler(void *hwdev, u16 vf_id,
					   void *buf_in, u16 in_size,
					   void *buf_out, u16 *out_size)
{
@@ -209,7 +209,7 @@ int hinic_unregister_vf_msg_handler(void *hwdev, u16 vf_id,
	return 0;
}

int hinic_change_vf_mtu_msg_handler(void *hwdev, u16 vf_id,
static int hinic_change_vf_mtu_msg_handler(void *hwdev, u16 vf_id,
					   void *buf_in, u16 in_size,
					   void *buf_out, u16 *out_size)
{
@@ -227,7 +227,7 @@ int hinic_change_vf_mtu_msg_handler(void *hwdev, u16 vf_id,
	return 0;
}

int hinic_get_vf_mac_msg_handler(void *hwdev, u16 vf_id,
static int hinic_get_vf_mac_msg_handler(void *hwdev, u16 vf_id,
					void *buf_in, u16 in_size,
					void *buf_out, u16 *out_size)
{
@@ -246,7 +246,7 @@ int hinic_get_vf_mac_msg_handler(void *hwdev, u16 vf_id,
	return 0;
}

int hinic_set_vf_mac_msg_handler(void *hwdev, u16 vf_id,
static int hinic_set_vf_mac_msg_handler(void *hwdev, u16 vf_id,
					void *buf_in, u16 in_size,
					void *buf_out, u16 *out_size)
{
@@ -280,7 +280,7 @@ int hinic_set_vf_mac_msg_handler(void *hwdev, u16 vf_id,
	return err;
}

int hinic_del_vf_mac_msg_handler(void *hwdev, u16 vf_id,
static int hinic_del_vf_mac_msg_handler(void *hwdev, u16 vf_id,
					void *buf_in, u16 in_size,
					void *buf_out, u16 *out_size)
{
@@ -312,7 +312,7 @@ int hinic_del_vf_mac_msg_handler(void *hwdev, u16 vf_id,
	return err;
}

int hinic_get_vf_link_status_msg_handler(void *hwdev, u16 vf_id,
static int hinic_get_vf_link_status_msg_handler(void *hwdev, u16 vf_id,
						void *buf_in, u16 in_size,
						void *buf_out, u16 *out_size)
{
@@ -339,7 +339,7 @@ int hinic_get_vf_link_status_msg_handler(void *hwdev, u16 vf_id,
	return 0;
}

struct vf_cmd_msg_handle nic_vf_cmd_msg_handler[] = {
static struct vf_cmd_msg_handle nic_vf_cmd_msg_handler[] = {
	{HINIC_PORT_CMD_VF_REGISTER, hinic_register_vf_msg_handler},
	{HINIC_PORT_CMD_VF_UNREGISTER, hinic_unregister_vf_msg_handler},
	{HINIC_PORT_CMD_CHANGE_MTU, hinic_change_vf_mtu_msg_handler},
@@ -351,6 +351,7 @@ struct vf_cmd_msg_handle nic_vf_cmd_msg_handler[] = {

#define CHECK_IPSU_15BIT	0X8000

static
struct hinic_sriov_info *hinic_get_sriov_info_by_pcidev(struct pci_dev *pdev)
{
	struct net_device *netdev = pci_get_drvdata(pdev);
@@ -372,8 +373,8 @@ static int hinic_check_mac_info(u8 status, u16 vlan_id)

#define HINIC_VLAN_ID_MASK	0x7FFF

int hinic_update_mac(struct hinic_hwdev *hwdev, u8 *old_mac, u8 *new_mac,
		     u16 vlan_id, u16 func_id)
static int hinic_update_mac(struct hinic_hwdev *hwdev, u8 *old_mac,
			    u8 *new_mac, u16 vlan_id, u16 func_id)
{
	struct hinic_port_mac_update mac_info = {0};
	u16 out_size = sizeof(mac_info);
@@ -416,7 +417,7 @@ int hinic_update_mac(struct hinic_hwdev *hwdev, u8 *old_mac, u8 *new_mac,
	return 0;
}

void hinic_get_vf_config(struct hinic_hwdev *hwdev, u16 vf_id,
static void hinic_get_vf_config(struct hinic_hwdev *hwdev, u16 vf_id,
				struct ifla_vf_info *ivi)
{
	struct vf_data_storage *vfinfo;
@@ -455,7 +456,8 @@ int hinic_ndo_get_vf_config(struct net_device *netdev,
	return 0;
}

int hinic_set_vf_mac(struct hinic_hwdev *hwdev, int vf, unsigned char *mac_addr)
static int hinic_set_vf_mac(struct hinic_hwdev *hwdev, int vf,
			    unsigned char *mac_addr)
{
	struct hinic_func_to_io *nic_io = &hwdev->func_to_io;
	struct vf_data_storage *vf_info;
@@ -504,7 +506,8 @@ int hinic_ndo_set_vf_mac(struct net_device *netdev, int vf, u8 *mac)
	return 0;
}

int hinic_add_vf_vlan(struct hinic_hwdev *hwdev, int vf_id, u16 vlan, u8 qos)
static int hinic_add_vf_vlan(struct hinic_hwdev *hwdev, int vf_id,
			     u16 vlan, u8 qos)
{
	struct hinic_func_to_io *nic_io = &hwdev->func_to_io;
	int err;
@@ -521,7 +524,7 @@ int hinic_add_vf_vlan(struct hinic_hwdev *hwdev, int vf_id, u16 vlan, u8 qos)
	return 0;
}

int hinic_kill_vf_vlan(struct hinic_hwdev *hwdev, int vf_id)
static int hinic_kill_vf_vlan(struct hinic_hwdev *hwdev, int vf_id)
{
	struct hinic_func_to_io *nic_io = &hwdev->func_to_io;
	int err;
@@ -543,8 +546,8 @@ int hinic_kill_vf_vlan(struct hinic_hwdev *hwdev, int vf_id)
	return 0;
}

int hinic_update_mac_vlan(struct hinic_dev *nic_dev, u16 old_vlan, u16 new_vlan,
			  int vf_id)
static int hinic_update_mac_vlan(struct hinic_dev *nic_dev, u16 old_vlan,
				 u16 new_vlan, int vf_id)
{
	struct vf_data_storage *vf_info;
	u16 vlan_id;
@@ -651,7 +654,8 @@ int hinic_ndo_set_vf_vlan(struct net_device *netdev, int vf, u16 vlan, u8 qos,
	return set_hw_vf_vlan(nic_dev, cur_vlanprio, vf, vlan, qos);
}

int hinic_set_vf_trust(struct hinic_hwdev *hwdev, u16 vf_id, bool trust)
static int hinic_set_vf_trust(struct hinic_hwdev *hwdev, u16 vf_id,
			      bool trust)
{
	struct vf_data_storage *vf_infos;
	struct hinic_func_to_io *nic_io;
@@ -697,7 +701,7 @@ int hinic_ndo_set_vf_trust(struct net_device *netdev, int vf, bool setting)
}

/* pf receive message from vf */
int nic_pf_mbox_handler(void *hwdev, u16 vf_id, u8 cmd, void *buf_in,
static int nic_pf_mbox_handler(void *hwdev, u16 vf_id, u8 cmd, void *buf_in,
			       u16 in_size, void *buf_out, u16 *out_size)
{
	struct vf_cmd_msg_handle *vf_msg_handle;
@@ -786,7 +790,7 @@ static int hinic_init_vf_infos(struct hinic_func_to_io *nic_io, u16 vf_id)
	return 0;
}

void hinic_clear_vf_infos(struct hinic_dev *nic_dev, u16 vf_id)
static void hinic_clear_vf_infos(struct hinic_dev *nic_dev, u16 vf_id)
{
	struct vf_data_storage *vf_infos;
	u16 func_id;
@@ -807,8 +811,8 @@ void hinic_clear_vf_infos(struct hinic_dev *nic_dev, u16 vf_id)
	hinic_init_vf_infos(&nic_dev->hwdev->func_to_io, HW_VF_ID_TO_OS(vf_id));
}

int hinic_deinit_vf_hw(struct hinic_sriov_info *sriov_info, u16 start_vf_id,
		       u16 end_vf_id)
static int hinic_deinit_vf_hw(struct hinic_sriov_info *sriov_info,
			      u16 start_vf_id, u16 end_vf_id)
{
	struct hinic_dev *nic_dev;
	u16 func_idx, idx;
@@ -908,7 +912,8 @@ void hinic_vf_func_free(struct hinic_hwdev *hwdev)
	}
}

int hinic_init_vf_hw(struct hinic_hwdev *hwdev, u16 start_vf_id, u16 end_vf_id)
static int hinic_init_vf_hw(struct hinic_hwdev *hwdev, u16 start_vf_id,
			    u16 end_vf_id)
{
	u16 i, func_idx;
	int err;