Prechádzať zdrojové kódy

qcacld-3.0: sap: Replace instances of unadorned %p

Replace instances of unadorned %p in core/sap.

Change-Id: I37a803518430313d360d10e429469fa7bb471b78
CRs-Fixed: 2100997
Jeff Johnson 7 rokov pred
rodič
commit
a7c0ddb8c1

+ 1 - 1
core/sap/dfs/src/dfs.c

@@ -792,7 +792,7 @@ dfs_control(struct ieee80211com *ic, u_int id,
 	case DFS_SET_THRESH:
 		if (insize < sizeof(struct dfs_ioctl_params) || !indata) {
 			DFS_DPRINTK(dfs, ATH_DEBUG_DFS1,
-				    "%s: insize=%d, expected=%zu bytes, indata=%p\n",
+				    "%s: insize=%d, expected=%zu bytes, indata=%pK\n",
 				    __func__, insize,
 				    sizeof(struct dfs_ioctl_params), indata);
 			error = -EINVAL;

+ 2 - 2
core/sap/dfs/src/dfs_fcc_bin5.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2016 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2002-2017 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -388,7 +388,7 @@ dfs_check_chirping_sowl(struct ath_dfs *dfs, void *buf,
 	/* DEBUG - Print relevant portions of the FFT data */
 	for (p = 0; p < num_fft_packets; p++) {
 
-		DFS_DPRINTK(dfs, ATH_DEBUG_DFS_BIN5_FFT, "fft_data_ptr=0x%p\t",
+		DFS_DPRINTK(dfs, ATH_DEBUG_DFS_BIN5_FFT, "fft_data_ptr=0x%pK\t",
 			    fft_data_ptr);
 		DFS_DPRINTK(dfs, ATH_DEBUG_DFS_BIN5_FFT, "[66]=%d [69]=%d\n",
 			    *(fft_data_ptr + FFT_LOWER_BIN_MAX_INDEX_BYTE) >> 2,

+ 3 - 3
core/sap/dfs/src/dfs_init.c

@@ -87,7 +87,7 @@ void dfs_reset_alldelaylines(struct ath_dfs *dfs, int seg_id)
 
 	if (pl == NULL) {
 		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
-			  "%s[%d]:  pl==NULL, dfs=%p", __func__, __LINE__, dfs);
+			  "%s[%d]:  pl==NULL, dfs=%pK", __func__, __LINE__, dfs);
 		return;
 	}
 
@@ -95,7 +95,7 @@ void dfs_reset_alldelaylines(struct ath_dfs *dfs, int seg_id)
 		if (((seg_id == 0) ?
 		    dfs->dfs_b5radars : dfs->dfs_b5radars_ext_seg) == NULL) {
 			DFS_DPRINTK(dfs, ATH_DEBUG_DFS,
-				    "%s: pl==NULL, b5radars=%p\n",
+				    "%s: pl==NULL, b5radars=%pK\n",
 				    __func__,
 				    (seg_id == 0) ? dfs->dfs_b5radars :
 						    dfs->dfs_b5radars_ext_seg);
@@ -104,7 +104,7 @@ void dfs_reset_alldelaylines(struct ath_dfs *dfs, int seg_id)
 	} else {
 		if (dfs->dfs_b5radars == NULL) {
 			QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
-				"%s[%d]: pl==NULL, b5radars=%p", __func__, __LINE__,
+				"%s[%d]: pl==NULL, b5radars=%pK", __func__, __LINE__,
 				dfs->dfs_b5radars);
 			return;
 		}

+ 3 - 3
core/sap/dfs/src/dfs_phyerr_tlv.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2016 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2017 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -318,7 +318,7 @@ radar_summary_parse(struct ath_dfs *dfs, const char *buf, size_t len,
 			rs[1]);
 		/*
 		 * DFS_DPRINTK(dfs, ATH_DEBUG_DFS_PHYERR,
-				"%s (p=%p):", __func__, buf);
+				"%s (p=%pK):", __func__, buf);
 		 */
 
 		is_chip_oversampling = PERE_IS_OVERSAMPLING(dfs);
@@ -584,7 +584,7 @@ static int tlv_calc_freq_info(struct ath_dfs *dfs, struct rx_radar_status *rs)
 	 * For now, just handle up to VHT80 correctly.
 	 */
 	if (dfs->ic == NULL || dfs->ic->ic_curchan == NULL) {
-		DFS_PRINTK("%s: dfs->ic=%p, that or curchan is null?",
+		DFS_PRINTK("%s: dfs->ic=%pK, that or curchan is null?",
 			   __func__, dfs->ic);
 		return 0;
 	}

+ 8 - 8
core/sap/src/sap_api_link_cntl.c

@@ -497,7 +497,7 @@ wlansap_roam_process_ch_change_success(tpAniSirGlobal mac_ctx,
 			mac_ctx->sap.SapDfsInfo.cac_state)) {
 			sap_ctx->sapsMachine = eSAP_DISCONNECTED;
 			QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_MED,
-				  FL("sapdfs: from state eSAP_DISCONNECTING => DISCONNECTED with ignore cac false on sapctx[%p]"),
+				  FL("sapdfs: from state eSAP_DISCONNECTING => DISCONNECTED with ignore cac false on sapctx[%pK]"),
 				  sap_ctx);
 			/* DFS Channel */
 			sap_event.event = eSAP_DFS_CHANNEL_CAC_START;
@@ -507,7 +507,7 @@ wlansap_roam_process_ch_change_success(tpAniSirGlobal mac_ctx,
 		} else {
 			QDF_TRACE(QDF_MODULE_ID_SAP,
 				  QDF_TRACE_LEVEL_INFO_MED,
-				  FL("sapdfs: from state eSAP_DISCONNECTING => eSAP_STARTING with ignore cac true on sapctx[%p]"),
+				  FL("sapdfs: from state eSAP_DISCONNECTING => eSAP_STARTING with ignore cac true on sapctx[%pK]"),
 				  sap_ctx);
 
 			/* Start beaconing on the new channel */
@@ -521,7 +521,7 @@ wlansap_roam_process_ch_change_success(tpAniSirGlobal mac_ctx,
 		}
 	} else {
 		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_MED,
-			  FL("sapdfs: from state eSAP_DISCONNECTING => eSAP_STARTING on sapctx[%p]"),
+			  FL("sapdfs: from state eSAP_DISCONNECTING => eSAP_STARTING on sapctx[%pK]"),
 			  sap_ctx);
 		/* non-DFS channel */
 		sap_ctx->sapsMachine = eSAP_STARTING;
@@ -645,7 +645,7 @@ wlansap_roam_process_dfs_chansw_update(tHalHandle hHal,
 	if (false ==
 	    is_concurrent_sap_ready_for_channel_change(hHal, sap_ctx)) {
 		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_MED,
-			  FL("sapdfs: sapctx[%p] ready but not concurrent sap"),
+			  FL("sapdfs: sapctx[%pK] ready but not concurrent sap"),
 			  sap_ctx);
 		*ret_status = QDF_STATUS_SUCCESS;
 		return;
@@ -660,7 +660,7 @@ wlansap_roam_process_dfs_chansw_update(tHalHandle hHal,
 
 		pSapContext = mac_ctx->sap.sapCtxList[intf].pSapContext;
 		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_MED,
-			  FL("sapdfs:issue chnl change for sapctx[%p]"),
+			  FL("sapdfs:issue chnl change for sapctx[%pK]"),
 			  pSapContext);
 		/* Send channel switch request */
 		sap_event.event = eWNI_SME_CHANNEL_CHANGE_REQ;
@@ -671,7 +671,7 @@ wlansap_roam_process_dfs_chansw_update(tHalHandle hHal,
 		qdf_status = sap_fsm(pSapContext, &sap_event);
 		if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
 			QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
-				  FL("post chnl chng req failed, sap[%p]"),
+				  FL("post chnl chng req failed, sap[%pK]"),
 				  sap_ctx);
 			*ret_status = QDF_STATUS_E_FAILURE;
 		} else {
@@ -871,7 +871,7 @@ static void wlansap_update_vendor_acs_chan(tpAniSirGlobal mac_ctx,
 			    mac_ctx->sap.sapCtxList[intf].pSapContext;
 			QDF_TRACE(QDF_MODULE_ID_SAP,
 				  QDF_TRACE_LEVEL_ERROR,
-				  FL("sapdfs: no available channel for sapctx[%p], StopBss"),
+				  FL("sapdfs: no available channel for sapctx[%pK], StopBss"),
 				  pSapContext);
 			wlansap_stop_bss(pSapContext);
 		}
@@ -1074,7 +1074,7 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId,
 				    mac_ctx->sap.sapCtxList[intf].pSapContext;
 				QDF_TRACE(QDF_MODULE_ID_SAP,
 					  QDF_TRACE_LEVEL_ERROR,
-					  FL("sapdfs: no available channel for sapctx[%p], StopBss"),
+					  FL("sapdfs: no available channel for sapctx[%pK], StopBss"),
 					  pSapContext);
 				wlansap_stop_bss(pSapContext);
 			}

+ 1 - 1
core/sap/src/sap_ch_select.c

@@ -1665,7 +1665,7 @@ static void sap_compute_spect_weight(tSapChSelSpectInfo *pSpectInfoParams,
 
 				QDF_TRACE(QDF_MODULE_ID_SAP,
 					  QDF_TRACE_LEVEL_INFO_HIGH,
-					  "In %s, bssdes.ch_self=%d, bssdes.ch_ID=%d, bssdes.rssi=%d, SpectCh.bssCount=%d, pScanResult=%p, ChannelWidth %d, secondaryChanOffset %d, center frequency %d",
+					  "In %s, bssdes.ch_self=%d, bssdes.ch_ID=%d, bssdes.rssi=%d, SpectCh.bssCount=%d, pScanResult=%pK, ChannelWidth %d, secondaryChanOffset %d, center frequency %d",
 					  __func__,
 					  pScanResult->BssDescriptor.
 					  channelIdSelf,

+ 11 - 11
core/sap/src/sap_fsm.c

@@ -1927,7 +1927,7 @@ QDF_STATUS sap_set_session_param(tHalHandle hal, struct sap_context *sapctx,
 	mac_ctx->sap.sapCtxList[sapctx->sessionId].sapPersona =
 				sapctx->csr_roamProfile.csrPersona;
 	QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_DEBUG,
-		"%s: Initializing sapContext = %p with session = %d", __func__,
+		"%s: Initializing sapContext = %pK with session = %d", __func__,
 		sapctx, session_id);
 
 	return QDF_STATUS_SUCCESS;
@@ -1947,7 +1947,7 @@ QDF_STATUS sap_clear_session_param(tHalHandle hal, struct sap_context *sapctx,
 	qdf_mem_zero(sapctx, sizeof(*sapctx));
 	sapctx->sessionId = CSR_SESSION_ID_INVALID;
 	QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_DEBUG,
-		"%s: Initializing State: %d, sapContext value = %p", __func__,
+		"%s: Initializing State: %d, sapContext value = %pK", __func__,
 		sapctx->sapsMachine, sapctx);
 
 	return QDF_STATUS_SUCCESS;
@@ -2711,7 +2711,7 @@ static QDF_STATUS sap_cac_start_notify(tHalHandle hHal)
 		    && pMac->sap.sapCtxList[intf].pSapContext != NULL &&
 		    (false == pSapContext->isCacStartNotified)) {
 			QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_MED,
-				  "sapdfs: Signaling eSAP_DFS_CAC_START to HDD for sapctx[%p]",
+				  "sapdfs: Signaling eSAP_DFS_CAC_START to HDD for sapctx[%pK]",
 				  pSapContext);
 
 			qdf_status = sap_signal_hdd_event(pSapContext, NULL,
@@ -2835,7 +2835,7 @@ static QDF_STATUS sap_cac_end_notify(tHalHandle hHal, tCsrRoamInfo *roamInfo)
 			pSapContext->isCacEndNotified = true;
 			pMac->sap.SapDfsInfo.sap_radar_found_status = false;
 			QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_MED,
-				  "sapdfs: Start beacon request on sapctx[%p]",
+				  "sapdfs: Start beacon request on sapctx[%pK]",
 				  pSapContext);
 
 			/* Start beaconing on the new channel */
@@ -2936,7 +2936,7 @@ static QDF_STATUS sap_fsm_state_disconnected(struct sap_context *sap_ctx,
 			FL("from state eSAP_DISCONNECTED => SAP_DFS_CAC_WAIT"));
 		if (mac_ctx->sap.SapDfsInfo.is_dfs_cac_timer_running != true) {
 			QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_MED,
-			    FL("sapdfs: starting dfs cac timer on sapctx[%p]"),
+			    FL("sapdfs: starting dfs cac timer on sapctx[%pK]"),
 			    sap_ctx);
 			sap_start_dfs_cac_timer(sap_ctx);
 		}
@@ -3387,7 +3387,7 @@ static QDF_STATUS sap_fsm_state_started(struct sap_context *sap_ctx,
 				    mac_ctx->sap.sapCtxList[intf].pSapContext;
 				QDF_TRACE(QDF_MODULE_ID_SAP,
 					  QDF_TRACE_LEVEL_INFO_MED,
-					  FL("sapdfs: Sending CSAIE for sapctx[%p]"),
+					  FL("sapdfs: Sending CSAIE for sapctx[%pK]"),
 					  temp_sap_ctx);
 
 				qdf_status = wlansap_dfs_send_csa_ie_request(
@@ -3455,7 +3455,7 @@ static QDF_STATUS sap_fsm_state_disconnecting(struct sap_context *sap_ctx,
 					(void *)eSAP_STATUS_SUCCESS);
 	} else if (msg == eWNI_SME_CHANNEL_CHANGE_REQ) {
 		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_MED,
-			  FL("sapdfs: Send channel change request on sapctx[%p]"),
+			  FL("sapdfs: Send channel change request on sapctx[%pK]"),
 			  sap_ctx);
 
 		sap_get_cac_dur_dfs_region(sap_ctx,
@@ -3521,7 +3521,7 @@ QDF_STATUS sap_fsm(struct sap_context *sap_ctx, ptWLAN_SAPEvent sap_event)
 	}
 
 	QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_DEBUG,
-		  FL("sap_ctx=%p, state_var=%d, msg=0x%x"),
+		  FL("sap_ctx=%pK, state_var=%d, msg=0x%x"),
 		  sap_ctx, state_var, msg);
 
 	switch (state_var) {
@@ -4221,7 +4221,7 @@ void sap_dfs_cac_timer_callback(void *data)
 	 * CAC Complete, post eSAP_DFS_CHANNEL_CAC_END to sap_fsm
 	 */
 	QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_MED,
-			"sapdfs: Sending eSAP_DFS_CHANNEL_CAC_END for target_channel = %d on sapctx[%p]",
+			"sapdfs: Sending eSAP_DFS_CHANNEL_CAC_END for target_channel = %d on sapctx[%pK]",
 			sapContext->channel, sapContext);
 
 	sapEvent.event = eSAP_DFS_CHANNEL_CAC_END;
@@ -4445,14 +4445,14 @@ bool is_concurrent_sap_ready_for_channel_change(tHalHandle hHal,
 			if (pSapContext == sapContext) {
 				QDF_TRACE(QDF_MODULE_ID_SAP,
 					  QDF_TRACE_LEVEL_ERROR,
-					  FL("sapCtx matched [%p]"),
+					  FL("sapCtx matched [%pK]"),
 					  sapContext);
 				continue;
 			} else {
 				QDF_TRACE(QDF_MODULE_ID_SAP,
 					  QDF_TRACE_LEVEL_ERROR,
 					  FL
-						  ("concurrent sapCtx[%p] didn't matche with [%p]"),
+						  ("concurrent sapCtx[%pK] didn't matche with [%pK]"),
 					  pSapContext, sapContext);
 				return pSapContext->is_sap_ready_for_chnl_chng;
 			}

+ 1 - 1
core/sap/src/sap_module.c

@@ -797,7 +797,7 @@ QDF_STATUS wlansap_start_bss(void *pCtx,     /* pwextCtx */
 	pSapCtx = CDS_GET_SAP_CB(pCtx);
 
 	QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
-		  "wlansap_start_bss: sapContext=%p", pSapCtx);
+		  "wlansap_start_bss: sapContext=%pK", pSapCtx);
 
 	if (NULL == pSapCtx) {
 		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,