From nobody Mon Sep 15 03:59:09 2025 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 DF507C3DA78 for ; Sun, 15 Jan 2023 21:07:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231645AbjAOVHx (ORCPT ); Sun, 15 Jan 2023 16:07:53 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36738 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231593AbjAOVHu (ORCPT ); Sun, 15 Jan 2023 16:07:50 -0500 Received: from mail-ej1-x636.google.com (mail-ej1-x636.google.com [IPv6:2a00:1450:4864:20::636]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 215531448B for ; Sun, 15 Jan 2023 13:07:48 -0800 (PST) Received: by mail-ej1-x636.google.com with SMTP id ud5so63904326ejc.4 for ; Sun, 15 Jan 2023 13:07:48 -0800 (PST) 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 :message-id:reply-to; bh=U+5N1rXSfVPzLU7ZKBzI7cYGDRpk01puVVQT6NPAi1o=; b=jcN9F7eXKvSGmUgLLg6dzI3dRFBeoFJsef5UJB/M15r6NhBJER1HOfqzotw2DxpKXO vX5zrtjhrccQEuBUR07GhVUzObjfbuUfUhPHW48PAjR2imZH6M81m7W9I5DXoS2jFN9Y a6PtqYC8nlgCirn+hafNwZXAbuLWGl3JF13HulCDSNctv+uZaK0c0XvMmqzI6MpOkdbO 1TNKHuq5hQZUE7QW1RbmKmdjbnGmEMgqnUb6b4cVkGBzj+OhNjqhRi6n09MkfsDSdpVe o7hOe6rGLh1oNQZggDdQDhve8M7q5+2WoNCohdNbzUqUVqmr9s9+G0AHSwCyRjIuPAGu 2IqQ== 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:message-id:reply-to; bh=U+5N1rXSfVPzLU7ZKBzI7cYGDRpk01puVVQT6NPAi1o=; b=4SCdR6+P9OoWgvq4W/VrTIGtlvVviB2AYKCI6dxi4jR4dSPohmjCG3Js/lEzVC1wZU wEcHbblQt3EE3i6df7UIaokE0TzzUPB+PaB+rHmxr9KW6TAEB5h5nQzWoiQU9Ii1FYUs tU+9FAjQjpfhbMKhYOrOBWbVj0v6yjTMdSYcbO1U4sqMsOa5/SAMxPNkEtadPKVvE66J mCnpkS9E0KldOb7oLtNJ9HG4AxPP3EFkB7HL7uXJAND2cP/Nv8DiefkUhaK/FWkt+nlt N+KiB7x6jFULg0NgKnUxwWvbTaSv2N8O7em4yjC8y3w0d8VQNn2AmAqSEK7n8qVzq9b/ 75yA== X-Gm-Message-State: AFqh2koXTbP+Q61Ys7gh69aAr/ErvMrXlYTu9V+GL8Fc6AqrDwZXR0qm dRyiEK7OoIjvTtmmKnOphS0= X-Google-Smtp-Source: AMrXdXst4D2SRJG02W2JtgxucFf+eXdtI3QE0xU5NO4BcY0cLVtjS+Pc/v+KPVRLGsBqZVFr5JY7iA== X-Received: by 2002:a17:907:3e26:b0:839:74cf:7c4f with SMTP id hp38-20020a1709073e2600b0083974cf7c4fmr103277586ejc.8.1673816866654; Sun, 15 Jan 2023 13:07:46 -0800 (PST) Received: from localhost.localdomain (ip5f5abbb0.dynamic.kabel-deutschland.de. [95.90.187.176]) by smtp.gmail.com with ESMTPSA id a11-20020aa7d74b000000b0049e08f781e3sm1010421eds.3.2023.01.15.13.07.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Jan 2023 13:07:46 -0800 (PST) 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 PHY_MACConfig8188E() to common error logic Date: Sun, 15 Jan 2023 22:07:31 +0100 Message-Id: <20230115210734.18610-2-straube.linux@gmail.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230115210734.18610-1-straube.linux@gmail.com> References: <20230115210734.18610-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" Convert the function PHY_MACConfig8188E() away from returning _FAIL or _SUCCESS which uses inverted error logic. Use the common error logic instead. Return 0 for success and negative values for failure. Signed-off-by: Michael Straube Tested-by: Philipp Hortmann # Edimax N150 --- drivers/staging/r8188eu/hal/rtl8188e_phycfg.c | 9 ++++----- drivers/staging/r8188eu/hal/usb_halinit.c | 5 ++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/drivers/staging/r8188eu/hal/rtl8188e_phycfg.c b/drivers/stagin= g/r8188eu/hal/rtl8188e_phycfg.c index b7f3c7a670fb..204c1c30377b 100644 --- a/drivers/staging/r8188eu/hal/rtl8188e_phycfg.c +++ b/drivers/staging/r8188eu/hal/rtl8188e_phycfg.c @@ -315,21 +315,20 @@ rtl8188e_PHY_SetRFReg( * 08/12/2008 MHC Create Version 0. * *------------------------------------------------------------------------= ---*/ -s32 PHY_MACConfig8188E(struct adapter *Adapter) +int PHY_MACConfig8188E(struct adapter *Adapter) { struct hal_data_8188e *pHalData =3D &Adapter->haldata; - int rtStatus =3D _SUCCESS; + int err; =20 /* */ /* Config MAC */ /* */ - if (ODM_ReadAndConfig_MAC_REG_8188E(&pHalData->odmpriv)) - rtStatus =3D _FAIL; + err =3D ODM_ReadAndConfig_MAC_REG_8188E(&pHalData->odmpriv); =20 /* 2010.07.13 AMPDU aggregation number B */ rtw_write16(Adapter, REG_MAX_AGGR_NUM, MAX_AGGR_NUM); =20 - return rtStatus; + return err; } =20 /** diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8= 188eu/hal/usb_halinit.c index d28b4dc2a767..9ba6a526e90d 100644 --- a/drivers/staging/r8188eu/hal/usb_halinit.c +++ b/drivers/staging/r8188eu/hal/usb_halinit.c @@ -600,9 +600,8 @@ u32 rtl8188eu_hal_init(struct adapter *Adapter) Adapter->pwrctrlpriv.bFwCurrentInPSMode =3D false; haldata->LastHMEBoxNum =3D 0; =20 - status =3D PHY_MACConfig8188E(Adapter); - if (status =3D=3D _FAIL) - goto exit; + if (PHY_MACConfig8188E(Adapter)) + return _FAIL; =20 /* */ /* d. Initialize BB related configurations. */ --=20 2.39.0 From nobody Mon Sep 15 03:59:09 2025 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 997F0C46467 for ; Sun, 15 Jan 2023 21:08:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231636AbjAOVIA (ORCPT ); Sun, 15 Jan 2023 16:08:00 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36746 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231181AbjAOVHv (ORCPT ); Sun, 15 Jan 2023 16:07:51 -0500 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 C3D901449E for ; Sun, 15 Jan 2023 13:07:48 -0800 (PST) Received: by mail-ed1-x530.google.com with SMTP id w14so21034180edi.5 for ; Sun, 15 Jan 2023 13:07:48 -0800 (PST) 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 :message-id:reply-to; bh=rl6qXidu5WIs9nfrJNjX3YLrFPQ+UzUlEvm+lb6ejX8=; b=aGSmoHCRnDPbu3N95+i267CwF+b32AnPcEYIvug5tlCBNTeM1W0fglKna1UmjjojvN crchnx4bR1DHF+8hMK4nPuHuLaLtBd5bDrq43Ki+7s0mlvNHp05bd82W50uZzKWXDqWi eUdTI8NoEIyb8BZikP7ML3RywovN2V8hr6o9EeDpdxOaH+94Ev+x+Rf2PJ8KfhDYmsby LzKgWWj2OVxe9kbfYq+Hrtw+eR9fje64hc5a33K1qIMcbImqxqDxEPRC0LOXI5ztwu2B ArN5ZR2yH4iI8gi6cIo919g3GKBxp0kR3l2OJ50v8E6xcMzgx8d7zrviJwKk0071V2lO ay8A== 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:message-id:reply-to; bh=rl6qXidu5WIs9nfrJNjX3YLrFPQ+UzUlEvm+lb6ejX8=; b=ctxIhE5F92sdESM6H36N9AGDpYZ2Jde4xrtsQB+vjbbkoPi5OpS+9UGe91RUk5jLWe i0RgyPA1/O3aEiGlW0wc3ZTypiVmHIs58gr9CcqWAaCrThzOjjfuIIb0GRxuBtvDbc6D pVx/alpktMrUFxiNHw2UXJsF/6OrhLgyRDoh2o+mCuDVSiZJ1Rq7zFCl4HD1moNgTGXh fAclpRufG+n2fTUAj/fzdO5aAJmhkLKGrUniwGONPzwz1XpfkrdfM0HS3xUvKEA6uHtJ PC3VTs+tK89bYv6ei26HRBVJAu8lkEGqyhgvVe/Z03bCDdJwg9t32k6n4pIFIqbm+n/6 Os7w== X-Gm-Message-State: AFqh2kpk949H6y/vnkBtLE3lVqdBh9PKfzrLMU5zr2PCrBdXgMe4F3fv OJUURdrxHEW9Jgo77phhhYM= X-Google-Smtp-Source: AMrXdXufqCOOueR+Yc/0f6cIbPCMMF9bsP5YeESLYnR0rHZm/SLRRRVF1ctzhqOi0jfj9Yy6Sg22Yw== X-Received: by 2002:a05:6402:380d:b0:47e:eaae:9a5b with SMTP id es13-20020a056402380d00b0047eeaae9a5bmr76135871edb.42.1673816867306; Sun, 15 Jan 2023 13:07:47 -0800 (PST) Received: from localhost.localdomain (ip5f5abbb0.dynamic.kabel-deutschland.de. [95.90.187.176]) by smtp.gmail.com with ESMTPSA id a11-20020aa7d74b000000b0049e08f781e3sm1010421eds.3.2023.01.15.13.07.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Jan 2023 13:07:47 -0800 (PST) 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 phy_RF6052_Config_ParaFile() to common error logic Date: Sun, 15 Jan 2023 22:07:32 +0100 Message-Id: <20230115210734.18610-3-straube.linux@gmail.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230115210734.18610-1-straube.linux@gmail.com> References: <20230115210734.18610-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" Convert the function phy_RF6052_Config_ParaFile() away from returning _FAIL or _SUCCESS which uses inverted error logic. Use the common error logic instead. Return 0 for success and negative values for failure. Signed-off-by: Michael Straube Tested-by: Philipp Hortmann # Edimax N150 --- drivers/staging/r8188eu/hal/rtl8188e_rf6052.c | 7 +++---- drivers/staging/r8188eu/hal/usb_halinit.c | 5 ++--- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/drivers/staging/r8188eu/hal/rtl8188e_rf6052.c b/drivers/stagin= g/r8188eu/hal/rtl8188e_rf6052.c index e5ec6e563fbd..1988fb6e780a 100644 --- a/drivers/staging/r8188eu/hal/rtl8188e_rf6052.c +++ b/drivers/staging/r8188eu/hal/rtl8188e_rf6052.c @@ -371,7 +371,7 @@ int phy_RF6052_Config_ParaFile(struct adapter *Adapter) struct bb_reg_def *pPhyReg; struct hal_data_8188e *pHalData =3D &Adapter->haldata; u32 u4RegValue =3D 0; - int rtStatus =3D _SUCCESS; + int err; =20 /* Initialize RF */ =20 @@ -396,11 +396,10 @@ int phy_RF6052_Config_ParaFile(struct adapter *Adapte= r) udelay(1);/* PlatformStallExecution(1); */ =20 /*----Initialize RF fom connfiguration file----*/ - if (ODM_ReadAndConfig_RadioA_1T_8188E(&pHalData->odmpriv)) - rtStatus =3D _FAIL; + err =3D ODM_ReadAndConfig_RadioA_1T_8188E(&pHalData->odmpriv); =20 /*----Restore RFENV control type----*/; rtl8188e_PHY_SetBBReg(Adapter, pPhyReg->rfintfs, bRFSI_RFENV, u4RegValue); =20 - return rtStatus; + return err; } diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8= 188eu/hal/usb_halinit.c index 9ba6a526e90d..cb36b42c5ecc 100644 --- a/drivers/staging/r8188eu/hal/usb_halinit.c +++ b/drivers/staging/r8188eu/hal/usb_halinit.c @@ -610,9 +610,8 @@ u32 rtl8188eu_hal_init(struct adapter *Adapter) if (status =3D=3D _FAIL) goto exit; =20 - status =3D phy_RF6052_Config_ParaFile(Adapter); - if (status =3D=3D _FAIL) - goto exit; + if (phy_RF6052_Config_ParaFile(Adapter)) + return _FAIL; =20 status =3D rtl8188e_iol_efuse_patch(Adapter); if (status =3D=3D _FAIL) --=20 2.39.0 From nobody Mon Sep 15 03:59:09 2025 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 09FBCC3DA78 for ; Sun, 15 Jan 2023 21:08:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231651AbjAOVID (ORCPT ); Sun, 15 Jan 2023 16:08:03 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36740 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231598AbjAOVHu (ORCPT ); Sun, 15 Jan 2023 16:07:50 -0500 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 845A95B8A for ; Sun, 15 Jan 2023 13:07:49 -0800 (PST) Received: by mail-ej1-x634.google.com with SMTP id u19so63814494ejm.8 for ; Sun, 15 Jan 2023 13:07:49 -0800 (PST) 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 :message-id:reply-to; bh=9pQYkoy/qDxOSox6BoBo+SUk2rYCy0dIN6nPZeFhqyM=; b=XLSCgdrC+GHjNNokBBmD75ZEzXi0pdUT7fNbbLuPb/XITinDsrcsYmxIDqujGA+AJU afRIE05aUjMgORuQMKTln1Fz72MgI3BZQ8RKtEp0U9jZDJmsYwKOQkNgYZn7IzfjMXxf kt/rQLmi6JUCsmzAAbK64Kfo/0wPQobFhbwJgvWc0FoLEQmCxe9jDLfwlQ72QKWFJBn9 mjWtL6SOV8rarUWRH5k3p0u8/GKnqh3VuDB61WiFg8MLYbBtZCdGdm1Zvtvg5eoRlIlG xUS6TPW+l5LpDtDGE+Fb1wy3I0b4qZlepOneZt4Xfb/XJHpNBEp+jVzSsKN9XWQjazqW KCIw== 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:message-id:reply-to; bh=9pQYkoy/qDxOSox6BoBo+SUk2rYCy0dIN6nPZeFhqyM=; b=pTUroMQfm4VGrKjSC7dYOHuxsr+4o78M8UY1ZDrhsAUj1bDbteRaFRf5P7TCHZ8qNI IL12/cRAXfYoN3jPaKCAfM/Bkzqfq2s4xlFPAl4PDAc71xfvUfb0EjA11/Xwimn/Eheh 6qmO3P7gJCKxxyuvCVP7Sq3etz1uGBnTIMkgITyVXnPTZ7AiSMi+Sx4EljWO/qAo7cP/ a1xpUdAKIFoAtUyVmyz3wNV0M7AP8lhvSGClsZu3fZY4alb9iXoXY1cwLbi6YpH21+P7 VGqEgRO+cyAqve9kl2Ls8fvyuZjl73B0pHKcbx6HuxeucKHI2yNLB7NqnTla2h1BZTA4 HpiQ== X-Gm-Message-State: AFqh2kpgTXyBjB1/o0RB8Bz1o8qkSfXmoI0r9dH+whct+laIyElW8s01 l/MP8fSCfmCBdOMQp8f+piU= X-Google-Smtp-Source: AMrXdXtUYXRJM8uy4LK6HOe8tQ495C8xd1k4pw0uSD3uECBWtLiY+W4oFYidKA7ZwshkZ1bhsGVeVg== X-Received: by 2002:a17:906:f8c9:b0:870:8a70:d630 with SMTP id lh9-20020a170906f8c900b008708a70d630mr1415589ejb.17.1673816868119; Sun, 15 Jan 2023 13:07:48 -0800 (PST) Received: from localhost.localdomain (ip5f5abbb0.dynamic.kabel-deutschland.de. [95.90.187.176]) by smtp.gmail.com with ESMTPSA id a11-20020aa7d74b000000b0049e08f781e3sm1010421eds.3.2023.01.15.13.07.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Jan 2023 13:07:47 -0800 (PST) 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 phy_BB8188E_Config_ParaFile() to common error logic Date: Sun, 15 Jan 2023 22:07:33 +0100 Message-Id: <20230115210734.18610-4-straube.linux@gmail.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230115210734.18610-1-straube.linux@gmail.com> References: <20230115210734.18610-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" Convert the fubction phy_BB8188E_Config_ParaFile() away from returning _FAIL or _SUCCESS which uses inverted error logic. Use the common error logic instead. Return 0 for success and negative values for failure. Signed-off-by: Michael Straube Tested-by: Philipp Hortmann # Edimax N150 --- drivers/staging/r8188eu/hal/rtl8188e_phycfg.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/drivers/staging/r8188eu/hal/rtl8188e_phycfg.c b/drivers/stagin= g/r8188eu/hal/rtl8188e_phycfg.c index 204c1c30377b..c52af93f1669 100644 --- a/drivers/staging/r8188eu/hal/rtl8188e_phycfg.c +++ b/drivers/staging/r8188eu/hal/rtl8188e_phycfg.c @@ -449,13 +449,15 @@ static int phy_BB8188E_Config_ParaFile(struct adapter= *Adapter) { struct eeprom_priv *pEEPROM =3D &Adapter->eeprompriv; struct hal_data_8188e *pHalData =3D &Adapter->haldata; + int err; =20 /* */ /* 1. Read PHY_REG.TXT BB INIT!! */ /* We will separate as 88C / 92C according to chip version */ /* */ - if (ODM_ReadAndConfig_PHY_REG_1T_8188E(&pHalData->odmpriv)) - return _FAIL; + err =3D ODM_ReadAndConfig_PHY_REG_1T_8188E(&pHalData->odmpriv); + if (err) + return err; =20 /* 2. If EEPROM or EFUSE autoload OK, We must config by PHY_REG_PG.txt */ if (!pEEPROM->bautoload_fail_flag) { @@ -464,10 +466,11 @@ static int phy_BB8188E_Config_ParaFile(struct adapter= *Adapter) } =20 /* 3. BB AGC table Initialization */ - if (ODM_ReadAndConfig_AGC_TAB_1T_8188E(&pHalData->odmpriv)) - return _FAIL; + err =3D ODM_ReadAndConfig_AGC_TAB_1T_8188E(&pHalData->odmpriv); + if (err) + return err; =20 - return _SUCCESS; + return 0; } =20 int @@ -497,7 +500,8 @@ PHY_BBConfig8188E( rtw_write8(Adapter, REG_SYS_FUNC_EN, FEN_USBA | FEN_USBD | FEN_BB_GLB_RST= n | FEN_BBRSTB); =20 /* Config BB and AGC */ - rtStatus =3D phy_BB8188E_Config_ParaFile(Adapter); + if (phy_BB8188E_Config_ParaFile(Adapter)) + rtStatus =3D _FAIL; =20 /* write 0x24[16:11] =3D 0x24[22:17] =3D CrystalCap */ CrystalCap =3D pHalData->CrystalCap & 0x3F; --=20 2.39.0 From nobody Mon Sep 15 03:59:09 2025 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 03AFFC46467 for ; Sun, 15 Jan 2023 21:08:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231276AbjAOVIH (ORCPT ); Sun, 15 Jan 2023 16:08:07 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36760 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231642AbjAOVHx (ORCPT ); Sun, 15 Jan 2023 16:07:53 -0500 Received: from mail-ed1-x536.google.com (mail-ed1-x536.google.com [IPv6:2a00:1450:4864:20::536]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1ECB414488 for ; Sun, 15 Jan 2023 13:07:50 -0800 (PST) Received: by mail-ed1-x536.google.com with SMTP id v10so37143876edi.8 for ; Sun, 15 Jan 2023 13:07:50 -0800 (PST) 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 :message-id:reply-to; bh=HgoF6Yn8695zBMkTSi4Lbg1WNVYK5ieGNugObJcQ8Z4=; b=fBVQUEjrppTt6brIUzcXyf7TbCnuWrZP3D/yM/oPP3cVbVix7Iv7j0KCnV1u626wOG serum4zDSVIlU/ObY0dKlbL0Fy3WXR+kdPiWYXUfjcxc1jrquKw+02Ma4DCuwjJqu3hG WeVHnyw97ZnXiguZuvBXQB3B1nCLuvoeUpuUZ8u2DtvOOBIj4TtsRZUEqs9nxeKJKIKV c1nPw6s0ECJSqDPdTiGRVC6dj7oehlgeIkBmfCt3aYOdhfo0jjxb3j9fwndSIOqdJVZY g3cNerpw89r7n2HEYAQF7sbP7ce8PdrU3OUXnmKg57Ml9MBjrjVDBoFLUa2lQm39DUF0 xgFA== 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:message-id:reply-to; bh=HgoF6Yn8695zBMkTSi4Lbg1WNVYK5ieGNugObJcQ8Z4=; b=mmOgBEK7+ehQLMBBHXM6MnBuH9NPxPquwPwxJdtU79J3jC0hIn4AKkItAoTkGjZNj2 0Ozs8fzhuFEtJPz40oveYWyZSZ8Hbo76ibxs6xhvktd6+lHl4V6zJmNBdrYomL6uFozS A91XqO/PlQiWjrSLlgaPYoLQ03b51cMwfuZuveHgewk3vD40rpy43os7XjCSt1ChZsse qsvJLb2OfTLgP9W96wJP/rZ1HwQpxC1MHF0Q5jaIllIjdnAA4CohEEnmiw63anS3IEQX yWEq+FOmVxKLBmduLSGcSW/WK2qr+z61nJACmurGU0+BMz+15qjKUFhCieFubVoFWN/+ 6S9A== X-Gm-Message-State: AFqh2krCq+V/Z81HeaJuzYl2ZgPlKo6ib8R7nDko1QDzzWVpoAtHXitK AqrlbkJend1hJBFKoomaCl8= X-Google-Smtp-Source: AMrXdXtuO3WzQ6xrAKfcFd7vfCH6z/n8acSWH1cTRINwJVZ8NrNfRrrzX+HyjBCojwe+VtIP1/baOg== X-Received: by 2002:a05:6402:48d:b0:46f:d386:117d with SMTP id k13-20020a056402048d00b0046fd386117dmr7427368edv.33.1673816868693; Sun, 15 Jan 2023 13:07:48 -0800 (PST) Received: from localhost.localdomain (ip5f5abbb0.dynamic.kabel-deutschland.de. [95.90.187.176]) by smtp.gmail.com with ESMTPSA id a11-20020aa7d74b000000b0049e08f781e3sm1010421eds.3.2023.01.15.13.07.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Jan 2023 13:07:48 -0800 (PST) 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 PHY_BBConfig8188E() to common error logic Date: Sun, 15 Jan 2023 22:07:34 +0100 Message-Id: <20230115210734.18610-5-straube.linux@gmail.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230115210734.18610-1-straube.linux@gmail.com> References: <20230115210734.18610-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" Convert the function PHY_BBConfig8188E() away from returning _FAIL or _SUCCESS which uses inverted error logic. Use the common error logic instead. Return 0 for success and negative values for failure. Signed-off-by: Michael Straube Tested-by: Philipp Hortmann # Edimax N150 --- drivers/staging/r8188eu/hal/rtl8188e_phycfg.c | 14 ++++++-------- drivers/staging/r8188eu/hal/usb_halinit.c | 5 ++--- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/drivers/staging/r8188eu/hal/rtl8188e_phycfg.c b/drivers/stagin= g/r8188eu/hal/rtl8188e_phycfg.c index c52af93f1669..f4edf4a8f5c2 100644 --- a/drivers/staging/r8188eu/hal/rtl8188e_phycfg.c +++ b/drivers/staging/r8188eu/hal/rtl8188e_phycfg.c @@ -478,18 +478,17 @@ PHY_BBConfig8188E( struct adapter *Adapter ) { - int rtStatus =3D _SUCCESS; struct hal_data_8188e *pHalData =3D &Adapter->haldata; u16 RegVal; u8 CrystalCap; - int res; + int err; =20 phy_InitBBRFRegisterDefinition(Adapter); =20 /* Enable BB and RF */ - res =3D rtw_read16(Adapter, REG_SYS_FUNC_EN, &RegVal); - if (res) - return _FAIL; + err =3D rtw_read16(Adapter, REG_SYS_FUNC_EN, &RegVal); + if (err) + return err; =20 rtw_write16(Adapter, REG_SYS_FUNC_EN, (u16)(RegVal | BIT(13) | BIT(0) | B= IT(1))); =20 @@ -500,14 +499,13 @@ PHY_BBConfig8188E( rtw_write8(Adapter, REG_SYS_FUNC_EN, FEN_USBA | FEN_USBD | FEN_BB_GLB_RST= n | FEN_BBRSTB); =20 /* Config BB and AGC */ - if (phy_BB8188E_Config_ParaFile(Adapter)) - rtStatus =3D _FAIL; + err =3D phy_BB8188E_Config_ParaFile(Adapter); =20 /* write 0x24[16:11] =3D 0x24[22:17] =3D CrystalCap */ CrystalCap =3D pHalData->CrystalCap & 0x3F; rtl8188e_PHY_SetBBReg(Adapter, REG_AFE_XTAL_CTRL, 0x7ff800, (CrystalCap |= (CrystalCap << 6))); =20 - return rtStatus; + return err; } =20 static void getTxPowerIndex88E(struct adapter *Adapter, u8 channel, u8 *cc= kPowerLevel, diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8= 188eu/hal/usb_halinit.c index cb36b42c5ecc..b7c9e5fd9a59 100644 --- a/drivers/staging/r8188eu/hal/usb_halinit.c +++ b/drivers/staging/r8188eu/hal/usb_halinit.c @@ -606,9 +606,8 @@ u32 rtl8188eu_hal_init(struct adapter *Adapter) /* */ /* d. Initialize BB related configurations. */ /* */ - status =3D PHY_BBConfig8188E(Adapter); - if (status =3D=3D _FAIL) - goto exit; + if (PHY_BBConfig8188E(Adapter)) + return _FAIL; =20 if (phy_RF6052_Config_ParaFile(Adapter)) return _FAIL; --=20 2.39.0