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

Commit 21041400 authored by stephen hemminger's avatar stephen hemminger Committed by David S. Miller
Browse files

qlcnic: make local functions static 



Functions only used in one file should be static.
Found by running make namespacecheck

Compile tested only.

Signed-off-by: default avatarStephen Hemminger <stephen@networkplumber.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1d13a96c

drivers/net/ethernet/qlogic/qlcnic/qlcnic.h

+0 −16
Original line number Diff line number Diff line
@@ -1473,8 +1473,6 @@ int qlcnic_fw_cmd_get_minidump_temp(struct qlcnic_adapter *adapter); 
int qlcnic_fw_cmd_set_port(struct qlcnic_adapter *adapter, u32 config);

int qlcnic_pci_mem_write_2M(struct qlcnic_adapter *, u64 off, u64 data);

int qlcnic_pci_mem_read_2M(struct qlcnic_adapter *, u64 off, u64 *data);

void qlcnic_pci_camqm_read_2M(struct qlcnic_adapter *, u64, u64 *);

void qlcnic_pci_camqm_write_2M(struct qlcnic_adapter *, u64, u64);



#define ADDR_IN_RANGE(addr, low, high)	\

	(((addr) < (high)) && ((addr) >= (low)))
@@ -1510,16 +1508,11 @@ void qlcnic_pcie_sem_unlock(struct qlcnic_adapter *, int); 


#define MAX_CTL_CHECK 1000



int qlcnic_wol_supported(struct qlcnic_adapter *adapter);

void qlcnic_prune_lb_filters(struct qlcnic_adapter *adapter);

void qlcnic_delete_lb_filters(struct qlcnic_adapter *adapter);

int qlcnic_dump_fw(struct qlcnic_adapter *);

int qlcnic_enable_fw_dump_state(struct qlcnic_adapter *);

bool qlcnic_check_fw_dump_state(struct qlcnic_adapter *);

pci_ers_result_t qlcnic_82xx_io_error_detected(struct pci_dev *,

					       pci_channel_state_t);

pci_ers_result_t qlcnic_82xx_io_slot_reset(struct pci_dev *);

void qlcnic_82xx_io_resume(struct pci_dev *);



/* Functions from qlcnic_init.c */

void qlcnic_schedule_work(struct qlcnic_adapter *, work_func_t, int);
@@ -1554,9 +1547,7 @@ int qlcnic_check_fw_status(struct qlcnic_adapter *adapter); 
void qlcnic_watchdog_task(struct work_struct *work);

void qlcnic_post_rx_buffers(struct qlcnic_adapter *adapter,

		struct qlcnic_host_rds_ring *rds_ring, u8 ring_id);

int qlcnic_process_rcv_ring(struct qlcnic_host_sds_ring *sds_ring, int max);

void qlcnic_set_multi(struct net_device *netdev);

void __qlcnic_set_multi(struct net_device *, u16);

int qlcnic_nic_add_mac(struct qlcnic_adapter *, const u8 *, u16);

int qlcnic_nic_del_mac(struct qlcnic_adapter *, const u8 *);

void qlcnic_82xx_free_mac_list(struct qlcnic_adapter *adapter);
@@ -1569,13 +1560,11 @@ netdev_features_t qlcnic_fix_features(struct net_device *netdev, 
	netdev_features_t features);

int qlcnic_set_features(struct net_device *netdev, netdev_features_t features);

int qlcnic_config_bridged_mode(struct qlcnic_adapter *adapter, u32 enable);

int qlcnic_send_lro_cleanup(struct qlcnic_adapter *adapter);

void qlcnic_update_cmd_producer(struct qlcnic_host_tx_ring *);



/* Functions from qlcnic_ethtool.c */

int qlcnic_check_loopback_buff(unsigned char *, u8 []);

int qlcnic_do_lb_test(struct qlcnic_adapter *, u8);

int qlcnic_loopback_test(struct net_device *, u8);



/* Functions from qlcnic_main.c */

int qlcnic_reset_context(struct qlcnic_adapter *);
@@ -1587,7 +1576,6 @@ void qlcnic_set_sds_ring_count(struct qlcnic_adapter *, u8); 
int qlcnic_setup_rings(struct qlcnic_adapter *, u8, u8);

int qlcnic_validate_rings(struct qlcnic_adapter *, __u32, int);

void qlcnic_alloc_lb_filters_mem(struct qlcnic_adapter *adapter);

