From nobody Sun Feb 8 15:57:44 2026 Received: from mail-yw1-f175.google.com (mail-yw1-f175.google.com [209.85.128.175]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BB0042192EE for ; Wed, 28 Jan 2026 00:40:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.175 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769560829; cv=none; b=lrtwe/Czrkv2tOb4eYjNMiqf72eSi8BX/4tYphKdx9oYsHQSMQ0FlC7+PRc0rDGrx0ylgHMrjedb7nkaPmTXfTLQNhWZtyrCJbWi0QOZg1jcUHKJ0JtqPAhsaCklyryU4KwjG6CJCOeO63qMvrhXOrcdL0xBsQoQKszb9UFYNoY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769560829; c=relaxed/simple; bh=EDN0QGTFDvm8ggC9Q6gvIRT036y5U8fQ0O9YIfrFmi8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=tTnPv39j9SVnAyMHbCWa7Ob2DdKxxRwy+g9xv2gg7PeCjBIDopTzbsUvXVkYPDlWIliyv0/UXcFJi6dE+tJJxVqDjQtrj1RxhZh2toYYK41tDvFrYJjk9l0tgQZkoNu67t/ZmrM93/tjY2JQMtdvB/g+8Z7eEJMQXQG8buoAppI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=H1E/t3Z7; arc=none smtp.client-ip=209.85.128.175 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="H1E/t3Z7" Received: by mail-yw1-f175.google.com with SMTP id 00721157ae682-7927b1620ddso7061167b3.0 for ; Tue, 27 Jan 2026 16:40:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1769560827; x=1770165627; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=HCQDQqxS7QhTVFDcAi3eDL0L7CLRtmR3GtbKlv50k3U=; b=H1E/t3Z7U8pcJa6OcBwCLXkdZFr0q8J0l3/E9bXRKXAp2ePZ/g5Upxq1gPgcZ1FO9g x82mA0j6XfIzOLRVjU7FS3SaacUpvmlLhcQzl4v71EISloKWh1avDafzDzbw+LzLO1HB yjb2J1sz5BS+wCztoaow83IORxp+f9qvnIXKeTofETL8AcoViXxRRZGzaM/RksoiEodi tG8OXMk8R+gc532MOEbzW9VvYj9kReHhIiTqOFntiyMGAinHTQoH3O6W2QB1R0OaEGoa J6wIeYAzfJNK0gRAKcr+CADED7aOMkHJ6ICy0CntrleSwmk9C5T/Wv8E7gqg0Hr6Vih/ Bn4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769560827; x=1770165627; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=HCQDQqxS7QhTVFDcAi3eDL0L7CLRtmR3GtbKlv50k3U=; b=wJGGeeQZHciJz2VVF3NEfGJrXQiVeOYtKCxAK1wfXg2405jP08yserEWPJXGRJU0dk RnTHYYxDgICiEhC6jMYlm0+PaFaQu3QZ3RIxEO4Fp3MOmYE6d75VADSE2oE+3RtWvZH7 bFcmuNNhMVOkU6Vq6rmAkJGQIqibJQgJOUCoJhDr2JwaGc2jRtC3Sk87hb3GCcs+NE+o mrlYPgRyx62xr70twEmW/QJDHoqhUcmWt61XiQnYDZBsRzkpRLhaqApYivJG2wa0n3ok 4W+jmgajEO8QDyCReuKuFAZYBJ0f2tJWE+9m36qnLKxVS5QEBXiMerykqI2wY335fOcZ o/5w== X-Forwarded-Encrypted: i=1; AJvYcCX5plrd2ZXNdFtbQva3IJIBItr+r8POnqcS0RnVj3NITpzN34MhxoBI54nmzFmlFcIqWaCaxBlcKAeEQ/I=@vger.kernel.org X-Gm-Message-State: AOJu0YxDBl8YUUj5GpHVBwkFW3VnKPdV4E7ZnI295DXaMGwOb+nxA8ly yqZp0jAf9tOqlFHdnWlyYxFl/WnpMxWi6q/yrWyzz5/BNCX3xtlwzLD4 X-Gm-Gg: AZuq6aL3AYbcIC1JgWUJPxKax5mTcgAMaRdf1QwGDDI9EG3WxyZVliMDNgS+gVVhB5y Og+yBdjEs192sXo4bVDup9uWtfODkN37gnXgGOt3FNDyV5V+raQOK+3ieVJ/QN8ZmMD4dncRpuc +VcPLJ9ATn0lk48Yzq9CmheTz5QyRBNYPoAMyNYSiGwREo9Fm/9JKUjz8KcUebq69ibDxUs+ZeO LVREhfuM0mKR5rRf5k5sVo5H7CWMZkEGYSuvJv6MpWJmWAVkLbQqxSGeUicvX1ibopFZ6vem/hh ZTOrJKPnFRegbTOXWI//Omllrtjt+G1/nziM7ulFV7aUS9Y91KPlCBeSFgnWtsAw0+8EBL7JKQB Ks9i0K8R/yV5hMwDkxg2qsrfqgW7rIH7Cribag/iMK+445jBmlVF1/4pXxVdVruolfZk= X-Received: by 2002:a05:690c:6607:b0:794:1b2f:cc90 with SMTP id 00721157ae682-7947abd2f37mr30076637b3.2.1769560826763; Tue, 27 Jan 2026 16:40:26 -0800 (PST) Received: from tux ([2601:7c0:c37c:4c00::9944]) by smtp.gmail.com with ESMTPSA id 00721157ae682-794827625d3sm4791867b3.11.2026.01.27.16.40.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Jan 2026 16:40:26 -0800 (PST) From: Ethan Tidmore To: Greg Kroah-Hartman Cc: Michael Straube , Dan Carpenter , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Ethan Tidmore Subject: [PATCH v2 4/4] staging: rtl8723bs: remove unused struct debug_priv and all counters Date: Tue, 27 Jan 2026 18:40:08 -0600 Message-ID: <20260128004009.51095-5-ethantidmore06@gmail.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260128004009.51095-1-ethantidmore06@gmail.com> References: <20260128004009.51095-1-ethantidmore06@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The struct debug_priv is a collection of diagnostic counters that are updated throughout the driver's hot paths (RX/TX, MLME, Power Control, and SDIO) but are never read, exposed via debugfs, or used for logic. This cleanup removes: - The entire struct debug_priv definition and its instance in dvobj_priv. - All write-only counter increments across the core, hal, and os_dep. - Unused local pointers (psdpriv, pdbgpriv) that were only serving the dead diagnostic logic. - Redundant logic blocks that only existed to update these counters. Signed-off-by: Ethan Tidmore --- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 3 -- drivers/staging/rtl8723bs/core/rtw_pwrctrl.c | 6 +-- drivers/staging/rtl8723bs/core/rtw_recv.c | 13 +---- .../staging/rtl8723bs/hal/rtl8723b_hal_init.c | 4 -- drivers/staging/rtl8723bs/hal/sdio_halinit.c | 8 +--- drivers/staging/rtl8723bs/include/drv_types.h | 41 ---------------- drivers/staging/rtl8723bs/os_dep/os_intfs.c | 14 ++---- drivers/staging/rtl8723bs/os_dep/sdio_intf.c | 48 +++++-------------- 8 files changed, 17 insertions(+), 120 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c b/drivers/stagin= g/rtl8723bs/core/rtw_mlme_ext.c index fa1e3ad59254..f4b50bfdb9d5 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c @@ -438,8 +438,6 @@ void mgt_dispatcher(struct adapter *padapter, union rec= v_frame *precv_frame) struct mlme_priv *pmlmepriv =3D &padapter->mlmepriv; u8 *pframe =3D precv_frame->u.hdr.rx_data; struct sta_info *psta =3D rtw_get_stainfo(&padapter->stapriv, GetAddr2Ptr= (pframe)); - struct dvobj_priv *psdpriv =3D padapter->dvobj; - struct debug_priv *pdbgpriv =3D &psdpriv->drv_dbg; =20 if (GetFrameType(pframe) !=3D WIFI_MGT_TYPE) return; @@ -463,7 +461,6 @@ void mgt_dispatcher(struct adapter *padapter, union rec= v_frame *precv_frame) if (GetRetry(pframe)) { if (precv_frame->u.hdr.attrib.seq_num =3D=3D psta->RxMgmtFrameSeqNum) { /* drop the duplicate management frame */ - pdbgpriv->dbg_rx_dup_mgt_frame_drop_count++; return; } } diff --git a/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c b/drivers/staging= /rtl8723bs/core/rtw_pwrctrl.c index 0ef788abf403..f06d8bc6dac5 100644 --- a/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c +++ b/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c @@ -139,8 +139,6 @@ static bool rtw_pwr_unassociated_idle(struct adapter *a= dapter) void rtw_ps_processor(struct adapter *padapter) { struct pwrctrl_priv *pwrpriv =3D adapter_to_pwrctl(padapter); - struct dvobj_priv *psdpriv =3D padapter->dvobj; - struct debug_priv *pdbgpriv =3D &psdpriv->drv_dbg; u32 ps_deny =3D 0; =20 mutex_lock(&adapter_to_pwrctl(padapter)->lock); @@ -149,10 +147,8 @@ void rtw_ps_processor(struct adapter *padapter) if (ps_deny !=3D 0) goto exit; =20 - if (pwrpriv->bInSuspend) {/* system suspend or autosuspend */ - pdbgpriv->dbg_ps_insuspend_cnt++; + if (pwrpriv->bInSuspend) return; - } =20 pwrpriv->ps_processing =3D true; =20 diff --git a/drivers/staging/rtl8723bs/core/rtw_recv.c b/drivers/staging/rt= l8723bs/core/rtw_recv.c index cc824427f9a8..409dab008a1d 100644 --- a/drivers/staging/rtl8723bs/core/rtw_recv.c +++ b/drivers/staging/rtl8723bs/core/rtw_recv.c @@ -1782,9 +1782,6 @@ static int amsdu_to_msdu(struct adapter *padapter, un= ion recv_frame *prframe) =20 static int check_indicate_seq(struct recv_reorder_ctrl *preorder_ctrl, u16= seq_num) { - struct adapter *padapter =3D preorder_ctrl->padapter; - struct dvobj_priv *psdpriv =3D padapter->dvobj; - struct debug_priv *pdbgpriv =3D &psdpriv->drv_dbg; u8 wsize =3D preorder_ctrl->wsize_b; u16 wend =3D (preorder_ctrl->indicate_seq + wsize - 1) % 4096u; =20 @@ -1810,7 +1807,6 @@ static int check_indicate_seq(struct recv_reorder_ctr= l *preorder_ctrl, u16 seq_n preorder_ctrl->indicate_seq =3D seq_num + 1 - wsize; else preorder_ctrl->indicate_seq =3D 0xFFF - (wsize - (seq_num + 1)) + 1; - pdbgpriv->dbg_rx_ampdu_window_shift_cnt++; } =20 return true; @@ -1907,8 +1903,6 @@ static int recv_indicatepkts_in_order(struct adapter = *padapter, struct recv_reor int bPktInBuf =3D false; struct recv_priv *precvpriv =3D &padapter->recvpriv; struct __queue *ppending_recvframe_queue =3D &preorder_ctrl->pending_recv= frame_queue; - struct dvobj_priv *psdpriv =3D padapter->dvobj; - struct debug_priv *pdbgpriv =3D &psdpriv->drv_dbg; =20 /* spin_lock_irqsave(&ppending_recvframe_queue->lock, irql); */ /* spin_lock(&ppending_recvframe_queue->lock); */ @@ -1918,7 +1912,6 @@ static int recv_indicatepkts_in_order(struct adapter = *padapter, struct recv_reor =20 /* Handling some condition for forced indicate case. */ if (bforced =3D=3D true) { - pdbgpriv->dbg_rx_ampdu_forced_indicate_count++; if (list_empty(phead)) { /* spin_unlock_irqrestore(&ppending_recvframe_queue->lock, irql); */ /* spin_unlock(&ppending_recvframe_queue->lock); */ @@ -1988,8 +1981,6 @@ static int recv_indicatepkt_reorder(struct adapter *p= adapter, union recv_frame * struct rx_pkt_attrib *pattrib =3D &prframe->u.hdr.attrib; struct recv_reorder_ctrl *preorder_ctrl =3D prframe->u.hdr.preorder_ctrl; struct __queue *ppending_recvframe_queue =3D &preorder_ctrl->pending_recv= frame_queue; - struct dvobj_priv *psdpriv =3D padapter->dvobj; - struct debug_priv *pdbgpriv =3D &psdpriv->drv_dbg; =20 if (!pattrib->amsdu) { /* s1. */ @@ -2032,10 +2023,8 @@ static int recv_indicatepkt_reorder(struct adapter *= padapter, union recv_frame * spin_lock_bh(&ppending_recvframe_queue->lock); =20 /* s2. check if winstart_b(indicate_seq) needs to been updated */ - if (!check_indicate_seq(preorder_ctrl, pattrib->seq_num)) { - pdbgpriv->dbg_rx_ampdu_drop_count++; + if (!check_indicate_seq(preorder_ctrl, pattrib->seq_num)) goto _err_exit; - } =20 =20 /* s3. Insert all packet into Reorder Queue to maintain its ordering. */ diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c b/drivers/st= aging/rtl8723bs/hal/rtl8723b_hal_init.c index 054e2c2eab02..0527f36c6bfa 100644 --- a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +++ b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c @@ -304,8 +304,6 @@ s32 rtl8723b_FirmwareDownload(struct adapter *padapter,= bool bUsedWoWLANFw) const struct firmware *fw; struct device *device =3D dvobj_to_dev(padapter->dvobj); u8 *fwfilepath; - struct dvobj_priv *psdpriv =3D padapter->dvobj; - struct debug_priv *pdbgpriv =3D &psdpriv->drv_dbg; u8 tmp_ps; =20 pFirmware =3D kzalloc(sizeof(struct rt_firmware), GFP_KERNEL); @@ -324,8 +322,6 @@ s32 rtl8723b_FirmwareDownload(struct adapter *padapter,= bool bUsedWoWLANFw) /* 2. read power_state =3D 0xA0[1:0] */ tmp_ps =3D rtw_read8(padapter, 0xa0); tmp_ps &=3D 0x03; - if (tmp_ps !=3D 0x01) - pdbgpriv->dbg_downloadfw_pwr_state_cnt++; =20 fwfilepath =3D "rtlwifi/rtl8723bs_nic.bin"; =20 diff --git a/drivers/staging/rtl8723bs/hal/sdio_halinit.c b/drivers/staging= /rtl8723bs/hal/sdio_halinit.c index 4e81ef53dc47..a3940b61e177 100644 --- a/drivers/staging/rtl8723bs/hal/sdio_halinit.c +++ b/drivers/staging/rtl8723bs/hal/sdio_halinit.c @@ -886,9 +886,6 @@ static void CardDisableRTL8723BSdio(struct adapter *pad= apter) =20 u32 rtl8723bs_hal_deinit(struct adapter *padapter) { - struct dvobj_priv *psdpriv =3D padapter->dvobj; - struct debug_priv *pdbgpriv =3D &psdpriv->drv_dbg; - if (padapter->hw_init_completed) { if (adapter_to_pwrctl(padapter)->bips_processing) { if (padapter->netif_up) { @@ -921,18 +918,15 @@ u32 rtl8723bs_hal_deinit(struct adapter *padapter) adapter_to_pwrctl(padapter)->pre_ips_type =3D 0; =20 } else { - pdbgpriv->dbg_carddisable_cnt++; CardDisableRTL8723BSdio(padapter); =20 adapter_to_pwrctl(padapter)->pre_ips_type =3D 1; } =20 } else { - pdbgpriv->dbg_carddisable_cnt++; CardDisableRTL8723BSdio(padapter); } - } else - pdbgpriv->dbg_deinit_fail_cnt++; + } =20 return _SUCCESS; } diff --git a/drivers/staging/rtl8723bs/include/drv_types.h b/drivers/stagin= g/rtl8723bs/include/drv_types.h index f86180dc350c..d07f04d51e55 100644 --- a/drivers/staging/rtl8723bs/include/drv_types.h +++ b/drivers/staging/rtl8723bs/include/drv_types.h @@ -177,45 +177,6 @@ struct registry_priv { #define GET_IFACE_NUMS(padapter) (((struct adapter *)padapter)->dvobj->ifa= ce_nums) #define GET_ADAPTER(padapter, iface_id) (((struct adapter *)padapter)->dvo= bj->padapters[iface_id]) =20 -struct debug_priv { - u32 dbg_sdio_free_irq_error_cnt; - u32 dbg_sdio_alloc_irq_error_cnt; - u32 dbg_sdio_free_irq_cnt; - u32 dbg_sdio_alloc_irq_cnt; - u32 dbg_sdio_deinit_error_cnt; - u32 dbg_sdio_init_error_cnt; - u32 dbg_suspend_error_cnt; - u32 dbg_suspend_cnt; - u32 dbg_resume_cnt; - u32 dbg_resume_error_cnt; - u32 dbg_deinit_fail_cnt; - u32 dbg_carddisable_cnt; - u32 dbg_carddisable_error_cnt; - u32 dbg_ps_insuspend_cnt; - u32 dbg_dev_unload_inIPS_cnt; - u32 dbg_wow_leave_ps_fail_cnt; - u32 dbg_scan_pwr_state_cnt; - u32 dbg_downloadfw_pwr_state_cnt; - u32 dbg_fw_read_ps_state_fail_cnt; - u32 dbg_leave_ips_fail_cnt; - u32 dbg_leave_lps_fail_cnt; - u32 dbg_h2c_leave32k_fail_cnt; - u32 dbg_diswow_dload_fw_fail_cnt; - u32 dbg_enwow_dload_fw_fail_cnt; - u32 dbg_ips_drvopen_fail_cnt; - u32 dbg_poll_fail_cnt; - u32 dbg_rpwm_toggle_cnt; - u32 dbg_rpwm_timeout_fail_cnt; - u64 dbg_rx_fifo_last_overflow; - u64 dbg_rx_fifo_curr_overflow; - u64 dbg_rx_fifo_diff_overflow; - u64 dbg_rx_ampdu_drop_count; - u64 dbg_rx_ampdu_forced_indicate_count; - u64 dbg_rx_ampdu_loss_count; - u64 dbg_rx_dup_mgt_frame_drop_count; - u64 dbg_rx_ampdu_window_shift_cnt; -}; - struct rtw_traffic_statistics { /* tx statistics */ u64 tx_bytes; @@ -251,8 +212,6 @@ struct dvobj_priv { =20 s32 processing_dev_remove; =20 - struct debug_priv drv_dbg; - /* for local/global synchronization */ /* */ spinlock_t lock; diff --git a/drivers/staging/rtl8723bs/os_dep/os_intfs.c b/drivers/staging/= rtl8723bs/os_dep/os_intfs.c index bc02db13781c..fd47f324a8bc 100644 --- a/drivers/staging/rtl8723bs/os_dep/os_intfs.c +++ b/drivers/staging/rtl8723bs/os_dep/os_intfs.c @@ -964,8 +964,6 @@ void rtw_ndev_destructor(struct net_device *ndev) void rtw_dev_unload(struct adapter *padapter) { struct pwrctrl_priv *pwrctl =3D adapter_to_pwrctl(padapter); - struct dvobj_priv *pobjpriv =3D padapter->dvobj; - struct debug_priv *pdbgpriv =3D &pobjpriv->drv_dbg; struct cmd_priv *pcmdpriv =3D &padapter->cmdpriv; u8 cnt =3D 0; =20 @@ -994,7 +992,6 @@ void rtw_dev_unload(struct adapter *padapter) /* check HW status and SW state */ netdev_dbg(padapter->pnetdev, "%s: driver in IPS-FWLPS\n", __func__); - pdbgpriv->dbg_dev_unload_inIPS_cnt++; LeaveAllPowerSaveMode(padapter); } else { netdev_dbg(padapter->pnetdev, @@ -1077,24 +1074,21 @@ static void rtw_suspend_normal(struct adapter *pada= pter) void rtw_suspend_common(struct adapter *padapter) { struct dvobj_priv *psdpriv =3D padapter->dvobj; - struct debug_priv *pdbgpriv =3D &psdpriv->drv_dbg; struct pwrctrl_priv *pwrpriv =3D dvobj_to_pwrctl(psdpriv); struct mlme_priv *pmlmepriv =3D &padapter->mlmepriv; =20 unsigned long start_time =3D jiffies; =20 netdev_dbg(padapter->pnetdev, " suspend start\n"); - pdbgpriv->dbg_suspend_cnt++; =20 pwrpriv->bInSuspend =3D true; =20 while (pwrpriv->bips_processing) msleep(1); =20 - if ((!padapter->bup) || (padapter->bDriverStopped) || (padapter->bSurpris= eRemoved)) { - pdbgpriv->dbg_suspend_error_cnt++; + if ((!padapter->bup) || (padapter->bDriverStopped) || (padapter->bSurpris= eRemoved)) return; - } + rtw_ps_deny(padapter, PS_DENY_SUSPEND); =20 rtw_cancel_all_timer(padapter); @@ -1123,7 +1117,6 @@ static int rtw_resume_process_normal(struct adapter *= padapter) struct pwrctrl_priv *pwrpriv; struct mlme_priv *pmlmepriv; struct dvobj_priv *psdpriv; - struct debug_priv *pdbgpriv; =20 int ret =3D _SUCCESS; =20 @@ -1136,7 +1129,7 @@ static int rtw_resume_process_normal(struct adapter *= padapter) pwrpriv =3D adapter_to_pwrctl(padapter); pmlmepriv =3D &padapter->mlmepriv; psdpriv =3D padapter->dvobj; - pdbgpriv =3D &psdpriv->drv_dbg; + /* interface init */ /* if (sdio_init(adapter_to_dvobj(padapter)) !=3D _SUCCESS) */ if ((padapter->intf_init) && (padapter->intf_init(adapter_to_dvobj(padapt= er)) !=3D _SUCCESS)) { @@ -1155,7 +1148,6 @@ static int rtw_resume_process_normal(struct adapter *= padapter) =20 if (pm_netdev_open(pnetdev, true) !=3D 0) { ret =3D -1; - pdbgpriv->dbg_resume_error_cnt++; goto exit; } =20 diff --git a/drivers/staging/rtl8723bs/os_dep/sdio_intf.c b/drivers/staging= /rtl8723bs/os_dep/sdio_intf.c index dc787954126f..a86252ccac76 100644 --- a/drivers/staging/rtl8723bs/os_dep/sdio_intf.c +++ b/drivers/staging/rtl8723bs/os_dep/sdio_intf.c @@ -70,13 +70,10 @@ static int sdio_alloc_irq(struct dvobj_priv *dvobj) sdio_claim_host(func); =20 err =3D sdio_claim_irq(func, &sd_sync_int_hdl); - if (err) { - dvobj->drv_dbg.dbg_sdio_alloc_irq_error_cnt++; + if (err) netdev_crit(dvobj->if1->pnetdev, "%s: sdio_claim_irq FAIL(%d)!\n", __fun= c__, err); - } else { - dvobj->drv_dbg.dbg_sdio_alloc_irq_cnt++; + else dvobj->irq_alloc =3D 1; - } =20 sdio_release_host(func); =20 @@ -97,12 +94,10 @@ static void sdio_free_irq(struct dvobj_priv *dvobj) sdio_claim_host(func); err =3D sdio_release_irq(func); if (err) { - dvobj->drv_dbg.dbg_sdio_free_irq_error_cnt++; netdev_err(dvobj->if1->pnetdev, "%s: sdio_release_irq FAIL(%d)!\n", __func__, err); - } else - dvobj->drv_dbg.dbg_sdio_free_irq_cnt++; + } sdio_release_host(func); } dvobj->irq_alloc =3D 0; @@ -122,16 +117,13 @@ static u32 sdio_init(struct dvobj_priv *dvobj) sdio_claim_host(func); =20 err =3D sdio_enable_func(func); - if (err) { - dvobj->drv_dbg.dbg_sdio_init_error_cnt++; + if (err) goto release; - } =20 err =3D sdio_set_block_size(func, 512); - if (err) { - dvobj->drv_dbg.dbg_sdio_init_error_cnt++; + if (err) goto release; - } + psdio_data->block_transfer_len =3D 512; psdio_data->tx_block_mode =3D 1; psdio_data->rx_block_mode =3D 1; @@ -147,23 +139,15 @@ static u32 sdio_init(struct dvobj_priv *dvobj) static void sdio_deinit(struct dvobj_priv *dvobj) { struct sdio_func *func; - int err; =20 func =3D dvobj->intf_data.func; =20 if (func) { sdio_claim_host(func); - err =3D sdio_disable_func(func); - if (err) - dvobj->drv_dbg.dbg_sdio_deinit_error_cnt++; + sdio_disable_func(func); =20 - if (dvobj->irq_alloc) { - err =3D sdio_release_irq(func); - if (err) - dvobj->drv_dbg.dbg_sdio_free_irq_error_cnt++; - else - dvobj->drv_dbg.dbg_sdio_free_irq_cnt++; - } + if (dvobj->irq_alloc) + sdio_release_irq(func); =20 sdio_release_host(func); } @@ -434,15 +418,12 @@ static int rtw_sdio_suspend(struct device *dev) struct dvobj_priv *psdpriv =3D sdio_get_drvdata(func); struct pwrctrl_priv *pwrpriv =3D dvobj_to_pwrctl(psdpriv); struct adapter *padapter =3D psdpriv->if1; - struct debug_priv *pdbgpriv =3D &psdpriv->drv_dbg; =20 if (padapter->bDriverStopped) return 0; =20 - if (pwrpriv->bInSuspend) { - pdbgpriv->dbg_suspend_error_cnt++; + if (pwrpriv->bInSuspend) return 0; - } =20 rtw_suspend_common(padapter); =20 @@ -452,13 +433,9 @@ static int rtw_sdio_suspend(struct device *dev) static int rtw_resume_process(struct adapter *padapter) { struct pwrctrl_priv *pwrpriv =3D adapter_to_pwrctl(padapter); - struct dvobj_priv *psdpriv =3D padapter->dvobj; - struct debug_priv *pdbgpriv =3D &psdpriv->drv_dbg; =20 - if (!pwrpriv->bInSuspend) { - pdbgpriv->dbg_resume_error_cnt++; + if (!pwrpriv->bInSuspend) return -1; - } =20 return rtw_resume_common(padapter); } @@ -470,9 +447,6 @@ static int rtw_sdio_resume(struct device *dev) struct adapter *padapter =3D psdpriv->if1; struct mlme_ext_priv *pmlmeext =3D &padapter->mlmeextpriv; int ret =3D 0; - struct debug_priv *pdbgpriv =3D &psdpriv->drv_dbg; - - pdbgpriv->dbg_resume_cnt++; =20 ret =3D rtw_resume_process(padapter); =20 --=20 2.52.0