From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ej1-f45.google.com (mail-ej1-f45.google.com [209.85.218.45]) (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 6D5B472 for ; Mon, 6 Sep 2021 19:02:54 +0000 (UTC) Received: by mail-ej1-f45.google.com with SMTP id h9so15146090ejs.4 for ; Mon, 06 Sep 2021 12:02:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=uYnkOq4yxqkoB1rb/ew5x0vj+H8yKqRwDVySAJFiDa4=; b=DfB7sVYdYlWaBe8Gu48z3RvXHStBbqKU0fAxDkNtI1EuHvCReBdxrivjvXU2XGwe8b RPDW7Hwazw/ZR8dQtgPU/lgIMUOMpLwU/f70lucc7mtHTh5QzHbtvZbJNdfFDAex/C63 bxwM+BDChFVKqma09Vy7vDlWPKHpFvV8vkqnHriRcnHof8z/nttkuYaMIKElchxhiJmB lSx4m5G2i6RbZG7lkBKtX/3V0ltmQ68meglyTT4jDa8c/OjrVfrm+aafl8wjdo/qYK08 U43RAAPGy3BwPsLFhmXLKrSUrczeWTEpVEhGrAini1I0BZwDDDbOdnY0vMixCnh/aSlq XGkg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=uYnkOq4yxqkoB1rb/ew5x0vj+H8yKqRwDVySAJFiDa4=; b=ffEZeNOfrsr2noDtAgKpJTj87dS98wGrcJkXIJMd1A+IfV1ApponNMcbzK54x3p9ZW HA5q68dscaE2eZJic1RAqUvBH4khIgvu2Excga9vi8lnbhaDc8bSoteqZZIKEcDQsOC7 tlWSIPza+z0981g3lsq1is8qlnna++Io76V9Uvl2yoZ5+Q8gMt4EeihLTkTeC5rOx2QC UnPWHOChj/kft0cwlILvXChT2xIsJ7NcRtl+vst7aakhKC7usNN/xfGEWrZvXAXMCd5t sXugC4LhmWr2M0B9meCebSYc9x13PKuBVZEOx4LsMoSPaiF7ID+VM3oX9evShY/6Lq6E 86Mg== X-Gm-Message-State: AOAM531AiFyQB1I8DIRpn5A5CuuLZkHY/jXzTbnw+7k/RWmtC5gmaqMg JGGSamSPm0QFtfrFbB4zywY= X-Google-Smtp-Source: ABdhPJy7MD8qtlB4RAqTd0ENop1+T5mKFR7A+n+BUOvXxfHw/kz96DfNs/GxySP/3ujNKwfsQxOaWg== X-Received: by 2002:a17:906:2505:: with SMTP id i5mr15087341ejb.450.1630954972870; Mon, 06 Sep 2021 12:02:52 -0700 (PDT) Received: from localhost.localdomain ([2a02:8108:96c0:3b88::8fe1]) by smtp.gmail.com with ESMTPSA id k15sm4372018ejb.92.2021.09.06.12.02.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Sep 2021 12:02:52 -0700 (PDT) From: Michael Straube To: gregkh@linuxfoundation.org Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk, martin@kaiser.cx, fmdefrancesco@gmail.com, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH v3 10/40] staging: r8188eu: remove set_bwmode_handler from hal_ops Date: Mon, 6 Sep 2021 21:01:53 +0200 Message-Id: <20210906190223.11396-11-straube.linux@gmail.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210906190223.11396-1-straube.linux@gmail.com> References: <20210906190223.11396-1-straube.linux@gmail.com> Precedence: bulk X-Mailing-List: linux-staging@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Remove set_bwmode_handler from hal_ops and remove its wrapper rtw_hal_set_bwmode(). Call PHY_SetBWMode8188E() directly instead. Signed-off-by: Michael Straube --- drivers/staging/r8188eu/core/rtw_wlan_util.c | 2 +- drivers/staging/r8188eu/hal/hal_intf.c | 8 -------- drivers/staging/r8188eu/hal/rtl8188e_hal_init.c | 1 - drivers/staging/r8188eu/include/hal_intf.h | 5 ----- 4 files changed, 1 insertion(+), 15 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_wlan_util.c b/drivers/staging/r8188eu/core/rtw_wlan_util.c index ccb5fbbc3ffb..37400e29eec4 100644 --- a/drivers/staging/r8188eu/core/rtw_wlan_util.c +++ b/drivers/staging/r8188eu/core/rtw_wlan_util.c @@ -328,7 +328,7 @@ void SetBWMode(struct adapter *padapter, unsigned short bwmode, rtw_set_oper_bw(padapter, bwmode); rtw_set_oper_choffset(padapter, channel_offset); - rtw_hal_set_bwmode(padapter, (enum ht_channel_width)bwmode, channel_offset); + PHY_SetBWMode8188E(padapter, (enum ht_channel_width)bwmode, channel_offset); } void set_channel_bwmode(struct adapter *padapter, unsigned char channel, unsigned char channel_offset, unsigned short bwmode) diff --git a/drivers/staging/r8188eu/hal/hal_intf.c b/drivers/staging/r8188eu/hal/hal_intf.c index 9374e5ecb13b..93691e72e263 100644 --- a/drivers/staging/r8188eu/hal/hal_intf.c +++ b/drivers/staging/r8188eu/hal/hal_intf.c @@ -215,14 +215,6 @@ void rtw_hal_write_rfreg(struct adapter *adapt, enum rf_radio_path rfpath, bitmask, data); } -void rtw_hal_set_bwmode(struct adapter *adapt, - enum ht_channel_width bandwidth, u8 offset) -{ - if (adapt->HalFunc.set_bwmode_handler) - adapt->HalFunc.set_bwmode_handler(adapt, bandwidth, - offset); -} - void rtw_hal_set_chan(struct adapter *adapt, u8 channel) { if (adapt->HalFunc.set_channel_handler) diff --git a/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c b/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c index 844a18117f09..8a73294d8bec 100644 --- a/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c +++ b/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c @@ -1784,7 +1784,6 @@ void rtl8188e_set_hal_ops(struct hal_ops *pHalFunc) { pHalFunc->free_hal_data = &rtl8188e_free_hal_data; - pHalFunc->set_bwmode_handler = &PHY_SetBWMode8188E; pHalFunc->set_channel_handler = &PHY_SwChnl8188E; pHalFunc->Add_RateATid = &rtl8188e_Add_RateATid; diff --git a/drivers/staging/r8188eu/include/hal_intf.h b/drivers/staging/r8188eu/include/hal_intf.h index caf759a9eb48..f3f294aa6a24 100644 --- a/drivers/staging/r8188eu/include/hal_intf.h +++ b/drivers/staging/r8188eu/include/hal_intf.h @@ -143,9 +143,6 @@ struct hal_ops { s32 (*init_recv_priv)(struct adapter *padapter); void (*free_recv_priv)(struct adapter *padapter); - void (*set_bwmode_handler)(struct adapter *padapter, - enum ht_channel_width Bandwidth, - u8 Offset); void (*set_channel_handler)(struct adapter *padapter, u8 channel); void (*SetHwRegHandler)(struct adapter *padapter, u8 variable, @@ -284,8 +281,6 @@ void rtw_hal_write_rfreg(struct adapter *padapter, enum rf_radio_path eRFPath, u32 RegAddr, u32 BitMask, u32 Data); -void rtw_hal_set_bwmode(struct adapter *padapter, - enum ht_channel_width Bandwidth, u8 Offset); void rtw_hal_set_chan(struct adapter *padapter, u8 channel); u8 rtw_hal_antdiv_before_linked(struct adapter *padapter); -- 2.33.0