void qlcnic_82xx_set_mac_filter_count(struct qlcnic_adapter *);

int qlcnic_enable_msix(struct qlcnic_adapter *, u32);

void qlcnic_set_drv_version(struct qlcnic_adapter *);
@@ -1616,11 +1604,8 @@ void qlcnic_dump_mbx(struct qlcnic_adapter *, struct qlcnic_cmd_args *); 


void qlcnic_create_sysfs_entries(struct qlcnic_adapter *adapter);

void qlcnic_remove_sysfs_entries(struct qlcnic_adapter *adapter);

void qlcnic_create_diag_entries(struct qlcnic_adapter *adapter);

void qlcnic_remove_diag_entries(struct qlcnic_adapter *adapter);

void qlcnic_82xx_add_sysfs(struct qlcnic_adapter *adapter);

void qlcnic_82xx_remove_sysfs(struct qlcnic_adapter *adapter);

int qlcnic_82xx_get_settings(struct qlcnic_adapter *, struct ethtool_cmd *);



int qlcnicvf_config_bridged_mode(struct qlcnic_adapter *, u32);

int qlcnicvf_config_led(struct qlcnic_adapter *, u32, u32);
@@ -1643,7 +1628,6 @@ int qlcnic_init_pci_info(struct qlcnic_adapter *); 
int qlcnic_set_default_offload_settings(struct qlcnic_adapter *);

int qlcnic_reset_npar_config(struct qlcnic_adapter *);

int qlcnic_set_eswitch_port_config(struct qlcnic_adapter *);

void qlcnic_add_lb_filter(struct qlcnic_adapter *, struct sk_buff *, int, u16);

int qlcnic_83xx_configure_opmode(struct qlcnic_adapter *adapter);

int qlcnic_read_mac_addr(struct qlcnic_adapter *);

int qlcnic_setup_netdev(struct qlcnic_adapter *, struct net_device *, int);

drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c

+25 −8
Original line number Diff line number Diff line
@@ -13,6 +13,23 @@ 
#include <linux/interrupt.h>

#include <linux/aer.h>



static void __qlcnic_83xx_process_aen(struct qlcnic_adapter *);

static int qlcnic_83xx_clear_lb_mode(struct qlcnic_adapter *, u8);

static void qlcnic_83xx_configure_mac(struct qlcnic_adapter *, u8 *, u8,

				      struct qlcnic_cmd_args *);

static int qlcnic_83xx_get_port_config(struct qlcnic_adapter *);

static irqreturn_t qlcnic_83xx_handle_aen(int, void *);

static pci_ers_result_t qlcnic_83xx_io_error_detected(struct pci_dev *,

						      pci_channel_state_t);

static int qlcnic_83xx_set_port_config(struct qlcnic_adapter *);

static pci_ers_result_t qlcnic_83xx_io_slot_reset(struct pci_dev *);

static void qlcnic_83xx_io_resume(struct pci_dev *);

static int qlcnic_83xx_set_lb_mode(struct qlcnic_adapter *, u8);

static void qlcnic_83xx_set_mac_filter_count(struct qlcnic_adapter *);

static int qlcnic_83xx_resume(struct qlcnic_adapter *);

static int qlcnic_83xx_shutdown(struct pci_dev *);

static void qlcnic_83xx_get_beacon_state(struct qlcnic_adapter *);



#define RSS_HASHTYPE_IP_TCP		0x3

#define QLC_83XX_FW_MBX_CMD		0

#define QLC_SKIP_INACTIVE_PCI_REGS	7
@@ -636,7 +653,7 @@ int qlcnic_83xx_get_port_info(struct qlcnic_adapter *adapter) 
	return status;

}



void qlcnic_83xx_set_mac_filter_count(struct qlcnic_adapter *adapter)

static void qlcnic_83xx_set_mac_filter_count(struct qlcnic_adapter *adapter)

