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 0D5FAC433EF for ; Mon, 6 Sep 2021 18:56:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id EB19560724 for ; Mon, 6 Sep 2021 18:55:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1343574AbhIFS5D (ORCPT ); Mon, 6 Sep 2021 14:57:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36494 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244882AbhIFSzl (ORCPT ); Mon, 6 Sep 2021 14:55:41 -0400 Received: from mail-ej1-x634.google.com (mail-ej1-x634.google.com [IPv6:2a00:1450:4864:20::634]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 80152C0612AB for ; Mon, 6 Sep 2021 11:54:32 -0700 (PDT) Received: by mail-ej1-x634.google.com with SMTP id t19so15070846ejr.8 for ; Mon, 06 Sep 2021 11:54:32 -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=HM0U8aFAgyxYkE6pP3iIT4ysY9lJ8YRKLSjNY12/S5U=; b=VjDVvc493ZOEDJcSRt1TuQO3p+phQ6oxKt1Qeh6Upk3l0UIiAEKWQjZ+8P2cp2cTCy a5S3KSethnsM+r4ni8qNUCU4QNAqEjosmjCFnw+tCQA+MXSptgJ1AjO0wqU92/fAL9oe pKBomo/+GcqcQwyNZ90FGSIUzo502BNPSjWAdGNUicdvD0mhz0kCQLKEFWM9/zy0sEtc nEVu3q4q1guHOc5dTYufnIaisiN37ErE0j1NPUzhQsLlW4Ws2uLDAdB8z+TgF0vlvvaP HZL+6wqspu+rHk8gaJl+o8sbTtv3vH5FBdOyw8coCGFXMBY4HTGfjXSbJ0F4Gic29mYN 3vpg== 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=HM0U8aFAgyxYkE6pP3iIT4ysY9lJ8YRKLSjNY12/S5U=; b=tMkeATAXuOGKFgMGli96m/yDQU74VQK1O0YKo44WC9BPzzOj+FpUX2s0t8NpVEZsb5 unQtQwww4zESwUohmEjOtxPX/DnLcHCMQBWJSAIF9ddtjbcNngEXbQKtsfXzYlRkrkai QJeFVomPg+IV7LPYr6ywWFbXHYYYVHPm/r7Qg/32bm1S10jyafLC7FPMLLa/MUwA3hf7 9hdrgzOuTAEU3V7WRw+kR7mmE2qyaOeVl2xa19pxI0OLBt4u6C514KrgO9uqAyO/XDTA jcEInnOshkD/nYB+B2kPvtOIXT4MMdUL/uClVzNtkPHqqy6QBSeNi3HpiMUNL/d+TT7K Tn2g== X-Gm-Message-State: AOAM532VCghAY1y77qpL9haD2xTM/bfyDS5iLNt4MyZ4hHZSQ34IAxim LfyxMCYbWVF6wegy/j4IAVE= X-Google-Smtp-Source: ABdhPJz+l8x6s/LpQWTOoGeYhk7QC/xj9W4x6rITKww6O5AJecxBw3gJp0MDl80cUi5LmIl6YuZ2hA== X-Received: by 2002:a17:906:29d0:: with SMTP id y16mr15347504eje.477.1630954471163; Mon, 06 Sep 2021 11:54:31 -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.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Sep 2021 11:54:30 -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 39/40] staging: r8188eu: remove SetBeaconRelatedRegistersHandler from hal_ops Date: Mon, 6 Sep 2021 20:53:26 +0200 Message-Id: <20210906185327.10326-40-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 SetBeaconRelatedRegistersHandler from 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