From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 00C05C433EF for ; Mon, 6 Sep 2021 18:54:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DB96E61051 for ; Mon, 6 Sep 2021 18:54:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245119AbhIFSzn (ORCPT ); Mon, 6 Sep 2021 14:55:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36418 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244933AbhIFSzR (ORCPT ); Mon, 6 Sep 2021 14:55:17 -0400 Received: from mail-ej1-x629.google.com (mail-ej1-x629.google.com [IPv6:2a00:1450:4864:20::629]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3EB78C0613C1 for ; Mon, 6 Sep 2021 11:54:12 -0700 (PDT) Received: by mail-ej1-x629.google.com with SMTP id lc21so15074519ejc.7 for ; Mon, 06 Sep 2021 11:54:11 -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=gDDbV5k8w+ZNilfMRl6tEIv8pUv9RSEpEzotQr9O7i4=; b=q31hFjL0IQZ5XdwzFCmEReu0H3IUHIukaDj6js8My/+dsZN7p85RWlt6RLljH1wFdR zQ0Pc35pUfSEqsJ+PqI+9fE4GWy22FBcOQUmY1rAIOsSkg4zQa/xDvNg2IB9fchltQiR QyVtLzDQ0hKNCE0zwFk+uiwQlTfZcBArGIrDcdHcLWn/Ve/0hnONm6Is4jy0L3L4W0hu eMjcAq7EMkLu6Qevk8p2T473ASsdLfA0ieFlpBbgi3W2IicVbirVVK41a0h7KLWSgsBh NtwpZjU5iJrUEyNEi9U9CcJRpkShNraKnEBisTNS1x6nQ0y8EuqCv7w2cf1YHy49UH8d XX3w== 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=gDDbV5k8w+ZNilfMRl6tEIv8pUv9RSEpEzotQr9O7i4=; b=slftRuEP8jLISs202L5Jhc2iqfh44R1vgph6bz/qjJye4DqSFhYn2ZMNHyIYmHIaAo D7XpvixmEcSJxunnSCpFfDqUQ2DFM+WtYvgYylKVwAx4mIfIgOAuRuiCMpSOEKagFiW0 YvBpIsPBXUjAz6FouI9EmsRzFiZe6JhNTn9aIHo6P/ybAIzCFvH90u9rnRHbU1EoB/i6 omeAR92LDAP3Nmp8WkQTBxxl5XYVBGp/rWbc0kJv/nV0qFrnQSNlMWUtCUjSCvnao6HS 4C7V0Nx/3hTdpzUTPafg5S/EYUKs02omlM/j3OIimiOObJUIWUEjdcl31vagBPvTstbG 9uqg== X-Gm-Message-State: AOAM532zKoAVRXstZBb6oprI98F7XnH7KOmzUarDtmk+zSyzOtlkP3RK Usm2UlBrq8H6QZI0Mmpb6lvgN+TUI/Kifg== X-Google-Smtp-Source: ABdhPJzSiHLiEYRIxsFosm8Q3alY7SBEavmJqxf9NwTsN4lL7uPmmHp6LH4tEBnYuQl6RKKHefWONQ== X-Received: by 2002:a17:906:ae4f:: with SMTP id lf15mr15308396ejb.124.1630954450643; Mon, 06 Sep 2021 11:54:10 -0700 (PDT) Received: from localhost.localdomain ([2a02:8108:96c0:3b88::8fe1]) by smtp.gmail.com with ESMTPSA id kk2sm4329128ejc.114.2021.09.06.11.54.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Sep 2021 11:54:10 -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 v2 11/40] staging: r8188eu: remove set_channel_handler from hal_ops Date: Mon, 6 Sep 2021 20:52:58 +0200 Message-Id: <20210906185327.10326-12-straube.linux@gmail.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210906185327.10326-1-straube.linux@gmail.com> References: <20210906185327.10326-1-straube.linux@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Remove set_channel_handler from hal_ops and remove its wrapper rtw_hal_set_chan(). Call PHY_SwChnl8188E() directly instead. Signed-off-by: Michael Straube --- drivers/staging/r8188eu/core/rtw_wlan_util.c | 4 ++-- drivers/staging/r8188eu/hal/hal_intf.c | 6 ------ drivers/staging/r8188eu/hal/rtl8188e_hal_init.c | 2 -- drivers/staging/r8188eu/include/hal_intf.h | 4 ---- 4 files changed, 2 insertions(+), 14 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_wlan_util.c b/drivers/staging/r8188eu/core/rtw_wlan_util.c index 37400e29eec4..cd4f1ae61dca 100644 --- a/drivers/staging/r8188eu/core/rtw_wlan_util.c +++ b/drivers/staging/r8188eu/core/rtw_wlan_util.c @@ -318,7 +318,7 @@ void SelectChannel(struct adapter *padapter, unsigned char channel) { /* saved channel info */ rtw_set_oper_ch(padapter, channel); - rtw_hal_set_chan(padapter, channel); + PHY_SwChnl8188E(padapter, channel); } void SetBWMode(struct adapter *padapter, unsigned short bwmode, @@ -359,7 +359,7 @@ void set_channel_bwmode(struct adapter *padapter, unsigned char channel, unsigne rtw_set_oper_bw(padapter, bwmode); rtw_set_oper_choffset(padapter, channel_offset); - rtw_hal_set_chan(padapter, center_ch); /* set center channel */ + PHY_SwChnl8188E(padapter, center_ch); /* set center channel */ SetBWMode(padapter, bwmode, channel_offset); } diff --git a/drivers/staging/r8188eu/hal/hal_intf.c b/drivers/staging/r8188eu/hal/hal_intf.c index 93691e72e263..79a2a5a0abd9 100644 --- a/drivers/staging/r8188eu/hal/hal_intf.c +++ b/drivers/staging/r8188eu/hal/hal_intf.c @@ -215,12 +215,6 @@ void rtw_hal_write_rfreg(struct adapter *adapt, enum rf_radio_path rfpath, bitmask, data); } -void rtw_hal_set_chan(struct adapter *adapt, u8 channel) -{ - if (adapt->HalFunc.set_channel_handler) - adapt->HalFunc.set_channel_handler(adapt, channel); -} - void rtw_hal_bcn_related_reg_setting(struct adapter *adapt) { if (adapt->HalFunc.SetBeaconRelatedRegistersHandler) diff --git a/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c b/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c index 8a73294d8bec..4274b11e456c 100644 --- a/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c +++ b/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c @@ -1784,8 +1784,6 @@ void rtl8188e_set_hal_ops(struct hal_ops *pHalFunc) { pHalFunc->free_hal_data = &rtl8188e_free_hal_data; - pHalFunc->set_channel_handler = &PHY_SwChnl8188E; - pHalFunc->Add_RateATid = &rtl8188e_Add_RateATid; pHalFunc->run_thread = &rtl8188e_start_thread; pHalFunc->cancel_thread = &rtl8188e_stop_thread; diff --git a/drivers/staging/r8188eu/include/hal_intf.h b/drivers/staging/r8188eu/include/hal_intf.h index f3f294aa6a24..eab0b8576c92 100644 --- a/drivers/staging/r8188eu/include/hal_intf.h +++ b/drivers/staging/r8188eu/include/hal_intf.h @@ -143,8 +143,6 @@ struct hal_ops { s32 (*init_recv_priv)(struct adapter *padapter); void (*free_recv_priv)(struct adapter *padapter); - void (*set_channel_handler)(struct adapter *padapter, u8 channel); - void (*SetHwRegHandler)(struct adapter *padapter, u8 variable, u8 *val); void (*GetHwRegHandler)(struct adapter *padapter, u8 variable, @@ -281,8 +279,6 @@ void rtw_hal_write_rfreg(struct adapter *padapter, enum rf_radio_path eRFPath, u32 RegAddr, u32 BitMask, u32 Data); -void rtw_hal_set_chan(struct adapter *padapter, u8 channel); - u8 rtw_hal_antdiv_before_linked(struct adapter *padapter); void rtw_hal_antdiv_rssi_compared(struct adapter *padapter, struct wlan_bssid_ex *dst, -- 2.33.0