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 0C1D5C433F5 for ; Mon, 6 Sep 2021 18:27:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id ED8106103B for ; Mon, 6 Sep 2021 18:27:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245140AbhIFS2n (ORCPT ); Mon, 6 Sep 2021 14:28:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58080 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244695AbhIFS0k (ORCPT ); Mon, 6 Sep 2021 14:26:40 -0400 Received: from mail-ej1-x62f.google.com (mail-ej1-x62f.google.com [IPv6:2a00:1450:4864:20::62f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 62061C06129E for ; Mon, 6 Sep 2021 11:25:31 -0700 (PDT) Received: by mail-ej1-x62f.google.com with SMTP id h9so14989234ejs.4 for ; Mon, 06 Sep 2021 11:25:31 -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=TVR+RwIrGcXA5k9sFAbMhC+nwPYdOsqbj86/tNRj8/8=; b=KS+gxwnhwi2fPtRq/TfncrL+hfb/Ez1ID1zLpmgOR33P12pMtNqCjq1wMqokknf7kL Jnq8XfYYcvOi/m/IBm/fU0MXnVPC3jP7k/kf0mNiR292ESb4yamGUG5VHirRTsWJETN+ jDgfr9bRELfJneDsGnoMGpstO4YkedS8IjMqSSebcHYvpp4Qomb8J2lH/xTLU2ZxMf+V IZLaQUgVpY4Q8+jn/SUvw7IhHp9jE/4WfSFNpuhzZenEBMf7O4/0zpgPOguHKZcoRIkn vGxncmUWeePz1jIt1NEAVACpFhDIGvFXnQunx3OHjoqH9QBUQ6wOoeQf2Z9KQp+3d+Ze STLw== 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=TVR+RwIrGcXA5k9sFAbMhC+nwPYdOsqbj86/tNRj8/8=; b=frj1r3lakqnLE/lKmPI6njz6ohp6ixmjdZA3aUdfXtvBEPQ9kh2SjDfylVPq0/M2MQ AIQT4JjGHr3pn+VAYdWwxH/9Z2h+6YGKH+2MC6sYe+DIfKx7SJolvaIFvVHhWYcImtAE JBfg1mrmPtK5z0e17Uo81orcD+uU8INRZjz1rTKlIS/monHeq3n6gDM/oyhL+tqhiuoD WwwdJLytmsc4PwGDkMzZGVoT1HjuCn8k7LF1JP+86Ami2fx8YtwK47y8osabGWXcTaq3 55qNernZ1sxHDcSDyBRZTGo26ywInhD6mX3kB7fNYQ35OEQQetixXLmpwtbm3T19q6tR dF5A== X-Gm-Message-State: AOAM533vKsrDWL01T2Mi9hpVAai6CLxDMXPXMSTNFR4NLKcteD6HDbY6 o80bCW7PSUtFdBgTk04mdro= X-Google-Smtp-Source: ABdhPJzLEj+3+Ro6U332YZ4/U67ErLUmDnEFcjcAoihHBG2voXzF5d1sbjCI/R56KSWxJfdcWQUBGQ== X-Received: by 2002:a17:906:f24d:: with SMTP id gy13mr14499258ejb.395.1630952730135; Mon, 06 Sep 2021 11:25:30 -0700 (PDT) Received: from localhost.localdomain ([2a02:8108:96c0:3b88::8fe1]) by smtp.gmail.com with ESMTPSA id s25sm4284492ejq.17.2021.09.06.11.25.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Sep 2021 11:25:29 -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 39/40] staging: r8188eu: remove SetBeaconRelatedRegistersHandler from hal_ops Date: Mon, 6 Sep 2021 20:24:37 +0200 Message-Id: <20210906182438.5417-40-straube.linux@gmail.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210906182438.5417-1-straube.linux@gmail.com> References: <20210906182438.5417-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 SetBeaconRelatedRegistersHandler hal_ops and remove its wrapper rtw_hal_bcn_related_reg_setting(). Call SetBeaconRelatedRegisters8188EUsb() directly instead. Signed-off-by: Michael Straube --- drivers/staging/r8188eu/core/rtw_wlan_util.c | 2 +- drivers/staging/r8188eu/hal/hal_intf.c | 6 ------ drivers/staging/r8188eu/hal/usb_halinit.c | 3 +-- drivers/staging/r8188eu/include/hal_intf.h | 5 ++--- 4 files changed, 4 insertions(+), 12 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_wlan_util.c b/drivers/staging/r8188eu/core/rtw_wlan_util.c index cd4f1ae61dca..c2f664bdb979 100644 --- a/drivers/staging/r8188eu/core/rtw_wlan_util.c +++ b/drivers/staging/r8188eu/core/rtw_wlan_util.c @@ -1525,7 +1525,7 @@ void correct_TSF(struct adapter *padapter, struct mlme_ext_priv *pmlmeext) void beacon_timing_control(struct adapter *padapter) { - rtw_hal_bcn_related_reg_setting(padapter); + SetBeaconRelatedRegisters8188EUsb(padapter); } static struct adapter *pbuddy_padapter; diff --git a/drivers/staging/r8188eu/hal/hal_intf.c b/drivers/staging/r8188eu/hal/hal_intf.c index 17ac271e2417..d38a8134b243 100644 --- a/drivers/staging/r8188eu/hal/hal_intf.c +++ b/drivers/staging/r8188eu/hal/hal_intf.c @@ -180,12 +180,6 @@ void rtw_hal_write_rfreg(struct adapter *adapt, enum rf_radio_path rfpath, bitmask, data); } -void rtw_hal_bcn_related_reg_setting(struct adapter *adapt) -{ - if (adapt->HalFunc.SetBeaconRelatedRegistersHandler) - adapt->HalFunc.SetBeaconRelatedRegistersHandler(adapt); -} - int rtw_hal_iol_cmd(struct adapter *adapter, struct xmit_frame *xmit_frame, u32 max_wating_ms, u32 bndy_cnt) { diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8188eu/hal/usb_halinit.c index 2c010f12118a..4d60b5156995 100644 --- a/drivers/staging/r8188eu/hal/usb_halinit.c +++ b/drivers/staging/r8188eu/hal/usb_halinit.c @@ -2147,7 +2147,7 @@ static void UpdateHalRAMask8188EUsb(struct adapter *adapt, u32 mac_id, u8 rssi_l psta->init_rate = init_rate; } -static void SetBeaconRelatedRegisters8188EUsb(struct adapter *adapt) +void SetBeaconRelatedRegisters8188EUsb(struct adapter *adapt) { u32 value32; struct mlme_ext_priv *pmlmeext = &adapt->mlmeextpriv; @@ -2231,7 +2231,6 @@ void rtl8188eu_set_hal_ops(struct adapter *adapt) halfunc->SetHalDefVarHandler = &SetHalDefVar8188EUsb; halfunc->UpdateRAMaskHandler = &UpdateHalRAMask8188EUsb; - halfunc->SetBeaconRelatedRegistersHandler = &SetBeaconRelatedRegisters8188EUsb; halfunc->hal_xmit = &rtl8188eu_hal_xmit; halfunc->mgnt_xmit = &rtl8188eu_mgnt_xmit; diff --git a/drivers/staging/r8188eu/include/hal_intf.h b/drivers/staging/r8188eu/include/hal_intf.h index 9b0a44659f57..668a21cbe71e 100644 --- a/drivers/staging/r8188eu/include/hal_intf.h +++ b/drivers/staging/r8188eu/include/hal_intf.h @@ -149,7 +149,6 @@ struct hal_ops { void (*UpdateRAMaskHandler)(struct adapter *padapter, u32 mac_id, u8 rssi_level); - void (*SetBeaconRelatedRegistersHandler)(struct adapter *padapter); s32 (*hal_xmit)(struct adapter *padapter, struct xmit_frame *pxmitframe); @@ -205,6 +204,8 @@ int rtl8188e_Efuse_PgPacketWrite(struct adapter *pAdapter, u8 offset, u8 word_en void hal_notch_filter_8188e(struct adapter *adapter, bool enable); +void SetBeaconRelatedRegisters8188EUsb(struct adapter *adapt); + uint rtw_hal_init(struct adapter *padapter); uint rtw_hal_deinit(struct adapter *padapter); void rtw_hal_stop(struct adapter *padapter); @@ -232,8 +233,6 @@ void rtw_hal_update_ra_mask(struct adapter *padapter, u32 mac_id, u8 level); void rtw_hal_clone_data(struct adapter *dst_adapt, struct adapter *src_adapt); -void rtw_hal_bcn_related_reg_setting(struct adapter *padapter); - u32 rtw_hal_read_bbreg(struct adapter *padapter, u32 RegAddr, u32 BitMask); void rtw_hal_write_bbreg(struct adapter *padapter, u32 RegAddr, u32 BitMask, u32 Data); -- 2.33.0