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 E5DFFC433EF for ; Mon, 6 Sep 2021 18:54:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CF29A6103D for ; Mon, 6 Sep 2021 18:54:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245332AbhIFSzi (ORCPT ); Mon, 6 Sep 2021 14:55:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36404 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244839AbhIFSzP (ORCPT ); Mon, 6 Sep 2021 14:55:15 -0400 Received: from mail-ed1-x530.google.com (mail-ed1-x530.google.com [IPv6:2a00:1450:4864:20::530]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 872A3C061575 for ; Mon, 6 Sep 2021 11:54:10 -0700 (PDT) Received: by mail-ed1-x530.google.com with SMTP id i6so10637601edu.1 for ; Mon, 06 Sep 2021 11:54:10 -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=3tDGXKtpZmrXTW/NI9hHWNVg4jLQ4sKJiRKhYqlYVho=; b=frCcv+PiroBRYU0ZWZL1si+ioCW8ycf3REiHXDvf+Ax6zI4FNNY4rH5DT9GCcO+Isg JdPKOvdDk2k1M5nH4xBP/LkKA21ngaka5T3A2kIk256l+4BxD//VGuwXuwB7gf1ou8m7 XLduLntJG/HGrB57Hw2L8HlJjA8AgoB5LCe7cHELgUgyOI25jmAhxqhgL8AQUe3v4QZe xPFWIs9MDquXbXpnXMpPdvBUN9FKSB7XbFpjZQIxUI6kwwzP/Zp8vY26opvN+JOxT5f7 W27P04Fkq5CHEb+6866YRIpAUZr4Bj3fnuRHQ37UP4MHtC48EgZxkZbkPnW1DuBBwvno NFxA== 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=3tDGXKtpZmrXTW/NI9hHWNVg4jLQ4sKJiRKhYqlYVho=; b=mMb1qMY69mHoUG1BM9PMz4L8HCOZLWczDFVmo0Eec0DA6DQme6nMff0KN7u4AlS6e1 ja27aTO08z8yF/yQ6fEpyrhHfVfRe88A/j+ya6ZAddvXOmaOBKi/vJlAATfyzzHrbLeV U/STBRHcr6BVd/1wfVR1aCwsxVCktqanyBjCzI8Yb0BNa8Zn6dxDZvqtCpn7pmHSwW8F T5lrk/hJWJtZl5JRvRNcRvs1mIJKgtyo91nCdYsxxLx1wi0b4mIqf2He3BE+yr0XehW+ WK5PjbWmKha6xgNYfWP4qmhQavt5vR970osR1zlEFIv7q1ict+GohBeiaJVURxgp5RSW 1MIQ== X-Gm-Message-State: AOAM532dHZYUvK1KA8SAY9zVWN3WbmeAAjd2Z5s8uuErWeuVLKtojeLO L6p2mau8+oeEmEjxETZzEio= X-Google-Smtp-Source: ABdhPJxWD3KDQH6MuOwgm8jkogeBE9zGFhrPMye4XWj3XN2dhqdyxDx0yDVJBUClJQh95fJ3hMnOsw== X-Received: by 2002:aa7:d95a:: with SMTP id l26mr14757533eds.305.1630954449199; Mon, 06 Sep 2021 11:54:09 -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.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Sep 2021 11:54:08 -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 09/40] staging: r8188eu: remove hal_dm_watchdog from hal_ops Date: Mon, 6 Sep 2021 20:52:56 +0200 Message-Id: <20210906185327.10326-10-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 hal_dm_watchdog from hal_ops and remove its wrapper rtw_hal_dm_watchdog(). Call rtl8188e_HalDmWatchDog directly instead. Signed-off-by: Michael Straube --- drivers/staging/r8188eu/core/rtw_cmd.c | 3 ++- drivers/staging/r8188eu/hal/hal_intf.c | 6 ------ drivers/staging/r8188eu/hal/rtl8188e_hal_init.c | 2 -- drivers/staging/r8188eu/include/hal_intf.h | 3 --- 4 files changed, 2 insertions(+), 12 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_cmd.c b/drivers/staging/r8188eu/core/rtw_cmd.c index 738e1ec749be..67b4fe1304a5 100644 --- a/drivers/staging/r8188eu/core/rtw_cmd.c +++ b/drivers/staging/r8188eu/core/rtw_cmd.c @@ -9,6 +9,7 @@ #include "../include/mlme_osdep.h" #include "../include/rtw_br_ext.h" #include "../include/rtw_mlme_ext.h" +#include "../include/rtl8188e_dm.h" /* Caller and the rtw_cmd_thread can protect cmd_q by spin_lock. @@ -1496,7 +1497,7 @@ static void dynamic_chk_wk_hdl(struct adapter *padapter, u8 *pbuf, int sz) linked_status_chk(padapter); traffic_status_watchdog(padapter); - rtw_hal_dm_watchdog(padapter); + rtl8188e_HalDmWatchDog(padapter); } static void lps_ctrl_wk_hdl(struct adapter *padapter, u8 lps_ctrl_type) diff --git a/drivers/staging/r8188eu/hal/hal_intf.c b/drivers/staging/r8188eu/hal/hal_intf.c index 45166f160756..9374e5ecb13b 100644 --- a/drivers/staging/r8188eu/hal/hal_intf.c +++ b/drivers/staging/r8188eu/hal/hal_intf.c @@ -229,12 +229,6 @@ void rtw_hal_set_chan(struct adapter *adapt, u8 channel) adapt->HalFunc.set_channel_handler(adapt, channel); } -void rtw_hal_dm_watchdog(struct adapter *adapt) -{ - if (adapt->HalFunc.hal_dm_watchdog) - adapt->HalFunc.hal_dm_watchdog(adapt); -} - 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 ca020f2ed7a2..844a18117f09 100644 --- a/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c +++ b/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c @@ -1787,8 +1787,6 @@ void rtl8188e_set_hal_ops(struct hal_ops *pHalFunc) pHalFunc->set_bwmode_handler = &PHY_SetBWMode8188E; pHalFunc->set_channel_handler = &PHY_SwChnl8188E; - pHalFunc->hal_dm_watchdog = &rtl8188e_HalDmWatchDog; - 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 44a8943eadfe..caf759a9eb48 100644 --- a/drivers/staging/r8188eu/include/hal_intf.h +++ b/drivers/staging/r8188eu/include/hal_intf.h @@ -148,8 +148,6 @@ struct hal_ops { u8 Offset); void (*set_channel_handler)(struct adapter *padapter, u8 channel); - void (*hal_dm_watchdog)(struct adapter *padapter); - void (*SetHwRegHandler)(struct adapter *padapter, u8 variable, u8 *val); void (*GetHwRegHandler)(struct adapter *padapter, u8 variable, @@ -289,7 +287,6 @@ void rtw_hal_write_rfreg(struct adapter *padapter, 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); -void rtw_hal_dm_watchdog(struct adapter *padapter); u8 rtw_hal_antdiv_before_linked(struct adapter *padapter); void rtw_hal_antdiv_rssi_compared(struct adapter *padapter, -- 2.33.0