Commit fc3b984a authored by Kalle Valo's avatar Kalle Valo
Browse files

wifi: ath11k: remove manual mask names from debug messages 



Now that the previous patch changed ath11k_dbg() to print the debug level
there's no need to have the level in the actual message anymore. So remove those.

Tested-on: WCN6855 hw2.0 PCI WLAN.HSP.1.1-03125-QCAHSPSWPL_V1_V2_SILICONZ_LITE-3.6510.23

Signed-off-by: default avatarKalle Valo <quic_kvalo@quicinc.com>
Link: https://lore.kernel.org/r/20230609142440.24643-4-kvalo@kernel.org
parent 9a599e96

drivers/net/wireless/ath/ath11k/ahb.c

+2 −2
Original line number Diff line number Diff line
@@ -734,7 +734,7 @@ static int ath11k_ahb_hif_suspend(struct ath11k_base *ab) 
		return ret;

	}



	ath11k_dbg(ab, ATH11K_DBG_AHB, "ahb device suspended\n");

	ath11k_dbg(ab, ATH11K_DBG_AHB, "device suspended\n");



	return ret;

}
@@ -777,7 +777,7 @@ static int ath11k_ahb_hif_resume(struct ath11k_base *ab) 
		return -ETIMEDOUT;

	}



	ath11k_dbg(ab, ATH11K_DBG_AHB, "ahb device resumed\n");

	ath11k_dbg(ab, ATH11K_DBG_AHB, "device resumed\n");



	return 0;

}

drivers/net/wireless/ath/ath11k/core.c

