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

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

net: hns: Make many functions static 



Fixes the following sparse warning:

drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c:73:20: warning: symbol 'hns_ae_get_handle' was not declared. Should it be static?
drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c:332:6: warning: symbol 'hns_ae_stop' was not declared. Should it be static?
drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c:360:6: warning: symbol 'hns_ae_toggle_ring_irq' was not declared. Should it be static?
drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c:580:6: warning: symbol 'hns_ae_update_stats' was not declared. Should it be static?
drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c:663:6: warning: symbol 'hns_ae_get_stats' was not declared. Should it be static?
drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c:695:6: warning: symbol 'hns_ae_get_strings' was not declared. Should it be static?
drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c:728:5: warning: symbol 'hns_ae_get_sset_count' was not declared. Should it be static?
drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c:774:6: warning: symbol 'hns_ae_update_led_status' was not declared. Should it be static?
drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c:786:5: warning: symbol 'hns_ae_cpld_set_led_id' was not declared. Should it be static?
drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c:798:6: warning: symbol 'hns_ae_get_regs' was not declared. Should it be static?
drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c:823:5: warning: symbol 'hns_ae_get_regs_len' was not declared. Should it be static?
drivers/net/ethernet/hisilicon/hns/hns_dsaf_gmac.c:342:6: warning: symbol 'hns_gmac_update_stats' was not declared. Should it be static?
drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c:934:12: warning: symbol 'hns_mac_get_vaddr' was not declared. Should it be static?
drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c:953:5: warning: symbol 'hns_mac_get_cfg' was not declared. Should it be static?
drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c:343:6: warning: symbol 'hns_dsaf_srst_chns' was not declared. Should it be static?
drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c:366:1: warning: symbol 'hns_dsaf_srst_chns_acpi' was not declared. Should it be static?
drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c:373:6: warning: symbol 'hns_dsaf_roce_srst' was not declared. Should it be static?
drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c:387:6: warning: symbol 'hns_dsaf_roce_srst_acpi' was not declared. Should it be static?
drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c:571:5: warning: symbol 'hns_mac_get_sfp_prsnt' was not declared. Should it be static?
drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c:589:5: warning: symbol 'hns_mac_get_sfp_prsnt_acpi' was not declared. Should it be static?
drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c:31:12: warning: symbol 'g_dsaf_mode_match' was not declared. Should it be static?
drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c:45:5: warning: symbol 'hns_dsaf_get_cfg' was not declared. Should it be static?
drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c:962:6: warning: symbol 'hns_dsaf_tcam_addr_get' was not declared. Should it be static?
drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c:2087:6: warning: symbol 'hns_dsaf_port_work_rate_cfg' was not declared. Should it be static?
drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c:2837:5: warning: symbol 'hns_dsaf_roce_reset' was not declared. Should it be static?
drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.c:76:5: warning: symbol 'hns_ppe_common_get_cfg' was not declared. Should it be static?
drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.c:107:6: warning: symbol 'hns_ppe_common_free_cfg' was not declared. Should it be static?
drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.c:340:6: warning: symbol 'hns_ppe_uninit_ex' was not declared. Should it be static?
drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c:708:5: warning: symbol 'hns_rcb_get_ring_num' was not declared. Should it be static?
drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c:744:14: warning: symbol 'hns_rcb_common_get_vaddr' was not declared. Should it be static?
drivers/net/ethernet/hisilicon/hns/hns_dsaf_xgmac.c:314:6: warning: symbol 'hns_xgmac_update_stats' was not declared. Should it be static?
drivers/net/ethernet/hisilicon/hns/hns_enet.c:1303:6: warning: symbol 'hns_nic_update_stats' was not declared. Should it be static?
drivers/net/ethernet/hisilicon/hns/hns_enet.c:1585:6: warning: symbol 'hns_nic_poll_controller' was not declared. Should it be static?
drivers/net/ethernet/hisilicon/hns/hns_enet.c:1938:6: warning: symbol 'hns_set_multicast_list' was not declared. Should it be static?
drivers/net/ethernet/hisilicon/hns/hns_enet.c:1960:6: warning: symbol 'hns_nic_set_rx_mode' was not declared. Should it be static?
drivers/net/ethernet/hisilicon/hns/hns_ethtool.c:661:6: warning: symbol 'hns_get_ringparam' was not declared. Should it be static?
drivers/net/ethernet/hisilicon/hns/hns_ethtool.c:811:6: warning: symbol 'hns_get_channels' was not declared. Should it be static?
drivers/net/ethernet/hisilicon/hns/hns_ethtool.c:828:6: warning: symbol 'hns_get_ethtool_stats' was not declared. Should it be static?
drivers/net/ethernet/hisilicon/hns/hns_ethtool.c:886:6: warning: symbol 'hns_get_strings' was not declared. Should it be static?
drivers/net/ethernet/hisilicon/hns/hns_ethtool.c:976:5: warning: symbol 'hns_get_sset_count' was not declared. Should it be static?
drivers/net/ethernet/hisilicon/hns/hns_ethtool.c:1010:5: warning: symbol 'hns_phy_led_set' was not declared. Should it be static?
drivers/net/ethernet/hisilicon/hns/hns_ethtool.c:1032:5: warning: symbol 'hns_set_phys_id' was not declared. Should it be static?
drivers/net/ethernet/hisilicon/hns/hns_ethtool.c:1106:6: warning: symbol 'hns_get_regs' was not declared. Should it be static?

