Browse Source

qcacld-3.0: Fix -Wmissing-prototypes in UTILS

We want to enable the compiler's -Wmissing-prototypes switch, but
there is existing code that is generating warnings. Fix all warnings
in core/utils.

Change-Id: Ie2d735fa1e6eba57e0fa9291bd56dbd6acdb7b00
CRs-Fixed: 1093406
Jeff Johnson 8 years ago
parent
commit
3320c7fc59

+ 25 - 20
core/utils/fwlog/dbglog_host.c

@@ -76,7 +76,7 @@ module_dbg_print mod_print[WLAN_MODULE_ID_MAX];
 
 A_UINT32 dbglog_process_type = DBGLOG_PROCESS_NET_RAW;
 
-const char *dbglog_get_module_str(A_UINT32 module_id)
+static const char *dbglog_get_module_str(A_UINT32 module_id)
 {
 	switch (module_id) {
 	case WLAN_MODULE_INF:
@@ -1392,6 +1392,7 @@ static char *dbglog_get_msg(A_UINT32 moduleid, A_UINT32 debugid)
 	return unknown_str;
 }
 
+static
 void dbglog_printf(A_UINT32 timestamp, A_UINT16 vap_id, const char *fmt, ...)
 {
 	char buf[128];
@@ -1413,7 +1414,7 @@ void dbglog_printf(A_UINT32 timestamp, A_UINT16 vap_id, const char *fmt, ...)
 	AR_DEBUG_PRINTF(ATH_DEBUG_INFO, ("%s\n", buf));
 }
 
-void
+static void
 dbglog_printf_no_line_break(A_UINT32 timestamp,
 			    A_UINT16 vap_id, const char *fmt, ...)
 {
@@ -1438,7 +1439,7 @@ dbglog_printf_no_line_break(A_UINT32 timestamp,
 
 #define USE_NUMERIC 0
 
-A_BOOL
+static A_BOOL
 dbglog_default_print_handler(A_UINT32 mod_id, A_UINT16 vap_id, A_UINT32 dbg_id,
 			     A_UINT32 timestamp, A_UINT16 numargs,
 			     A_UINT32 *args)
@@ -1602,8 +1603,8 @@ dbglog_debugfs_raw_data(wmi_unified_t wmi_handle, const uint8_t *buf,
  *
  * return: 0 if sent successfully, otherwise error code
  */
-int send_fw_diag_nl_data(const uint8_t *buffer, A_UINT32 len,
-			 A_UINT32 event_type)
+static int send_fw_diag_nl_data(const uint8_t *buffer, A_UINT32 len,
+				A_UINT32 event_type)
 {
 	struct sk_buff *skb_out;
 	struct nlmsghdr *nlh;
@@ -1753,7 +1754,7 @@ send_diag_netlink_data(const uint8_t *buffer, A_UINT32 len, A_UINT32 cmd)
 	return res;
 }
 
-int
+static int
 dbglog_process_netlink_data(wmi_unified_t wmi_handle, const uint8_t *buffer,
 			    A_UINT32 len, A_UINT32 dropped)
 {
@@ -2039,7 +2040,7 @@ void dbglog_reg_modprint(A_UINT32 mod_id, module_dbg_print printfn)
 	}
 }
 
-void
+static void
 dbglog_sm_print(A_UINT32 timestamp,
 		A_UINT16 vap_id,
 		A_UINT16 numargs,
@@ -2115,7 +2116,7 @@ dbglog_sm_print(A_UINT32 timestamp,
 	}
 }
 
-A_BOOL
+static A_BOOL
 dbglog_sta_powersave_print_handler(A_UINT32 mod_id,
 				   A_UINT16 vap_id,
 				   A_UINT32 dbg_id,
@@ -2314,7 +2315,7 @@ enum wlan_ibss_ps_sub_module {
 
 #define WLAN_IBSS_PS_SUB_MODULE_OFFSET  0x1E
 
-A_BOOL
+static A_BOOL
 dbglog_ibss_powersave_print_handler(A_UINT32 mod_id,
 				    A_UINT16 vap_id,
 				    A_UINT32 dbg_id,
@@ -2678,6 +2679,7 @@ dbglog_ibss_powersave_print_handler(A_UINT32 mod_id,
 	return true;
 }
 
+static
 A_BOOL dbglog_ratectrl_print_handler(A_UINT32 mod_id,
 				     A_UINT16 vap_id,
 				     A_UINT32 dbg_id,
@@ -2740,6 +2742,7 @@ A_BOOL dbglog_ratectrl_print_handler(A_UINT32 mod_id,
 	return true;
 }
 
+static
 A_BOOL dbglog_ani_print_handler(A_UINT32 mod_id,
 				A_UINT16 vap_id,
 				A_UINT32 dbg_id,
@@ -2834,7 +2837,7 @@ A_BOOL dbglog_ani_print_handler(A_UINT32 mod_id,
 	return true;
 }
 
-A_BOOL
+static A_BOOL
 dbglog_ap_powersave_print_handler(A_UINT32 mod_id,
 				  A_UINT16 vap_id,
 				  A_UINT32 dbg_id,
@@ -2977,7 +2980,7 @@ dbglog_ap_powersave_print_handler(A_UINT32 mod_id,
 	return true;
 }
 
-A_BOOL
+static A_BOOL
 dbglog_wal_print_handler(A_UINT32 mod_id,
 			 A_UINT16 vap_id,
 			 A_UINT32 dbg_id,
@@ -3132,7 +3135,7 @@ dbglog_wal_print_handler(A_UINT32 mod_id,
 	return true;
 }
 
-A_BOOL
+static A_BOOL
 dbglog_scan_print_handler(A_UINT32 mod_id,
 			  A_UINT16 vap_id,
 			  A_UINT32 dbg_id,
@@ -3170,6 +3173,7 @@ dbglog_scan_print_handler(A_UINT32 mod_id,
 	return true;
 }
 
+static
 A_BOOL dbglog_coex_print_handler(A_UINT32 mod_id,
 				 A_UINT16 vap_id,
 				 A_UINT32 dbg_id,
@@ -3663,7 +3667,7 @@ A_BOOL dbglog_coex_print_handler(A_UINT32 mod_id,
 	return true;
 }
 
-A_BOOL
+static A_BOOL
 dbglog_beacon_print_handler(A_UINT32 mod_id,
 			    A_UINT16 vap_id,
 			    A_UINT32 dbg_id,
@@ -3745,7 +3749,7 @@ dbglog_beacon_print_handler(A_UINT32 mod_id,
 	return true;
 }
 
-A_BOOL
+static A_BOOL
 dbglog_data_txrx_print_handler(A_UINT32 mod_id,
 			       A_UINT16 vap_id,
 			       A_UINT32 dbg_id,
@@ -3766,6 +3770,7 @@ dbglog_data_txrx_print_handler(A_UINT32 mod_id,
 	return true;
 }
 
+static
 A_BOOL dbglog_smps_print_handler(A_UINT32 mod_id,
 				 A_UINT16 vap_id,
 				 A_UINT32 dbg_id,
@@ -3887,7 +3892,7 @@ A_BOOL dbglog_smps_print_handler(A_UINT32 mod_id,
 	return true;
 }
 
-A_BOOL
+static A_BOOL
 dbglog_p2p_print_handler(A_UINT32 mod_id,
 			 A_UINT16 vap_id,
 			 A_UINT32 dbg_id,
@@ -3926,7 +3931,7 @@ dbglog_p2p_print_handler(A_UINT32 mod_id,
 	return true;
 }
 
-A_BOOL
+static A_BOOL
 dbglog_pcielp_print_handler(A_UINT32 mod_id,
 			    A_UINT16 vap_id,
 			    A_UINT32 dbg_id,
@@ -4062,7 +4067,7 @@ static const struct file_operations fops_dbglog_block = {
 	.llseek = default_llseek,
 };
 
-int dbglog_debugfs_init(wmi_unified_t wmi_handle)
+static int dbglog_debugfs_init(wmi_unified_t wmi_handle)
 {
 
 	wmi_handle->debugfs_phy = debugfs_create_dir(CLD_DEBUGFS_DIR, NULL);
@@ -4076,7 +4081,7 @@ int dbglog_debugfs_init(wmi_unified_t wmi_handle)
 	return true;
 }
 
-int dbglog_debugfs_remove(wmi_unified_t wmi_handle)
+static int dbglog_debugfs_remove(wmi_unified_t wmi_handle)
 {
 	debugfs_remove_recursive(wmi_handle->debugfs_phy);
 	return true;
@@ -4094,7 +4099,7 @@ int dbglog_debugfs_remove(wmi_unified_t wmi_handle)
 
    \return - 0 for success, non zero for failure
    --------------------------------------------------------------------------*/
-int cnss_diag_msg_callback(struct sk_buff *skb)
+static int cnss_diag_msg_callback(struct sk_buff *skb)
 {
 	struct nlmsghdr *nlh;
 	struct dbglog_slot *slot;
@@ -4156,7 +4161,7 @@ int cnss_diag_activate_service(void)
 	return 0;
 }
 
-A_BOOL
+static A_BOOL
 dbglog_wow_print_handler(A_UINT32 mod_id,
 			 A_UINT16 vap_id,
 			 A_UINT32 dbg_id,

+ 1 - 1
core/utils/logging/src/wlan_logging_sock_svc.c

@@ -740,7 +740,7 @@ void wlan_report_log_completion(uint32_t is_fatal,
  *
  * Return: None
  */
-void send_flush_completion_to_user(void)
+static void send_flush_completion_to_user(void)
 {
 	uint32_t is_fatal, indicator, reason_code;
 	bool recovery_needed;

+ 2 - 2
core/utils/pktlog/linux_ac.c

@@ -193,7 +193,7 @@ void pktlog_release_buf(struct hif_opaque_softc *scn)
 	pl_info->buf = NULL;
 }
 
-void pktlog_cleanup(struct ath_pktlog_info *pl_info)
+static void pktlog_cleanup(struct ath_pktlog_info *pl_info)
 {
 	pl_info->log_state = 0;
 	PKTLOG_LOCK_DESTROY(pl_info);
@@ -840,7 +840,7 @@ static void pktlog_vclose(struct vm_area_struct *vma)
 	PKTLOG_MOD_DEC_USE_COUNT;
 }
 
-int pktlog_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
+static int pktlog_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
 {
 	unsigned long address = (unsigned long)vmf->virtual_address;
 

+ 6 - 6
core/utils/pktlog/pktlog_ac.c

@@ -559,6 +559,7 @@ void pktlog_process_fw_msg(uint32_t *buff)
 
 }
 
+#if defined(QCA_WIFI_3_0_ADRASTEA)
 /**
  * pktlog_t2h_msg_handler() - Target to host message handler
  * @context: pdev context
@@ -566,7 +567,7 @@ void pktlog_process_fw_msg(uint32_t *buff)
  *
  * Return: None
  */
-void pktlog_t2h_msg_handler(void *context, HTC_PACKET *pkt)
+static void pktlog_t2h_msg_handler(void *context, HTC_PACKET *pkt)
 {
 	struct ol_pktlog_dev_t *pdev = (struct ol_pktlog_dev_t *)context;
 	qdf_nbuf_t pktlog_t2h_msg = (qdf_nbuf_t) pkt->pPktContext;
@@ -595,7 +596,7 @@ void pktlog_t2h_msg_handler(void *context, HTC_PACKET *pkt)
  *
  * Return: None
  */
-void pktlog_tx_resume_handler(void *context)
+static void pktlog_tx_resume_handler(void *context)
 {
 	qdf_print("%s: Not expected", __func__);
 	qdf_assert(0);
@@ -608,7 +609,7 @@ void pktlog_tx_resume_handler(void *context)
  *
  * Return: None
  */
-void pktlog_h2t_send_complete(void *context, HTC_PACKET *htc_pkt)
+static void pktlog_h2t_send_complete(void *context, HTC_PACKET *htc_pkt)
 {
 	qdf_print("%s: Not expected", __func__);
 	qdf_assert(0);
@@ -621,7 +622,7 @@ void pktlog_h2t_send_complete(void *context, HTC_PACKET *htc_pkt)
  *
  * Return: HTC action
  */
-HTC_SEND_FULL_ACTION pktlog_h2t_full(void *context, HTC_PACKET *pkt)
+static HTC_SEND_FULL_ACTION pktlog_h2t_full(void *context, HTC_PACKET *pkt)
 {
 	return HTC_SEND_FULL_KEEP;
 }
@@ -632,7 +633,7 @@ HTC_SEND_FULL_ACTION pktlog_h2t_full(void *context, HTC_PACKET *pkt)
  *
  * Return: 0 for success/failure
  */
-int pktlog_htc_connect_service(struct ol_pktlog_dev_t *pdev)
+static int pktlog_htc_connect_service(struct ol_pktlog_dev_t *pdev)
 {
 	HTC_SERVICE_CONNECT_REQ connect;
 	HTC_SERVICE_CONNECT_RESP response;
@@ -680,7 +681,6 @@ int pktlog_htc_connect_service(struct ol_pktlog_dev_t *pdev)
 	return 0;               /* success */
 }
 
-#if defined(QCA_WIFI_3_0_ADRASTEA)
 /**
  * pktlog_htc_attach() - attach pktlog HTC service
  *

+ 1 - 1
core/utils/pktlog/pktlog_internal.c

@@ -253,7 +253,7 @@ static void process_ieee_hdr(void *data)
  *
  * Return: none
  */
-void
+static void
 fill_ieee80211_hdr_data(struct ol_txrx_pdev_t *txrx_pdev,
 	struct ath_pktlog_msdu_info *pl_msdu_info, void *data)
 {