+7 −7
Original line number Diff line number Diff line
@@ -878,16 +878,16 @@ static void ath11k_core_check_cc_code_bdfext(const struct dmi_header *hdr, void 
	case ATH11K_SMBIOS_CC_ISO:

		ab->new_alpha2[0] = (smbios->cc_code >> 8) & 0xff;

		ab->new_alpha2[1] = smbios->cc_code & 0xff;

		ath11k_dbg(ab, ATH11K_DBG_BOOT, "boot smbios cc_code %c%c\n",

		ath11k_dbg(ab, ATH11K_DBG_BOOT, "smbios cc_code %c%c\n",

			   ab->new_alpha2[0], ab->new_alpha2[1]);

		break;

	case ATH11K_SMBIOS_CC_WW:

		ab->new_alpha2[0] = '0';

		ab->new_alpha2[1] = '0';

		ath11k_dbg(ab, ATH11K_DBG_BOOT, "boot smbios worldwide regdomain\n");

		ath11k_dbg(ab, ATH11K_DBG_BOOT, "smbios worldwide regdomain\n");

		break;

	default:

		ath11k_dbg(ab, ATH11K_DBG_BOOT, "boot ignore smbios country code setting %d\n",

		ath11k_dbg(ab, ATH11K_DBG_BOOT, "ignore smbios country code setting %d\n",

			   smbios->country_code_flag);

		break;

	}
@@ -1001,7 +1001,7 @@ static int __ath11k_core_create_board_name(struct ath11k_base *ab, char *name, 
		break;

	}



	ath11k_dbg(ab, ATH11K_DBG_BOOT, "boot using board name '%s'\n", name);

	ath11k_dbg(ab, ATH11K_DBG_BOOT, "using board name '%s'\n", name);



	return 0;

}
@@ -1040,7 +1040,7 @@ const struct firmware *ath11k_core_firmware_request(struct ath11k_base *ab, 
	if (ret)

		return ERR_PTR(ret);



	ath11k_dbg(ab, ATH11K_DBG_BOOT, "boot firmware request %s size %zu\n",

	ath11k_dbg(ab, ATH11K_DBG_BOOT, "firmware request %s size %zu\n",

		   path, fw->size);



	return fw;
@@ -1101,7 +1101,7 @@ static int ath11k_core_parse_bd_ie_board(struct ath11k_base *ab, 


			name_match_found = true;

			ath11k_dbg(ab, ATH11K_DBG_BOOT,

				   "boot found match %s for name '%s'",

				   "found match %s for name '%s'",

				   ath11k_bd_ie_type_str(ie_id),

				   boardname);

		} else if (board_ie_id == data_id) {
@@ -1110,7 +1110,7 @@ static int ath11k_core_parse_bd_ie_board(struct ath11k_base *ab, 
				goto next;



			ath11k_dbg(ab, ATH11K_DBG_BOOT,

				   "boot found %s for '%s'",

				   "found %s for '%s'",

				   ath11k_bd_ie_type_str(ie_id),

				   boardname);

drivers/net/wireless/ath/ath11k/dp_rx.c

+1 −1
Original line number Diff line number Diff line
@@ -1651,7 +1651,7 @@ static void ath11k_htt_backpressure_event_handler(struct ath11k_base *ab, 


	backpressure_time = *data;



	ath11k_dbg(ab, ATH11K_DBG_DP_HTT, "htt backpressure event, pdev %d, ring type %d,ring id %d, hp %d tp %d, backpressure time %d\n",

	ath11k_dbg(ab, ATH11K_DBG_DP_HTT, "backpressure event, pdev %d, ring type %d,ring id %d, hp %d tp %d, backpressure time %d\n",

		   pdev_id, ring_type, ring_id, hp, tp, backpressure_time);



	if (ring_type == HTT_BACKPRESSURE_UMAC_RING_TYPE) {

drivers/net/wireless/ath/ath11k/hal.c

+1 −1
Original line number Diff line number Diff line
@@ -1010,7 +1010,7 @@ int ath11k_hal_srng_setup(struct ath11k_base *ab, enum hal_ring_type type, 
				(u32 *)((unsigned long)ab->mem + reg_base);

			else

				ath11k_dbg(ab, ATH11k_DBG_HAL,

					   "hal type %d ring_num %d reg_base 0x%x shadow 0x%lx\n",

					   "type %d ring_num %d reg_base 0x%x shadow 0x%lx\n",

					   type, ring_num,

					   reg_base,

					   (unsigned long)srng->u.src_ring.hp_addr -

drivers/net/wireless/ath/ath11k/htc.c

+10 −10
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ int ath11k_htc_send(struct ath11k_htc *htc, 
		spin_lock_bh(&htc->tx_lock);

		if (ep->tx_credits < credits) {

			ath11k_dbg(ab, ATH11K_DBG_HTC,

				   "htc insufficient credits ep %d required %d available %d\n",

				   "insufficient credits ep %d required %d available %d\n",

				   eid, credits, ep->tx_credits);

			spin_unlock_bh(&htc->tx_lock);

			ret = -EAGAIN;
@@ -104,7 +104,7 @@ int ath11k_htc_send(struct ath11k_htc *htc, 
		}

		ep->tx_credits -= credits;

		ath11k_dbg(ab, ATH11K_DBG_HTC,

			   "htc ep %d consumed %d credits (total %d)\n",

			   "ep %d consumed %d credits (total %d)\n",

			   eid, credits, ep->tx_credits);

		spin_unlock_bh(&htc->tx_lock);

	}
@@ -132,7 +132,7 @@ int ath11k_htc_send(struct ath11k_htc *htc, 
		spin_lock_bh(&htc->tx_lock);

		ep->tx_credits += credits;

		ath11k_dbg(ab, ATH11K_DBG_HTC,

			   "htc ep %d reverted %d credits back (total %d)\n",

			   "ep %d reverted %d credits back (total %d)\n",

			   eid, credits, ep->tx_credits);

		spin_unlock_bh(&htc->tx_lock);
@@ -167,7 +167,7 @@ ath11k_htc_process_credit_report(struct ath11k_htc *htc, 
		ep = &htc->endpoint[report->eid];

		ep->tx_credits += report->credits;



		ath11k_dbg(ab, ATH11K_DBG_HTC, "htc ep %d got %d credits (total %d)\n",

		ath11k_dbg(ab, ATH11K_DBG_HTC, "ep %d got %d credits (total %d)\n",

			   report->eid, report->credits, ep->tx_credits);



		if (ep->ep_ops.ep_tx_credits) {
@@ -239,7 +239,7 @@ static int ath11k_htc_process_trailer(struct ath11k_htc *htc, 


static void ath11k_htc_suspend_complete(struct ath11k_base *ab, bool ack)

{

	ath11k_dbg(ab, ATH11K_DBG_BOOT, "boot suspend complete %d\n", ack);

	ath11k_dbg(ab, ATH11K_DBG_BOOT, "suspend complete %d\n", ack);



	if (ack)

		set_bit(ATH11K_FLAG_HTC_SUSPEND_COMPLETE, &ab->dev_flags);
@@ -276,7 +276,7 @@ void ath11k_htc_tx_completion_handler(struct ath11k_base *ab, 


static void ath11k_htc_wakeup_from_suspend(struct ath11k_base *ab)

{

	ath11k_dbg(ab, ATH11K_DBG_BOOT, "boot wakeup from suspend is received\n");

	ath11k_dbg(ab, ATH11K_DBG_BOOT, "wakeup from suspend is received\n");

}



void ath11k_htc_rx_completion_handler(struct ath11k_base *ab,
@@ -393,7 +393,7 @@ void ath11k_htc_rx_completion_handler(struct ath11k_base *ab, 
		goto out;

	}



	ath11k_dbg(ab, ATH11K_DBG_HTC, "htc rx completion ep %d skb %pK\n",

	ath11k_dbg(ab, ATH11K_DBG_HTC, "rx completion ep %d skb %pK\n",

		   eid, skb);

	ep->ep_ops.ep_rx_complete(ab, skb);
@@ -615,7 +615,7 @@ int ath11k_htc_connect_service(struct ath11k_htc *htc, 
						    conn_req->service_id);

	if (!tx_alloc)

		ath11k_dbg(ab, ATH11K_DBG_BOOT,

			   "boot htc service %s does not allocate target credits\n",

			   "htc service %s does not allocate target credits\n",

			   htc_service_name(conn_req->service_id));



	skb = ath11k_htc_build_tx_ctrl_skb(htc->ab);
@@ -740,14 +740,14 @@ int ath11k_htc_connect_service(struct ath11k_htc *htc, 
		return status;



	ath11k_dbg(ab, ATH11K_DBG_BOOT,

		   "boot htc service '%s' ul pipe %d dl pipe %d eid %d ready\n",

		   "htc service '%s' ul pipe %d dl pipe %d eid %d ready\n",

		   htc_service_name(ep->service_id), ep->ul_pipe_id,

		   ep->dl_pipe_id, ep->eid);



	if (disable_credit_flow_ctrl && ep->tx_credit_flow_enabled) {

		ep->tx_credit_flow_enabled = false;

		ath11k_dbg(ab, ATH11K_DBG_BOOT,

			   "boot htc service '%s' eid %d TX flow control disabled\n",

			   "htc service '%s' eid %d TX flow control disabled\n",

			   htc_service_name(ep->service_id), assigned_eid);

	}