Signed-off-by: default avatarYueHaibing <yuehaibing@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent eb91f42e

drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c

+15 −15
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ static struct ring_pair_cb *hns_ae_get_ring_pair(struct hnae_queue *q) 
	return container_of(q, struct ring_pair_cb, q);

}



struct hnae_handle *hns_ae_get_handle(struct hnae_ae_dev *dev,

static struct hnae_handle *hns_ae_get_handle(struct hnae_ae_dev *dev,

					     u32 port_id)

{

	int vfnum_per_port;
@@ -329,7 +329,7 @@ static int hns_ae_start(struct hnae_handle *handle) 
	return 0;

}



void hns_ae_stop(struct hnae_handle *handle)

static void hns_ae_stop(struct hnae_handle *handle)

{

	struct hns_mac_cb *mac_cb = hns_get_mac_cb(handle);
@@ -357,7 +357,7 @@ static void hns_ae_reset(struct hnae_handle *handle) 
	}

}



void hns_ae_toggle_ring_irq(struct hnae_ring *ring, u32 mask)

static void hns_ae_toggle_ring_irq(struct hnae_ring *ring, u32 mask)

{

	u32 flag;
@@ -577,7 +577,7 @@ static void hns_ae_get_coalesce_range(struct hnae_handle *handle, 
	*rx_usecs_high  = HNS_RCB_RX_USECS_HIGH;

}



void hns_ae_update_stats(struct hnae_handle *handle,

static void hns_ae_update_stats(struct hnae_handle *handle,

				struct net_device_stats *net_stats)

{

	int port;
@@ -660,7 +660,7 @@ void hns_ae_update_stats(struct hnae_handle *handle, 
	net_stats->multicast = mac_cb->hw_stats.rx_mc_pkts;

}



void hns_ae_get_stats(struct hnae_handle *handle, u64 *data)

static void hns_ae_get_stats(struct hnae_handle *handle, u64 *data)

{

	int idx;

	struct hns_mac_cb *mac_cb;
@@ -692,7 +692,7 @@ void hns_ae_get_stats(struct hnae_handle *handle, u64 *data) 
		hns_dsaf_get_stats(vf_cb->dsaf_dev, p, vf_cb->port_index);

}



void hns_ae_get_strings(struct hnae_handle *handle,

static void hns_ae_get_strings(struct hnae_handle *handle,

			       u32 stringset, u8 *data)

{

	int port;
@@ -725,7 +725,7 @@ void hns_ae_get_strings(struct hnae_handle *handle, 
		hns_dsaf_get_strings(stringset, p, port, dsaf_dev);

}



int hns_ae_get_sset_count(struct hnae_handle *handle, int stringset)

static int hns_ae_get_sset_count(struct hnae_handle *handle, int stringset)

{

	u32 sset_count = 0;

	struct hns_mac_cb *mac_cb;
@@ -771,7 +771,7 @@ static int hns_ae_config_loopback(struct hnae_handle *handle, 
	return ret;

}



void hns_ae_update_led_status(struct hnae_handle *handle)

static void hns_ae_update_led_status(struct hnae_handle *handle)

{

	struct hns_mac_cb *mac_cb;
@@ -783,7 +783,7 @@ void hns_ae_update_led_status(struct hnae_handle *handle) 
	hns_set_led_opt(mac_cb);

}



int hns_ae_cpld_set_led_id(struct hnae_handle *handle,

static int hns_ae_cpld_set_led_id(struct hnae_handle *handle,

				  enum hnae_led_state status)

{

	struct hns_mac_cb *mac_cb;
@@ -795,7 +795,7 @@ int hns_ae_cpld_set_led_id(struct hnae_handle *handle, 
	return hns_cpld_led_set_id(mac_cb, status);

}



void hns_ae_get_regs(struct hnae_handle *handle, void *data)

static void hns_ae_get_regs(struct hnae_handle *handle, void *data)

{

	u32 *p = data;

	int i;
@@ -820,7 +820,7 @@ void hns_ae_get_regs(struct hnae_handle *handle, void *data) 
		hns_dsaf_get_regs(vf_cb->dsaf_dev, vf_cb->port_index, p);

}



int hns_ae_get_regs_len(struct hnae_handle *handle)

static int hns_ae_get_regs_len(struct hnae_handle *handle)

{

	u32 total_num;

	struct hnae_vf_cb *vf_cb = hns_ae_get_vf_cb(handle);

drivers/net/ethernet/hisilicon/hns/hns_dsaf_gmac.c

+1 −1
Original line number Diff line number Diff line
@@ -339,7 +339,7 @@ static void hns_gmac_init(void *mac_drv) 
			   GMAC_TX_WATER_LINE_SHIFT, 8);

}



void hns_gmac_update_stats(void *mac_drv)

static void hns_gmac_update_stats(void *mac_drv)

{

	struct mac_hw_stats *hw_stats = NULL;

	struct mac_driver *drv = (struct mac_driver *)mac_drv;

drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c

+5 −3
Original line number Diff line number Diff line
@@ -931,7 +931,8 @@ static int hns_mac_get_mode(phy_interface_t phy_if) 
	}

}



u8 __iomem *hns_mac_get_vaddr(struct dsaf_device *dsaf_dev,

static u8 __iomem *

hns_mac_get_vaddr(struct dsaf_device *dsaf_dev,

		  struct hns_mac_cb *mac_cb, u32 mac_mode_idx)

{

	u8 __iomem *base = dsaf_dev->io_base;
@@ -950,7 +951,8 @@ u8 __iomem *hns_mac_get_vaddr(struct dsaf_device *dsaf_dev, 
 * @mac_cb: mac control block

 * return 0 - success , negative --fail

 */

int hns_mac_get_cfg(struct dsaf_device *dsaf_dev, struct hns_mac_cb *mac_cb)

static int

hns_mac_get_cfg(struct dsaf_device *dsaf_dev, struct hns_mac_cb *mac_cb)

{

	int ret;

	u32 mac_mode_idx;

drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c

+8 −6
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 
#include "hns_dsaf_rcb.h"

#include "hns_dsaf_misc.h"



const char *g_dsaf_mode_match[DSAF_MODE_MAX] = {

const static char *g_dsaf_mode_match[DSAF_MODE_MAX] = {

	[DSAF_MODE_DISABLE_2PORT_64VM] = "2port-64vf",

	[DSAF_MODE_DISABLE_6PORT_0VM] = "6port-16rss",

	[DSAF_MODE_DISABLE_6PORT_16VM] = "6port-16vf",
@@ -42,7 +42,7 @@ static const struct acpi_device_id hns_dsaf_acpi_match[] = { 
};

MODULE_DEVICE_TABLE(acpi, hns_dsaf_acpi_match);



int hns_dsaf_get_cfg(struct dsaf_device *dsaf_dev)

static int hns_dsaf_get_cfg(struct dsaf_device *dsaf_dev)

{

	int ret, i;

	u32 desc_num;
@@ -959,7 +959,8 @@ static void hns_dsaf_tcam_mc_invld(struct dsaf_device *dsaf_dev, u32 address) 
	spin_unlock_bh(&dsaf_dev->tcam_lock);

}



void hns_dsaf_tcam_addr_get(struct dsaf_drv_tbl_tcam_key *mac_key, u8 *addr)

static void

hns_dsaf_tcam_addr_get(struct dsaf_drv_tbl_tcam_key *mac_key, u8 *addr)

{

	addr[0] = mac_key->high.bits.mac_0;

	addr[1] = mac_key->high.bits.mac_1;
@@ -2084,7 +2085,8 @@ static void hns_dsaf_pfc_unit_cnt(struct dsaf_device *dsaf_dev, int mac_id, 
 * @dsaf_id: dsa fabric id

 * @xge_ge_work_mode

 */

void hns_dsaf_port_work_rate_cfg(struct dsaf_device *dsaf_dev, int mac_id,

static void

hns_dsaf_port_work_rate_cfg(struct dsaf_device *dsaf_dev, int mac_id,

			    enum dsaf_port_rate_mode rate_mode)

{

	u32 port_work_mode;
@@ -2834,7 +2836,7 @@ module_platform_driver(g_dsaf_driver); 
 * @enable: false - request reset , true - drop reset

 * retuen 0 - success , negative -fail

 */

int hns_dsaf_roce_reset(struct fwnode_handle *dsaf_fwnode, bool dereset)

static int hns_dsaf_roce_reset(struct fwnode_handle *dsaf_fwnode, bool dereset)

{

	struct dsaf_device *dsaf_dev;

	struct platform_device *pdev;

drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c

+7 −6
Original line number Diff line number Diff line
@@ -340,7 +340,8 @@ static void hns_dsaf_xge_srst_by_port_acpi(struct dsaf_device *dsaf_dev, 
 * bit18-19 for com/dfx

 * @enable: false - request reset , true - drop reset

 */

void hns_dsaf_srst_chns(struct dsaf_device *dsaf_dev, u32 msk, bool dereset)

static void

hns_dsaf_srst_chns(struct dsaf_device *dsaf_dev, u32 msk, bool dereset)

{

	u32 reg_addr;
@@ -362,7 +363,7 @@ void hns_dsaf_srst_chns(struct dsaf_device *dsaf_dev, u32 msk, bool dereset) 
 * bit18-19 for com/dfx

 * @enable: false - request reset , true - drop reset

 */

void

static void

hns_dsaf_srst_chns_acpi(struct dsaf_device *dsaf_dev, u32 msk, bool dereset)

{

	hns_dsaf_acpi_srst_by_port(dsaf_dev, HNS_OP_RESET_FUNC,
@@ -370,7 +371,7 @@ hns_dsaf_srst_chns_acpi(struct dsaf_device *dsaf_dev, u32 msk, bool dereset) 
				   msk, dereset);

}



void hns_dsaf_roce_srst(struct dsaf_device *dsaf_dev, bool dereset)

static void hns_dsaf_roce_srst(struct dsaf_device *dsaf_dev, bool dereset)

{

	if (!dereset) {

		dsaf_write_sub(dsaf_dev, DSAF_SUB_SC_ROCEE_RESET_REQ_REG, 1);
@@ -384,7 +385,7 @@ void hns_dsaf_roce_srst(struct dsaf_device *dsaf_dev, bool dereset) 
	}

}



void hns_dsaf_roce_srst_acpi(struct dsaf_device *dsaf_dev, bool dereset)

static void hns_dsaf_roce_srst_acpi(struct dsaf_device *dsaf_dev, bool dereset)

{

	hns_dsaf_acpi_srst_by_port(dsaf_dev, HNS_OP_RESET_FUNC,

				   HNS_ROCE_RESET_FUNC, 0, dereset);
@@ -568,7 +569,7 @@ static phy_interface_t hns_mac_get_phy_if_acpi(struct hns_mac_cb *mac_cb) 
	return phy_if;

}



int hns_mac_get_sfp_prsnt(struct hns_mac_cb *mac_cb, int *sfp_prsnt)

static int hns_mac_get_sfp_prsnt(struct hns_mac_cb *mac_cb, int *sfp_prsnt)

{

	u32 val = 0;

	int ret;
@@ -586,7 +587,7 @@ int hns_mac_get_sfp_prsnt(struct hns_mac_cb *mac_cb, int *sfp_prsnt) 
	return 0;

}



int hns_mac_get_sfp_prsnt_acpi(struct hns_mac_cb *mac_cb, int *sfp_prsnt)

static int hns_mac_get_sfp_prsnt_acpi(struct hns_mac_cb *mac_cb, int *sfp_prsnt)

{

	union acpi_object *obj;

	union acpi_object obj_args, argv4;