{

	struct qlcnic_hardware_context *ahw = adapter->ahw;

	u16 act_pci_fn = ahw->total_nic_func;
@@ -871,7 +888,7 @@ static void qlcnic_83xx_handle_idc_comp_aen(struct qlcnic_adapter *adapter, 
	return;

}



void __qlcnic_83xx_process_aen(struct qlcnic_adapter *adapter)

static void __qlcnic_83xx_process_aen(struct qlcnic_adapter *adapter)

{

	struct qlcnic_hardware_context *ahw = adapter->ahw;

	u32 event[QLC_83XX_MBX_AEN_CNT];
@@ -1388,7 +1405,7 @@ out: 
	netif_device_attach(netdev);

}



void qlcnic_83xx_get_beacon_state(struct qlcnic_adapter *adapter)

static void qlcnic_83xx_get_beacon_state(struct qlcnic_adapter *adapter)

{

	struct qlcnic_hardware_context *ahw = adapter->ahw;

	struct qlcnic_cmd_args cmd;
@@ -1559,7 +1576,7 @@ void qlcnic_83xx_initialize_nic(struct qlcnic_adapter *adapter, int enable) 
	qlcnic_free_mbx_args(&cmd);

}



int qlcnic_83xx_set_port_config(struct qlcnic_adapter *adapter)

static int qlcnic_83xx_set_port_config(struct qlcnic_adapter *adapter)

{

	struct qlcnic_cmd_args cmd;

	int err;
@@ -1576,7 +1593,7 @@ int qlcnic_83xx_set_port_config(struct qlcnic_adapter *adapter) 
	return err;

}



int qlcnic_83xx_get_port_config(struct qlcnic_adapter *adapter)

static int qlcnic_83xx_get_port_config(struct qlcnic_adapter *adapter)

{

	struct qlcnic_cmd_args cmd;

	int err;
@@ -1745,7 +1762,7 @@ static void qlcnic_extend_lb_idc_cmpltn_wait(struct qlcnic_adapter *adapter, 
	ahw->extend_lb_time = 0;

}



int qlcnic_83xx_set_lb_mode(struct qlcnic_adapter *adapter, u8 mode)

static int qlcnic_83xx_set_lb_mode(struct qlcnic_adapter *adapter, u8 mode)

{

	struct qlcnic_hardware_context *ahw = adapter->ahw;

	struct net_device *netdev = adapter->netdev;
@@ -1814,7 +1831,7 @@ int qlcnic_83xx_set_lb_mode(struct qlcnic_adapter *adapter, u8 mode) 
	return status;

}



int qlcnic_83xx_clear_lb_mode(struct qlcnic_adapter *adapter, u8 mode)

static int qlcnic_83xx_clear_lb_mode(struct qlcnic_adapter *adapter, u8 mode)

{

	struct qlcnic_hardware_context *ahw = adapter->ahw;

	u32 config = ahw->port_config, max_wait_count;
@@ -3552,7 +3569,7 @@ int qlcnic_83xx_shutdown(struct pci_dev *pdev) 
	return 0;

}



int qlcnic_83xx_resume(struct qlcnic_adapter *adapter)

static int qlcnic_83xx_resume(struct qlcnic_adapter *adapter)

{

	struct qlcnic_hardware_context *ahw = adapter->ahw;

	struct qlc_83xx_idc *idc = &ahw->idc;

drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.h

+0 −22
Original line number Diff line number Diff line
@@ -544,10 +544,7 @@ void qlcnic_83xx_write_crb(struct qlcnic_adapter *, char *, loff_t, size_t); 
void qlcnic_83xx_read_crb(struct qlcnic_adapter *, char *, loff_t, size_t);

int qlcnic_83xx_rd_reg_indirect(struct qlcnic_adapter *, ulong, int *);

int qlcnic_83xx_wrt_reg_indirect(struct qlcnic_adapter *, ulong, u32);

void qlcnic_83xx_process_rcv_diag(struct qlcnic_adapter *, int, u64 []);

int qlcnic_83xx_nic_set_promisc(struct qlcnic_adapter *, u32);

int qlcnic_83xx_set_lb_mode(struct qlcnic_adapter *, u8);

int qlcnic_83xx_clear_lb_mode(struct qlcnic_adapter *, u8);

int qlcnic_83xx_config_hw_lro(struct qlcnic_adapter *, int);

int qlcnic_83xx_config_rss(struct qlcnic_adapter *, int);

int qlcnic_83xx_config_intr_coalesce(struct qlcnic_adapter *);
@@ -561,7 +558,6 @@ void qlcnic_83xx_napi_del(struct qlcnic_adapter *); 
void qlcnic_83xx_napi_enable(struct qlcnic_adapter *);

void qlcnic_83xx_napi_disable(struct qlcnic_adapter *);

int qlcnic_83xx_config_led(struct qlcnic_adapter *, u32, u32);

void qlcnic_83xx_get_beacon_state(struct qlcnic_adapter *);

void qlcnic_ind_wr(struct qlcnic_adapter *, u32, u32);

int qlcnic_ind_rd(struct qlcnic_adapter *, u32);

int qlcnic_83xx_create_rx_ctx(struct qlcnic_adapter *);
@@ -576,15 +572,12 @@ void qlcnic_83xx_process_rcv_ring_diag(struct qlcnic_host_sds_ring *); 
int qlcnic_83xx_config_intrpt(struct qlcnic_adapter *, bool);

int qlcnic_83xx_sre_macaddr_change(struct qlcnic_adapter *, u8 *, u16, u8);

int qlcnic_83xx_get_mac_address(struct qlcnic_adapter *, u8 *, u8);

void qlcnic_83xx_configure_mac(struct qlcnic_adapter *, u8 *, u8,

			       struct qlcnic_cmd_args *);

int qlcnic_83xx_alloc_mbx_args(struct qlcnic_cmd_args *,

			       struct qlcnic_adapter *, u32);

void qlcnic_free_mbx_args(struct qlcnic_cmd_args *);

void qlcnic_set_npar_data(struct qlcnic_adapter *, const struct qlcnic_info *,

			  struct qlcnic_info *);

void qlcnic_83xx_config_intr_coal(struct qlcnic_adapter *);

irqreturn_t qlcnic_83xx_handle_aen(int, void *);

int qlcnic_83xx_get_port_info(struct qlcnic_adapter *);

void qlcnic_83xx_enable_mbx_interrupt(struct qlcnic_adapter *);

void qlcnic_83xx_disable_mbx_intr(struct qlcnic_adapter *);
@@ -597,11 +590,7 @@ void qlcnic_83xx_disable_intr(struct qlcnic_adapter *, 
			     struct qlcnic_host_sds_ring *);

void qlcnic_83xx_check_vf(struct qlcnic_adapter *,

			  const struct pci_device_id *);

void __qlcnic_83xx_process_aen(struct qlcnic_adapter *);

int qlcnic_83xx_get_port_config(struct qlcnic_adapter *);

int qlcnic_83xx_set_port_config(struct qlcnic_adapter *);

int qlcnic_enable_eswitch(struct qlcnic_adapter *, u8, u8);

int qlcnic_83xx_get_nic_configuration(struct qlcnic_adapter *);

int qlcnic_83xx_config_default_opmode(struct qlcnic_adapter *);

int qlcnic_83xx_setup_mbx_intr(struct qlcnic_adapter *);

void qlcnic_83xx_free_mbx_intr(struct qlcnic_adapter *);
@@ -623,9 +612,7 @@ int qlcnic_83xx_lockless_flash_read32(struct qlcnic_adapter *, 
				      u32, u8 *, int);

int qlcnic_83xx_init(struct qlcnic_adapter *, int);

int qlcnic_83xx_idc_ready_state_entry(struct qlcnic_adapter *);

int qlcnic_83xx_check_hw_status(struct qlcnic_adapter *p_dev);

void qlcnic_83xx_idc_poll_dev_state(struct work_struct *);

int qlcnic_83xx_get_reset_instruction_template(struct qlcnic_adapter *);

void qlcnic_83xx_idc_exit(struct qlcnic_adapter *);

void qlcnic_83xx_idc_request_reset(struct qlcnic_adapter *, u32);

int qlcnic_83xx_lock_driver(struct qlcnic_adapter *);
@@ -633,7 +620,6 @@ void qlcnic_83xx_unlock_driver(struct qlcnic_adapter *); 
int qlcnic_83xx_set_default_offload_settings(struct qlcnic_adapter *);

int qlcnic_83xx_ms_mem_write128(struct qlcnic_adapter *, u64, u32 *, u32);

int qlcnic_83xx_idc_vnic_pf_entry(struct qlcnic_adapter *);

int qlcnic_83xx_enable_vnic_mode(struct qlcnic_adapter *, int);

int qlcnic_83xx_disable_vnic_mode(struct qlcnic_adapter *, int);

int qlcnic_83xx_config_vnic_opmode(struct qlcnic_adapter *);

int qlcnic_83xx_get_vnic_vport_info(struct qlcnic_adapter *,
@@ -661,9 +647,6 @@ int qlcnic_83xx_enable_flash_write(struct qlcnic_adapter *); 
int qlcnic_83xx_disable_flash_write(struct qlcnic_adapter *);

void qlcnic_83xx_enable_mbx_poll(struct qlcnic_adapter *);

void qlcnic_83xx_disable_mbx_poll(struct qlcnic_adapter *);

void qlcnic_83xx_set_mac_filter_count(struct qlcnic_adapter *);

int qlcnic_83xx_shutdown(struct pci_dev *);

int qlcnic_83xx_resume(struct qlcnic_adapter *);

int qlcnic_83xx_idc_init(struct qlcnic_adapter *);

int qlcnic_83xx_idc_reattach_driver(struct qlcnic_adapter *);

int qlcnic_83xx_set_vnic_opmode(struct qlcnic_adapter *);
@@ -671,9 +654,4 @@ int qlcnic_83xx_check_vnic_state(struct qlcnic_adapter *); 
void qlcnic_83xx_aer_stop_poll_work(struct qlcnic_adapter *);

int qlcnic_83xx_aer_reset(struct qlcnic_adapter *);

void qlcnic_83xx_aer_start_poll_work(struct qlcnic_adapter *);

pci_ers_result_t qlcnic_83xx_io_error_detected(struct pci_dev *,

					       pci_channel_state_t);

pci_ers_result_t qlcnic_83xx_io_slot_reset(struct pci_dev *);

void qlcnic_83xx_io_resume(struct pci_dev *);

void qlcnic_83xx_stop_hw(struct qlcnic_adapter *);

#endif

drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c

+7 −4
Original line number Diff line number Diff line
@@ -39,6 +39,9 @@ 
static int qlcnic_83xx_init_default_driver(struct qlcnic_adapter *adapter);

static int qlcnic_83xx_check_heartbeat(struct qlcnic_adapter *p_dev);

static int qlcnic_83xx_restart_hw(struct qlcnic_adapter *adapter);

static int qlcnic_83xx_check_hw_status(struct qlcnic_adapter *p_dev);

static int qlcnic_83xx_get_reset_instruction_template(struct qlcnic_adapter *);

static void qlcnic_83xx_stop_hw(struct qlcnic_adapter *);



/* Template header */

struct qlc_83xx_reset_hdr {
@@ -1528,7 +1531,7 @@ static int qlcnic_83xx_check_cmd_peg_status(struct qlcnic_adapter *p_dev) 
	return -EIO;

}



int qlcnic_83xx_check_hw_status(struct qlcnic_adapter *p_dev)

static int qlcnic_83xx_check_hw_status(struct qlcnic_adapter *p_dev)

{

	int err;
@@ -1601,7 +1604,7 @@ static int qlcnic_83xx_reset_template_checksum(struct qlcnic_adapter *p_dev) 
	}

}



int qlcnic_83xx_get_reset_instruction_template(struct qlcnic_adapter *p_dev)

static int qlcnic_83xx_get_reset_instruction_template(struct qlcnic_adapter *p_dev)

{

	struct qlcnic_hardware_context *ahw = p_dev->ahw;

	u32 addr, count, prev_ver, curr_ver;
@@ -1945,7 +1948,7 @@ static void qlcnic_83xx_exec_template_cmd(struct qlcnic_adapter *p_dev, 
	p_dev->ahw->reset.seq_index = index;

}



void qlcnic_83xx_stop_hw(struct qlcnic_adapter *p_dev)

static void qlcnic_83xx_stop_hw(struct qlcnic_adapter *p_dev)

{

	p_dev->ahw->reset.seq_index = 0;
@@ -2028,7 +2031,7 @@ static int qlcnic_83xx_restart_hw(struct qlcnic_adapter *adapter) 
	return 0;

}



int qlcnic_83xx_get_nic_configuration(struct qlcnic_adapter *adapter)

static int qlcnic_83xx_get_nic_configuration(struct qlcnic_adapter *adapter)

{

	int err;

	struct qlcnic_info nic_info;

drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
#include "qlcnic.h"

#include "qlcnic_hw.h"



int qlcnic_83xx_enable_vnic_mode(struct qlcnic_adapter *adapter, int lock)

static int qlcnic_83xx_enable_vnic_mode(struct qlcnic_adapter *adapter, int lock)

{

	if (lock) {

		if (qlcnic_83xx_lock_driver(adapter))