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=-14.7 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,TVD_SUBJ_WIPE_DEBT,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 2EE84C433F5 for ; Mon, 6 Sep 2021 18:55:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1773261051 for ; Mon, 6 Sep 2021 18:55:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245584AbhIFS4M (ORCPT ); Mon, 6 Sep 2021 14:56:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36436 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244784AbhIFSzZ (ORCPT ); Mon, 6 Sep 2021 14:55:25 -0400 Received: from mail-ed1-x532.google.com (mail-ed1-x532.google.com [IPv6:2a00:1450:4864:20::532]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7F53EC061292 for ; Mon, 6 Sep 2021 11:54:19 -0700 (PDT) Received: by mail-ed1-x532.google.com with SMTP id z19so10579745edi.9 for ; Mon, 06 Sep 2021 11:54:19 -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=0JLjw1LG1EqFWNQ8nBF3vVHD63NcJfn88butHEvinAA=; b=DJTGOYKHQ6MYP/TqXBx1jxyCH//7WBHt8GoLzIGJaa9HKqqf+hD3TxD5rmxaCNO5W1 PMQvg6BJE77H3VRcVTqPQ5Cz1v8VdDyWpvTC0/6vcJlDa1jD5K2xGQGjzgE+cb4DXKUk pM3zRBY0Gzz0HBs8Akl/r974TmvBnhlUzhy/DH3zB5arymvax6NKJrA+TPy/pvHn4Kin MRCF5TneXD3/xoNdU0qaate+uLP11oscWnrld+VAUGwWjlCj+HJULGdNU1bGa8H6PJt/ 1MBlaihVnA4SRqmGlG5zLeDOy1CQGZ2itstyv/TVOYvjwXgDDfikGK+zY9sxRFW9Dt8o OmtQ== 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=0JLjw1LG1EqFWNQ8nBF3vVHD63NcJfn88butHEvinAA=; b=SIHUj6a7Df3Ge2q3hGpL5dxpjNNcJxwDUffSpUt1Vlo/mXKc7dQF+U5OslI/IlZrit kAcm6QwCYooPd7cW9/NOWU/whgjF2w1rgngtYxObKYVBnbkRntWfMWsJpyYxJ9cYEWuw 1d7x9AyTA+/amQajKu/ZI371iB76dXFy1VM/1ejx8S9qTMhqKXH2TkX1xP9hyNcs7TYA oNNvHEQyLnDjo1uVkQpmhJuGNS/6Qr9GURRGszFzJj7fFAlm106Q0yG3mR42kftTFhLp LUJJmw7otT/nSWZWOn/9QCKCbgWRtKAzjRLpDyp91ITl/wYpUo62QUWHLT4/+00nxr7O a0Fg== X-Gm-Message-State: AOAM533GSE7kgbQ1ax50NzGyKxBXAXVjU760X15R+fA9AzngH933jCjV woJgCGXd7LdhXsH1CU8ziQtwIQEp+TGLew== X-Google-Smtp-Source: ABdhPJwy1kGZY+hwygDqCZEKBsPOnUTAyc6cToJRjJS3jkHzhibkd9JmtUCKwY+2CNvxbKZvDQBPqw== X-Received: by 2002:aa7:d9c9:: with SMTP id v9mr14363322eds.270.1630954458023; Mon, 06 Sep 2021 11:54:18 -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.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Sep 2021 11:54:17 -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 21/40] staging: r8188eu: remove EfusePowerSwitch from hal_ops Date: Mon, 6 Sep 2021 20:53:08 +0200 Message-Id: <20210906185327.10326-22-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 EfusePowerSwitch from hal_ops and call rtl8188e_EfusePowerSwitch() directly instead. Signed-off-by: Michael Straube --- drivers/staging/r8188eu/core/rtw_efuse.c | 2 +- drivers/staging/r8188eu/hal/rtl8188e_hal_init.c | 7 +------ drivers/staging/r8188eu/include/hal_intf.h | 4 ++-- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_efuse.c b/drivers/staging/r8188eu/core/rtw_efuse.c index e1a9c031435b..8388ec60d21d 100644 --- a/drivers/staging/r8188eu/core/rtw_efuse.c +++ b/drivers/staging/r8188eu/core/rtw_efuse.c @@ -82,7 +82,7 @@ Efuse_PowerSwitch( u8 write, u8 PwrState) { - pAdapter->HalFunc.EfusePowerSwitch(pAdapter, write, PwrState); + rtl8188e_EfusePowerSwitch(pAdapter, write, PwrState); } /*----------------------------------------------------------------------------- diff --git a/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c b/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c index 04c382e698f9..c7edb9ba4085 100644 --- a/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c +++ b/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c @@ -757,11 +757,7 @@ hal_EfusePowerSwitch_RTL8188E( } } -static void -rtl8188e_EfusePowerSwitch( - struct adapter *pAdapter, - u8 bWrite, - u8 PwrState) +void rtl8188e_EfusePowerSwitch(struct adapter *pAdapter, u8 bWrite, u8 PwrState) { hal_EfusePowerSwitch_RTL8188E(pAdapter, bWrite, PwrState); } @@ -1795,7 +1791,6 @@ void rtl8188e_set_hal_ops(struct hal_ops *pHalFunc) pHalFunc->write_rfreg = &rtl8188e_PHY_SetRFReg; /* Efuse related function */ - pHalFunc->EfusePowerSwitch = &rtl8188e_EfusePowerSwitch; pHalFunc->ReadEFuse = &rtl8188e_ReadEFuse; pHalFunc->EFUSEGetEfuseDefinition = &rtl8188e_EFUSE_GetEfuseDefinition; pHalFunc->EfuseGetCurrentSize = &rtl8188e_EfuseGetCurrentSize; diff --git a/drivers/staging/r8188eu/include/hal_intf.h b/drivers/staging/r8188eu/include/hal_intf.h index f85385cc9288..86456bac3a5a 100644 --- a/drivers/staging/r8188eu/include/hal_intf.h +++ b/drivers/staging/r8188eu/include/hal_intf.h @@ -177,8 +177,6 @@ struct hal_ops { enum rf_radio_path eRFPath, u32 RegAddr, u32 BitMask, u32 Data); - void (*EfusePowerSwitch)(struct adapter *padapter, u8 bWrite, - u8 PwrState); void (*ReadEFuse)(struct adapter *padapter, u8 efuseType, u16 _offset, u16 _size_byte, u8 *pbuf, bool bPseudoTest); void (*EFUSEGetEfuseDefinition)(struct adapter *padapter, u8 efuseType, @@ -221,6 +219,8 @@ void rtl8188e_SetHalODMVar(struct adapter *Adapter, enum hal_odm_variable eVariable, void *pValue1, bool bSet); u32 rtl8188eu_InitPowerOn(struct adapter *adapt); +void rtl8188e_EfusePowerSwitch(struct adapter *pAdapter, u8 bWrite, u8 PwrState); + void rtw_hal_free_data(struct adapter *padapter); uint rtw_hal_init(struct adapter *padapter); uint rtw_hal_deinit(struct adapter *padapter); -- 2.33.0