From nobody Fri May 3 10:07:25 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 10E7DC04A95 for ; Wed, 28 Sep 2022 14:43:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234220AbiI1Onp (ORCPT ); Wed, 28 Sep 2022 10:43:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54852 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234497AbiI1Oni (ORCPT ); Wed, 28 Sep 2022 10:43:38 -0400 Received: from mail-ed1-x52c.google.com (mail-ed1-x52c.google.com [IPv6:2a00:1450:4864:20::52c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B8DB5AE85C for ; Wed, 28 Sep 2022 07:43:35 -0700 (PDT) Received: by mail-ed1-x52c.google.com with SMTP id u24so2870996edb.11 for ; Wed, 28 Sep 2022 07:43:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=H2TrdYROwP1L2hfid8Uw2/QbMnSXWJgTVN28DiuLGjU=; b=jEgXxzUqtTc5XPrM6ffa7w5nIF98pejjznSHooEXUa2tdp9xWVU4qIG1tW5mpiGRNw e9qNR1caJvmgugpRMDikADQfG/8J5wmZ4XRvn3fZK77wDW9YXvRW8chGXxzbEPaQatfF 2Q5JQf+uQ5lObWL+vHX8Aci56A6Tkl4lBFwqEHzsGoEhiCWA6Al3YteD168Jvx91wmvY DOFKHxM6u6khXtxi3x/a2LqVpQcOSNQo7Ao3t+/DEiYcnIR5fA3mUyfN88d7wjCakOrT 1E+pgnX+3ztFIbeexdZR3U6+lru7iIRKA44TRwJ4hZDcD8VLnmwWks9QPcHtBcfaLAMJ P3/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=H2TrdYROwP1L2hfid8Uw2/QbMnSXWJgTVN28DiuLGjU=; b=dCl6h1ssM7zTOOVYu724wtlfHVveH5lt2Mrjkmr7TdjM3uKI+EA3IQihA5k7iMF17v T2USddzdLUvFPg37U73/JN0xDYxpW46jF/F9oa6yQRAUvZ7v3tz4wl9V/VZ4bgH+1dZ/ TxwiwcYSREmQCB2QQkM5bQNRPSSBKiZHf/lecVj13MRGkmybzPYqNMTqtRK8MfW/wuBb yu2Li0WTzAm9ORPpiCOZRoB0Z6kfNfwAH59exqGXNfYPE3MzLSCmP3njA7zgGV2myfgu 95CUYzU1VFpPQqbM04n2i/saoJMxX0dSzIRKMIMmAh/Rf6CzoEDqJcfwaTzlNtxzvKgc Xhsw== X-Gm-Message-State: ACrzQf2uw40LP103lKc9wU94g+0fnn1A73GWI/37cMb20sZLzExoq7AJ HiUJ7W3tj2xF/X64cVc7wEc= X-Google-Smtp-Source: AMsMyM5hf8SsCoqcTY/9v9JLTqv1HFwAveL+9hwJiKq9pH1WzTzzmpD7kOerEyN0aM8yix5lqPf3hQ== X-Received: by 2002:a05:6402:2549:b0:452:8292:b610 with SMTP id l9-20020a056402254900b004528292b610mr33536545edb.199.1664376214136; Wed, 28 Sep 2022 07:43:34 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb59.dynamic.kabel-deutschland.de. [95.90.187.89]) by smtp.gmail.com with ESMTPSA id u9-20020a50eac9000000b00456c6b4b777sm3456973edp.69.2022.09.28.07.43.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Sep 2022 07:43:33 -0700 (PDT) From: Michael Straube To: gregkh@linuxfoundation.org Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH 1/4] staging: r8188eu: convert ODM_ReadAndConfig_MAC_REG_8188E() to int Date: Wed, 28 Sep 2022 16:43:20 +0200 Message-Id: <20220928144323.13164-2-straube.linux@gmail.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220928144323.13164-1-straube.linux@gmail.com> References: <20220928144323.13164-1-straube.linux@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The function ODM_ReadAndConfig_MAC_REG_8188E() has return type 'enum HAL_STATUS'. Convert the return type to int and use common kernel error logic. Return 0 on success and negative values on failure. The goal is to get rid of enum HAL_STATUS in the end. Signed-off-by: Michael Straube Tested-by: Philipp Hortmann # Edimax N150 --- drivers/staging/r8188eu/hal/HalHWImg8188E_MAC.c | 9 ++++----- drivers/staging/r8188eu/hal/rtl8188e_phycfg.c | 2 +- drivers/staging/r8188eu/include/HalHWImg8188E_MAC.h | 3 +-- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/drivers/staging/r8188eu/hal/HalHWImg8188E_MAC.c b/drivers/stag= ing/r8188eu/hal/HalHWImg8188E_MAC.c index e615bc37c74f..da71867bcca3 100644 --- a/drivers/staging/r8188eu/hal/HalHWImg8188E_MAC.c +++ b/drivers/staging/r8188eu/hal/HalHWImg8188E_MAC.c @@ -131,7 +131,7 @@ static void odm_ConfigMAC_8188E(struct odm_dm_struct *p= DM_Odm, u32 Addr, u8 Data rtw_write8(pDM_Odm->Adapter, Addr, Data); } =20 -enum HAL_STATUS ODM_ReadAndConfig_MAC_REG_8188E(struct odm_dm_struct *dm_o= dm) +int ODM_ReadAndConfig_MAC_REG_8188E(struct odm_dm_struct *dm_odm) { #define READ_NEXT_PAIR(v1, v2, i) do { i +=3D 2; v1 =3D array[i]; v2 =3D = array[i + 1]; } while (0) =20 @@ -144,7 +144,6 @@ enum HAL_STATUS ODM_ReadAndConfig_MAC_REG_8188E(struct = odm_dm_struct *dm_odm) struct adapter *adapt =3D dm_odm->Adapter; struct xmit_frame *pxmit_frame =3D NULL; u8 bndy_cnt =3D 1; - enum HAL_STATUS rst =3D HAL_STATUS_SUCCESS; hex +=3D ODM_ITRF_USB << 8; hex +=3D ODM_CE << 16; hex +=3D 0xFF000000; @@ -155,7 +154,7 @@ enum HAL_STATUS ODM_ReadAndConfig_MAC_REG_8188E(struct = odm_dm_struct *dm_odm) pxmit_frame =3D rtw_IOL_accquire_xmit_frame(adapt); if (!pxmit_frame) { pr_info("rtw_IOL_accquire_xmit_frame failed\n"); - return HAL_STATUS_FAILURE; + return -ENOMEM; } } =20 @@ -206,8 +205,8 @@ enum HAL_STATUS ODM_ReadAndConfig_MAC_REG_8188E(struct = odm_dm_struct *dm_odm) if (biol) { if (!rtl8188e_IOL_exec_cmds_sync(dm_odm->Adapter, pxmit_frame, 1000, bnd= y_cnt)) { pr_info("~~~ MAC IOL_exec_cmds Failed !!!\n"); - rst =3D HAL_STATUS_FAILURE; + return -1; } } - return rst; + return 0; } diff --git a/drivers/staging/r8188eu/hal/rtl8188e_phycfg.c b/drivers/stagin= g/r8188eu/hal/rtl8188e_phycfg.c index 731179635c54..7bcaddc9128b 100644 --- a/drivers/staging/r8188eu/hal/rtl8188e_phycfg.c +++ b/drivers/staging/r8188eu/hal/rtl8188e_phycfg.c @@ -323,7 +323,7 @@ s32 PHY_MACConfig8188E(struct adapter *Adapter) /* */ /* Config MAC */ /* */ - if (HAL_STATUS_FAILURE =3D=3D ODM_ReadAndConfig_MAC_REG_8188E(&pHalData->= odmpriv)) + if (ODM_ReadAndConfig_MAC_REG_8188E(&pHalData->odmpriv)) rtStatus =3D _FAIL; =20 /* 2010.07.13 AMPDU aggregation number B */ diff --git a/drivers/staging/r8188eu/include/HalHWImg8188E_MAC.h b/drivers/= staging/r8188eu/include/HalHWImg8188E_MAC.h index 391c1754b0b6..b3d67c1a8050 100644 --- a/drivers/staging/r8188eu/include/HalHWImg8188E_MAC.h +++ b/drivers/staging/r8188eu/include/HalHWImg8188E_MAC.h @@ -7,7 +7,6 @@ /*************************************************************************= ***** * MAC_REG.TXT **************************************************************************= ****/ - -enum HAL_STATUS ODM_ReadAndConfig_MAC_REG_8188E(struct odm_dm_struct *pDM_= Odm); +int ODM_ReadAndConfig_MAC_REG_8188E(struct odm_dm_struct *pDM_Odm); =20 #endif /* end of HWIMG_SUPPORT */ --=20 2.37.3 From nobody Fri May 3 10:07:25 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C22EDC04A95 for ; Wed, 28 Sep 2022 14:43:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234498AbiI1Ont (ORCPT ); Wed, 28 Sep 2022 10:43:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54816 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234500AbiI1Oni (ORCPT ); Wed, 28 Sep 2022 10:43:38 -0400 Received: from mail-ed1-x533.google.com (mail-ed1-x533.google.com [IPv6:2a00:1450:4864:20::533]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 40B73AFAF0 for ; Wed, 28 Sep 2022 07:43:36 -0700 (PDT) Received: by mail-ed1-x533.google.com with SMTP id a13so2444472edj.0 for ; Wed, 28 Sep 2022 07:43:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=DQ8HHYpQxDNrGQzA7YE7Q7g3HvNU2igDf32G4BPOhWk=; b=pGj7M0SIsViJW0CS8/WI/bu74agYYT3JeREK7omiyxbvkYU5iKKeqvDnHNnaQczP8G 3YTlaao6cdQg5atV0A1f9vIhahCO4UJ47D0ceOXDnRXitBCBHrZ53o579YdDVe9Ou1e0 roZy5KTWQ+9yRzgh+XXCqWULjwGjJgbGCd1xXI4SXUIPCPs5VIPF5R3LkHNPIckbz0he cScrPRfCAcjBGHvTuRXpkFijd85FvdvxuamNQGHfreZmzHnGTvHIijjyL6QXAlA+hS2y 4jYtk4Pu0DLrC+1nzG2zNb1tl0lADQ3A28p2De7AwzRX36EWuRJnR8Vgd0pa/pV2/pap pB0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=DQ8HHYpQxDNrGQzA7YE7Q7g3HvNU2igDf32G4BPOhWk=; b=j5CT/JPrt8JgyfhHDq578DE/G75mcxGplYlrUzVKxtXDe7RM46206H36tJDuHbETr+ x9GfspUsFrmzuNAGuZVnsMlBNr5644ZK2l79ElPWmjYELYNnryDcwjLtxMbVgDGkrj+y y1FIrSObVV3UkJlUSV2VvLKMP5oQ3ieRZUMqFKxdplz9ml2Ykx+1JPeoljmJlLLiU/Ak YX54HUrO0VBm0A3j1ZOWVIzrrsApWtMx335DNVsCm41Wwk12/CW99rQfgSLF4k7qDuPl nFrZ0MqY4rYBPrR6IVk7xZu84T88r9RCvkX3gmbJ4rvC12n/T2v+bacpoL9np7wfK9TM gkHQ== X-Gm-Message-State: ACrzQf1JKhSNwb8tNMTT0m4qCijRd11+Him2zwnfH+5tT5Jz0V/Esbf+ jOQdd92BChuaw/URVZ0rEk8= X-Google-Smtp-Source: AMsMyM6NKJHU1wiq68xzq+nYBWKg7JrHqfhy336/EuQKXS/PaCRHLiIptiwCc+nUHFvY2z2QQg93BA== X-Received: by 2002:a05:6402:348f:b0:451:7390:c6d4 with SMTP id v15-20020a056402348f00b004517390c6d4mr33885397edc.236.1664376214824; Wed, 28 Sep 2022 07:43:34 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb59.dynamic.kabel-deutschland.de. [95.90.187.89]) by smtp.gmail.com with ESMTPSA id u9-20020a50eac9000000b00456c6b4b777sm3456973edp.69.2022.09.28.07.43.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Sep 2022 07:43:34 -0700 (PDT) From: Michael Straube To: gregkh@linuxfoundation.org Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH 2/4] staging: r8188eu: convert ODM_ReadAndConfig_RadioA_1T_8188E() to int Date: Wed, 28 Sep 2022 16:43:21 +0200 Message-Id: <20220928144323.13164-3-straube.linux@gmail.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220928144323.13164-1-straube.linux@gmail.com> References: <20220928144323.13164-1-straube.linux@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The function ODM_ReadAndConfig_RadioA_1T_8188E() has return type 'enum HAL_STATUS'. Convert the return type to int and use common kernel error logic. Return 0 on success and negative values on failure. The goal is to get rid of enum HAL_STATUS in the end. Signed-off-by: Michael Straube Tested-by: Philipp Hortmann # Edimax N150 --- drivers/staging/r8188eu/hal/HalHWImg8188E_RF.c | 9 ++++----- drivers/staging/r8188eu/hal/rtl8188e_rf6052.c | 2 +- drivers/staging/r8188eu/include/HalHWImg8188E_RF.h | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/drivers/staging/r8188eu/hal/HalHWImg8188E_RF.c b/drivers/stagi= ng/r8188eu/hal/HalHWImg8188E_RF.c index ea123817e3d5..a4c3d3d149f7 100644 --- a/drivers/staging/r8188eu/hal/HalHWImg8188E_RF.c +++ b/drivers/staging/r8188eu/hal/HalHWImg8188E_RF.c @@ -160,7 +160,7 @@ static void odm_ConfigRF_RadioA_8188E(struct odm_dm_str= uct *pDM_Odm, u32 Addr, u odm_ConfigRFReg_8188E(pDM_Odm, Addr, Data, Addr | maskforPhySet); } =20 -enum HAL_STATUS ODM_ReadAndConfig_RadioA_1T_8188E(struct odm_dm_struct *pD= M_Odm) +int ODM_ReadAndConfig_RadioA_1T_8188E(struct odm_dm_struct *pDM_Odm) { #define READ_NEXT_PAIR(v1, v2, i) do \ { i +=3D 2; v1 =3D Array[i]; \ @@ -174,7 +174,6 @@ enum HAL_STATUS ODM_ReadAndConfig_RadioA_1T_8188E(struc= t odm_dm_struct *pDM_Odm) struct adapter *Adapter =3D pDM_Odm->Adapter; struct xmit_frame *pxmit_frame =3D NULL; u8 bndy_cnt =3D 1; - enum HAL_STATUS rst =3D HAL_STATUS_SUCCESS; =20 hex +=3D ODM_ITRF_USB << 8; hex +=3D ODM_CE << 16; @@ -185,7 +184,7 @@ enum HAL_STATUS ODM_ReadAndConfig_RadioA_1T_8188E(struc= t odm_dm_struct *pDM_Odm) pxmit_frame =3D rtw_IOL_accquire_xmit_frame(Adapter); if (!pxmit_frame) { pr_info("rtw_IOL_accquire_xmit_frame failed\n"); - return HAL_STATUS_FAILURE; + return -ENOMEM; } } =20 @@ -262,9 +261,9 @@ enum HAL_STATUS ODM_ReadAndConfig_RadioA_1T_8188E(struc= t odm_dm_struct *pDM_Odm) } if (biol) { if (!rtl8188e_IOL_exec_cmds_sync(pDM_Odm->Adapter, pxmit_frame, 1000, bn= dy_cnt)) { - rst =3D HAL_STATUS_FAILURE; pr_info("~~~ IOL Config %s Failed !!!\n", __func__); + return -1; } } - return rst; + return 0; } diff --git a/drivers/staging/r8188eu/hal/rtl8188e_rf6052.c b/drivers/stagin= g/r8188eu/hal/rtl8188e_rf6052.c index 0dc902b0abae..e5ec6e563fbd 100644 --- a/drivers/staging/r8188eu/hal/rtl8188e_rf6052.c +++ b/drivers/staging/r8188eu/hal/rtl8188e_rf6052.c @@ -396,7 +396,7 @@ int phy_RF6052_Config_ParaFile(struct adapter *Adapter) udelay(1);/* PlatformStallExecution(1); */ =20 /*----Initialize RF fom connfiguration file----*/ - if (ODM_ReadAndConfig_RadioA_1T_8188E(&pHalData->odmpriv) =3D=3D HAL_STAT= US_FAILURE) + if (ODM_ReadAndConfig_RadioA_1T_8188E(&pHalData->odmpriv)) rtStatus =3D _FAIL; =20 /*----Restore RFENV control type----*/; diff --git a/drivers/staging/r8188eu/include/HalHWImg8188E_RF.h b/drivers/s= taging/r8188eu/include/HalHWImg8188E_RF.h index 0c67c3df20b9..880feadb4340 100644 --- a/drivers/staging/r8188eu/include/HalHWImg8188E_RF.h +++ b/drivers/staging/r8188eu/include/HalHWImg8188E_RF.h @@ -8,6 +8,6 @@ * RadioA_1T.TXT *************************************************************************= *****/ =20 -enum HAL_STATUS ODM_ReadAndConfig_RadioA_1T_8188E(struct odm_dm_struct *od= m); +int ODM_ReadAndConfig_RadioA_1T_8188E(struct odm_dm_struct *odm); =20 #endif /* end of HWIMG_SUPPORT */ --=20 2.37.3 From nobody Fri May 3 10:07:25 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3A811C04A95 for ; Wed, 28 Sep 2022 14:43:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234507AbiI1Onx (ORCPT ); Wed, 28 Sep 2022 10:43:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54926 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234471AbiI1Onj (ORCPT ); Wed, 28 Sep 2022 10:43:39 -0400 Received: from mail-ed1-x52d.google.com (mail-ed1-x52d.google.com [IPv6:2a00:1450:4864:20::52d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 41171AF4A4 for ; Wed, 28 Sep 2022 07:43:37 -0700 (PDT) Received: by mail-ed1-x52d.google.com with SMTP id z13so17503265edb.13 for ; Wed, 28 Sep 2022 07:43:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=O+dr3jl5gDyh/hm3RWAslgURxfqQlnNRpD5jykGjHFc=; b=UWAfkNXJmZSXjk3jAT9AIhAo3LsFU0ZtlgIahUUNIoPa3XTJHqklTJsE9Y9SvaB6Ct BwNq1NanHi52y2TsJ73xJbl92w1bORPCyPc7VFHtcloopM1hyBfFDoh+Bvoxv8HRPdBV bTDZtNG9aDKL+Syv1f0IhB7m+KitFrHdp+pOYp67eLsTDnWePO29ysU0IscbWHsEgPCa 0vVemr1UmFnyhU/OpjF4mjE5dXI1tAdymtFW2MeNft9G1/Dsqa3Eg8ToF5lbOtnBXckl ogipwACn1Vl7AuO1ASIxOqkrKx4dFFqKKyuXqrkaYiE4p14W7n/vUsChvxrD5YdbKrlm m+BQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=O+dr3jl5gDyh/hm3RWAslgURxfqQlnNRpD5jykGjHFc=; b=6+wBKLyHyvNrb2ilwVftrUw3ZvkvckIwEwhNWXie/R6+gHBM7PvP8tniVX4ltWNmQ2 kh6mfHRvxSwwxCtao4vYTZc6rPaKMiJa7sUmFui/8xexPCbd4pucukwB6SnSmI5vweQc FF+9SUTPXoEjzsyAX6r7jkAj7WenAZFKr9PgO5flBp4W6qJtNFzDywJJI6DfGOThG3PG vqXc3vZtq2orSTFcodEvBpklBJdEWAPYyJgrGCvLttifMnlsS8dwJny3Tq101Qaj0s9o fdfILwW63bROvrexjK8UPrhCJvEP4hCF1ptWyY/n21OqWVH8Kfl9BAfqaiBl/yUAvps3 Kz9g== X-Gm-Message-State: ACrzQf1MfHo/WugyWH3cyt/RJ/pGYWWxm9mSRjc+DeOZom6TbpxCjclw CxVma6dOp4cayN0HyhnAOnw= X-Google-Smtp-Source: AMsMyM7XI0TKigLfWw76HQyG9NSSOojQ3ZlGp2cIohJwVNCl38fh5TdQknBto3q1igRhZh1otKXMxA== X-Received: by 2002:a50:fc13:0:b0:457:1075:42de with SMTP id i19-20020a50fc13000000b00457107542demr20807256edr.310.1664376215473; Wed, 28 Sep 2022 07:43:35 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb59.dynamic.kabel-deutschland.de. [95.90.187.89]) by smtp.gmail.com with ESMTPSA id u9-20020a50eac9000000b00456c6b4b777sm3456973edp.69.2022.09.28.07.43.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Sep 2022 07:43:35 -0700 (PDT) From: Michael Straube To: gregkh@linuxfoundation.org Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH 3/4] staging: r8188eu: convert ODM_ReadAndConfig_PHY_REG_1T_8188E() to int Date: Wed, 28 Sep 2022 16:43:22 +0200 Message-Id: <20220928144323.13164-4-straube.linux@gmail.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220928144323.13164-1-straube.linux@gmail.com> References: <20220928144323.13164-1-straube.linux@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The function ODM_ReadAndConfig_PHY_REG_1T_8188E() has return type 'enum HAL_STATUS'. Convert the return type to int and use common kernel error logic. Return 0 on success and negative values on failure. The goal is to get rid of enum HAL_STATUS in the end. Signed-off-by: Michael Straube Tested-by: Philipp Hortmann # Edimax N150 --- drivers/staging/r8188eu/hal/HalHWImg8188E_BB.c | 9 ++++----- drivers/staging/r8188eu/hal/rtl8188e_phycfg.c | 2 +- drivers/staging/r8188eu/include/HalHWImg8188E_BB.h | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/drivers/staging/r8188eu/hal/HalHWImg8188E_BB.c b/drivers/stagi= ng/r8188eu/hal/HalHWImg8188E_BB.c index a4eb2879b77e..8d60eee7ab50 100644 --- a/drivers/staging/r8188eu/hal/HalHWImg8188E_BB.c +++ b/drivers/staging/r8188eu/hal/HalHWImg8188E_BB.c @@ -473,7 +473,7 @@ static void odm_ConfigBB_PHY_8188E(struct odm_dm_struct= *pDM_Odm, u32 Addr, u32 } } =20 -enum HAL_STATUS ODM_ReadAndConfig_PHY_REG_1T_8188E(struct odm_dm_struct *d= m_odm) +int ODM_ReadAndConfig_PHY_REG_1T_8188E(struct odm_dm_struct *dm_odm) { u32 hex =3D 0; u32 i =3D 0; @@ -483,7 +483,6 @@ enum HAL_STATUS ODM_ReadAndConfig_PHY_REG_1T_8188E(stru= ct odm_dm_struct *dm_odm) struct adapter *adapter =3D dm_odm->Adapter; struct xmit_frame *pxmit_frame =3D NULL; u8 bndy_cnt =3D 1; - enum HAL_STATUS rst =3D HAL_STATUS_SUCCESS; hex +=3D ODM_ITRF_USB << 8; hex +=3D ODM_CE << 16; hex +=3D 0xFF000000; @@ -493,7 +492,7 @@ enum HAL_STATUS ODM_ReadAndConfig_PHY_REG_1T_8188E(stru= ct odm_dm_struct *dm_odm) pxmit_frame =3D rtw_IOL_accquire_xmit_frame(adapter); if (!pxmit_frame) { pr_info("rtw_IOL_accquire_xmit_frame failed\n"); - return HAL_STATUS_FAILURE; + return -ENOMEM; } } =20 @@ -575,11 +574,11 @@ enum HAL_STATUS ODM_ReadAndConfig_PHY_REG_1T_8188E(st= ruct odm_dm_struct *dm_odm) } if (biol) { if (!rtl8188e_IOL_exec_cmds_sync(dm_odm->Adapter, pxmit_frame, 1000, bnd= y_cnt)) { - rst =3D HAL_STATUS_FAILURE; pr_info("~~~ IOL Config %s Failed !!!\n", __func__); + return -1; } } - return rst; + return 0; } =20 /*************************************************************************= ***** diff --git a/drivers/staging/r8188eu/hal/rtl8188e_phycfg.c b/drivers/stagin= g/r8188eu/hal/rtl8188e_phycfg.c index 7bcaddc9128b..f31c1b7a469a 100644 --- a/drivers/staging/r8188eu/hal/rtl8188e_phycfg.c +++ b/drivers/staging/r8188eu/hal/rtl8188e_phycfg.c @@ -455,7 +455,7 @@ static int phy_BB8188E_Config_ParaFile(struct adapter *= Adapter) /* 1. Read PHY_REG.TXT BB INIT!! */ /* We will separate as 88C / 92C according to chip version */ /* */ - if (HAL_STATUS_FAILURE =3D=3D ODM_ReadAndConfig_PHY_REG_1T_8188E(&pHalDat= a->odmpriv)) + if (ODM_ReadAndConfig_PHY_REG_1T_8188E(&pHalData->odmpriv)) return _FAIL; =20 /* 2. If EEPROM or EFUSE autoload OK, We must config by PHY_REG_PG.txt */ diff --git a/drivers/staging/r8188eu/include/HalHWImg8188E_BB.h b/drivers/s= taging/r8188eu/include/HalHWImg8188E_BB.h index 8270fdbc2844..787fd2cf8d4e 100644 --- a/drivers/staging/r8188eu/include/HalHWImg8188E_BB.h +++ b/drivers/staging/r8188eu/include/HalHWImg8188E_BB.h @@ -16,7 +16,7 @@ enum HAL_STATUS ODM_ReadAndConfig_AGC_TAB_1T_8188E(struct= odm_dm_struct *odm); * PHY_REG_1T.TXT **************************************************************************= ****/ =20 -enum HAL_STATUS ODM_ReadAndConfig_PHY_REG_1T_8188E(struct odm_dm_struct *o= dm); +int ODM_ReadAndConfig_PHY_REG_1T_8188E(struct odm_dm_struct *odm); =20 /*************************************************************************= ***** * PHY_REG_PG.TXT --=20 2.37.3 From nobody Fri May 3 10:07:25 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 98B07C04A95 for ; Wed, 28 Sep 2022 14:43:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234512AbiI1On4 (ORCPT ); Wed, 28 Sep 2022 10:43:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54930 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234476AbiI1Onj (ORCPT ); Wed, 28 Sep 2022 10:43:39 -0400 Received: from mail-ed1-x52f.google.com (mail-ed1-x52f.google.com [IPv6:2a00:1450:4864:20::52f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CA09EAF49B for ; Wed, 28 Sep 2022 07:43:37 -0700 (PDT) Received: by mail-ed1-x52f.google.com with SMTP id z13so17503309edb.13 for ; Wed, 28 Sep 2022 07:43:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=h0QBqL8bDYRDNQY1NCC3Lk6vT+duKqCdRuYqj6GWkXI=; b=QyN+97jyeY7R8iLI/2ntliULvowBQuIoRdx5avccfIQxBNOcjMzC3UOT8KcV1FPVs+ eITlF6hKTfSKpUtwlVyOZUbjp7ofB5rNaBL2Di3mlzDVQKH5ZEUfj2DgotiNBxRTAkCX Teoo8/QbQ0UboNN+BLp1c/nmh+7ZbeFHxt8US4Zx+LcmKCWs7jaWqEQYksxYhqe3xQE0 II6VirD0i+ZTaGdsv+6elFpbWxa13EuBA9fvxuhCAKfmKGGfZ2ZKu4WLmqKrrfXjpdyW vPFeuEE7NDQloDiUKFkS6XRkCPOYNd7GVrROCAc7n9vh4gNuCdIS3AkXeMvQ+lxvCIQv BtPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=h0QBqL8bDYRDNQY1NCC3Lk6vT+duKqCdRuYqj6GWkXI=; b=xGPU/g06X0M6FTIqoYWub2XcRponR/s+MnwkGPB3rRgGE7IpN49pwh9ePJfAVYlRkN GhzFvQ2u9olxbZUjMdJaWlgESYqrc0DAbleN2BZy4QzaMtZUhVaR32jLuh39EdYqRa5A Y7IbdpCAEKyKmAc/J3t5/vFH/pFL/tqZEL4BXdTDU1hWBSecOYmfopz5gmxOnTJiR+wJ eKWOVgvznW0tjAeO/Hv495Ad1YTt29tURk9G9YJ/7gqD4q3EqmsReGqUf+OeBxsz4eAr dchvEDK5sEAvrHTHx84lKJ1yXQ5Ee0vl3dRjTUJRGeZDZrIsB9ye2GI6qChdji6LnUN1 jNsw== X-Gm-Message-State: ACrzQf0D70rnBixqxZ2UpuFV5J823jcCXO3wlAdE+Bld7gdiAVffGLBv pz0iEI9TtHardthx+3ewZ9s= X-Google-Smtp-Source: AMsMyM6qc9LlM9+jqiBtZ0HKIGwaR1YU0CC3QqeqNdgKaaj+wiblS2r+PjguN+7gqISLh84Z9icvVw== X-Received: by 2002:aa7:c58a:0:b0:457:463d:c19d with SMTP id g10-20020aa7c58a000000b00457463dc19dmr16417452edq.323.1664376216170; Wed, 28 Sep 2022 07:43:36 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb59.dynamic.kabel-deutschland.de. [95.90.187.89]) by smtp.gmail.com with ESMTPSA id u9-20020a50eac9000000b00456c6b4b777sm3456973edp.69.2022.09.28.07.43.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Sep 2022 07:43:35 -0700 (PDT) From: Michael Straube To: gregkh@linuxfoundation.org Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH 4/4] staging: r8188eu: convert ODM_ReadAndConfig_AGC_TAB_1T_8188E() to int Date: Wed, 28 Sep 2022 16:43:23 +0200 Message-Id: <20220928144323.13164-5-straube.linux@gmail.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220928144323.13164-1-straube.linux@gmail.com> References: <20220928144323.13164-1-straube.linux@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The function ODM_ReadAndConfig_AGC_TAB_1T_8188E() has return type 'enum HAL_STATUS'. Convert the return type to int and use common kernel error logic. Return 0 on success and negative values on failure. The enum HAL_STATUS is unused now and we can remove it. Signed-off-by: Michael Straube Tested-by: Philipp Hortmann # Edimax N150 --- drivers/staging/r8188eu/hal/HalHWImg8188E_BB.c | 9 ++++----- drivers/staging/r8188eu/hal/rtl8188e_phycfg.c | 2 +- drivers/staging/r8188eu/include/HalHWImg8188E_BB.h | 2 +- drivers/staging/r8188eu/include/odm_types.h | 5 ----- 4 files changed, 6 insertions(+), 12 deletions(-) diff --git a/drivers/staging/r8188eu/hal/HalHWImg8188E_BB.c b/drivers/stagi= ng/r8188eu/hal/HalHWImg8188E_BB.c index 8d60eee7ab50..23b7205722b5 100644 --- a/drivers/staging/r8188eu/hal/HalHWImg8188E_BB.c +++ b/drivers/staging/r8188eu/hal/HalHWImg8188E_BB.c @@ -173,7 +173,7 @@ static void odm_ConfigBB_AGC_8188E(struct odm_dm_struct= *pDM_Odm, u32 Addr, u32 udelay(1); } =20 -enum HAL_STATUS ODM_ReadAndConfig_AGC_TAB_1T_8188E(struct odm_dm_struct *d= m_odm) +int ODM_ReadAndConfig_AGC_TAB_1T_8188E(struct odm_dm_struct *dm_odm) { u32 hex =3D 0; u32 i =3D 0; @@ -183,7 +183,6 @@ enum HAL_STATUS ODM_ReadAndConfig_AGC_TAB_1T_8188E(stru= ct odm_dm_struct *dm_odm) struct adapter *adapter =3D dm_odm->Adapter; struct xmit_frame *pxmit_frame =3D NULL; u8 bndy_cnt =3D 1; - enum HAL_STATUS rst =3D HAL_STATUS_SUCCESS; =20 hex +=3D ODM_ITRF_USB << 8; hex +=3D ODM_CE << 16; @@ -194,7 +193,7 @@ enum HAL_STATUS ODM_ReadAndConfig_AGC_TAB_1T_8188E(stru= ct odm_dm_struct *dm_odm) pxmit_frame =3D rtw_IOL_accquire_xmit_frame(adapter); if (!pxmit_frame) { pr_info("rtw_IOL_accquire_xmit_frame failed\n"); - return HAL_STATUS_FAILURE; + return -ENOMEM; } } =20 @@ -245,10 +244,10 @@ enum HAL_STATUS ODM_ReadAndConfig_AGC_TAB_1T_8188E(st= ruct odm_dm_struct *dm_odm) if (biol) { if (!rtl8188e_IOL_exec_cmds_sync(dm_odm->Adapter, pxmit_frame, 1000, bnd= y_cnt)) { printk("~~~ %s IOL_exec_cmds Failed !!!\n", __func__); - rst =3D HAL_STATUS_FAILURE; + return -1; } } - return rst; + return 0; } =20 /*************************************************************************= ***** diff --git a/drivers/staging/r8188eu/hal/rtl8188e_phycfg.c b/drivers/stagin= g/r8188eu/hal/rtl8188e_phycfg.c index f31c1b7a469a..532c63bce0bf 100644 --- a/drivers/staging/r8188eu/hal/rtl8188e_phycfg.c +++ b/drivers/staging/r8188eu/hal/rtl8188e_phycfg.c @@ -465,7 +465,7 @@ static int phy_BB8188E_Config_ParaFile(struct adapter *= Adapter) } =20 /* 3. BB AGC table Initialization */ - if (HAL_STATUS_FAILURE =3D=3D ODM_ReadAndConfig_AGC_TAB_1T_8188E(&pHalDat= a->odmpriv)) + if (ODM_ReadAndConfig_AGC_TAB_1T_8188E(&pHalData->odmpriv)) return _FAIL; =20 return _SUCCESS; diff --git a/drivers/staging/r8188eu/include/HalHWImg8188E_BB.h b/drivers/s= taging/r8188eu/include/HalHWImg8188E_BB.h index 787fd2cf8d4e..0a290bc31c4d 100644 --- a/drivers/staging/r8188eu/include/HalHWImg8188E_BB.h +++ b/drivers/staging/r8188eu/include/HalHWImg8188E_BB.h @@ -10,7 +10,7 @@ * AGC_TAB_1T.TXT **************************************************************************= ****/ =20 -enum HAL_STATUS ODM_ReadAndConfig_AGC_TAB_1T_8188E(struct odm_dm_struct *o= dm); +int ODM_ReadAndConfig_AGC_TAB_1T_8188E(struct odm_dm_struct *odm); =20 /*************************************************************************= ***** * PHY_REG_1T.TXT diff --git a/drivers/staging/r8188eu/include/odm_types.h b/drivers/staging/= r8188eu/include/odm_types.h index 08ba7a418ba8..76302df4b330 100644 --- a/drivers/staging/r8188eu/include/odm_types.h +++ b/drivers/staging/r8188eu/include/odm_types.h @@ -6,11 +6,6 @@ =20 #define ODM_CE 0x04 /* BIT(2) */ =20 -enum HAL_STATUS { - HAL_STATUS_SUCCESS, - HAL_STATUS_FAILURE, -}; - #define SET_TX_DESC_ANTSEL_A_88E(__ptxdesc, __value) \ le32p_replace_bits((__le32 *)(__ptxdesc + 8), __value, BIT(24)) #define SET_TX_DESC_ANTSEL_B_88E(__ptxdesc, __value) \ --=20 2.37.3