From nobody Mon Apr 6 16:19:59 2026 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 7D73FC433F5 for ; Sun, 2 Oct 2022 07:49:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229741AbiJBHtB (ORCPT ); Sun, 2 Oct 2022 03:49:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54720 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229720AbiJBHsw (ORCPT ); Sun, 2 Oct 2022 03:48:52 -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 203A72AE19 for ; Sun, 2 Oct 2022 00:48:50 -0700 (PDT) Received: by mail-ed1-x532.google.com with SMTP id z97so10863698ede.8 for ; Sun, 02 Oct 2022 00:48:50 -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=JVknYk0vlwYwohwAqFrUHN5xYyLqUYp7SiDIhrNiOxY=; b=Igz04itpii7RGNiuS+9DpuNTcphVahzIvG5ruVoFw4ebYUzAnd63etx/JLiOh7eva9 M2ljbdJGy/kg7pV8p8O/9+jrtHfQID5mAj5NKckSRtqHtZ0BJE8fpTgwqVwLAArDzB0T Vw6/yNB2xg6t2C5scueiPVAlmhsQXgIkiJG19Jnjegir1pxOEpxaItw1QORXnsQU0Ox0 e56PCAAhqjhdN3DTtNpZBvZqXxadjWYyaUJ4H2Iw2Zd6PHt0aUu7VlXWrP4194UgNIKG lRdBHqBxzvPU/IM0Hs3aeiEcabq+Jz2wrrez3Gyree8Irkf9lLS8TNy9mKGmK9y9t4mh KjXw== 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=JVknYk0vlwYwohwAqFrUHN5xYyLqUYp7SiDIhrNiOxY=; b=QHldzSMIX9p3coEBUu+nm8PlUhaiQxgbk9gM5EPMowUjiPGeiTgMvbnZWA6wDXRLbj rKzalQIBZEgK5UyfctT8jfw7spc8MgFmbRzzDaySCt7vvwqkXvYhXEDmDJgl1+EUOvC0 f5NglfJrasa3RxYyv50aeWDHWPKc33Op8AlLSh6V84BrcubI+U6ZWfUg6wcYt6nVG8XP 6H0NFChp5vIjo10Q4t9GHf+vKZbGINqN3A7YwtJDfO2Iqc84fTwCpLPNvj8ZOKEYk5cQ t+FXIvDOI9jWwqmFwVzZ6DkLleQ7fDFVJAkH7QZQAzWRSFBSoqBwXlCscTDZM6cz21Xg 3Q+g== X-Gm-Message-State: ACrzQf2560dTwMnkFWWsVQKmDFWEo/lk8pvA769Sw94OzerflMAky00J cSXowRmos7A75sa3/17C5sA= X-Google-Smtp-Source: AMsMyM4yFvLMfierLQ8tSKmOj3vrAFmNAy5udDSU42cFRllBJIvqooektBP84mCkWUg+rR8AINJrHQ== X-Received: by 2002:a05:6402:1587:b0:458:fbea:436c with SMTP id c7-20020a056402158700b00458fbea436cmr54348edv.407.1664696928769; Sun, 02 Oct 2022 00:48:48 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb59.dynamic.kabel-deutschland.de. [95.90.187.89]) by smtp.gmail.com with ESMTPSA id q26-20020a17090676da00b0077ce503bd77sm3608536ejn.129.2022.10.02.00.48.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 Oct 2022 00:48:48 -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/5] staging: r8188eu: convert rtw_init_cmd_priv() to common error logic Date: Sun, 2 Oct 2022 09:48:25 +0200 Message-Id: <20221002074827.8566-4-straube.linux@gmail.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221002074827.8566-1-straube.linux@gmail.com> References: <20221002074827.8566-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 rtw_init_cmd_priv() to common kernel error logic. Return 0 on success and negative value on failure. This is part of getting rid of returning _SUCCESS and _FAIL which uses inverted error logic and is used all over the driver. Signed-off-by: Michael Straube --- drivers/staging/r8188eu/core/rtw_cmd.c | 8 ++++---- drivers/staging/r8188eu/include/rtw_cmd.h | 2 +- drivers/staging/r8188eu/os_dep/os_intfs.c | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_cmd.c b/drivers/staging/r8188= eu/core/rtw_cmd.c index 88b939e42f5a..fdc0c71e28a4 100644 --- a/drivers/staging/r8188eu/core/rtw_cmd.c +++ b/drivers/staging/r8188eu/core/rtw_cmd.c @@ -54,7 +54,7 @@ static int _rtw_enqueue_cmd(struct __queue *queue, struct= cmd_obj *obj) return _SUCCESS; } =20 -u32 rtw_init_cmd_priv(struct cmd_priv *pcmdpriv) +int rtw_init_cmd_priv(struct cmd_priv *pcmdpriv) { init_completion(&pcmdpriv->enqueue_cmd); /* sema_init(&(pcmdpriv->cmd_done_sema), 0); */ @@ -71,7 +71,7 @@ u32 rtw_init_cmd_priv(struct cmd_priv *pcmdpriv) GFP_KERNEL); =20 if (!pcmdpriv->cmd_allocated_buf) - return _FAIL; + return -ENOMEM; =20 pcmdpriv->cmd_buf =3D pcmdpriv->cmd_allocated_buf + CMDBUFF_ALIGN_SZ - = ((size_t)(pcmdpriv->cmd_allocated_buf) & (CMDBUFF_ALIGN_SZ - 1)); =20 @@ -79,7 +79,7 @@ u32 rtw_init_cmd_priv(struct cmd_priv *pcmdpriv) =20 if (!pcmdpriv->rsp_allocated_buf) { kfree(pcmdpriv->cmd_allocated_buf); - return _FAIL; + return -ENOMEM; } =20 pcmdpriv->rsp_buf =3D pcmdpriv->rsp_allocated_buf + 4 - ((size_t)(pcmdp= riv->rsp_allocated_buf) & 3); @@ -87,7 +87,7 @@ u32 rtw_init_cmd_priv(struct cmd_priv *pcmdpriv) pcmdpriv->cmd_done_cnt =3D 0; pcmdpriv->rsp_cnt =3D 0; =20 - return _SUCCESS; + return 0; } =20 int rtw_init_evt_priv(struct evt_priv *pevtpriv) diff --git a/drivers/staging/r8188eu/include/rtw_cmd.h b/drivers/staging/r8= 188eu/include/rtw_cmd.h index c6c48e1fb961..8bbfeb42604f 100644 --- a/drivers/staging/r8188eu/include/rtw_cmd.h +++ b/drivers/staging/r8188eu/include/rtw_cmd.h @@ -82,7 +82,7 @@ void rtw_free_cmd_obj(struct cmd_obj *pcmd); =20 int rtw_cmd_thread(void *context); =20 -u32 rtw_init_cmd_priv(struct cmd_priv *pcmdpriv); +int rtw_init_cmd_priv(struct cmd_priv *pcmdpriv); void rtw_free_cmd_priv(struct cmd_priv *pcmdpriv); =20 int rtw_init_evt_priv(struct evt_priv *pevtpriv); diff --git a/drivers/staging/r8188eu/os_dep/os_intfs.c b/drivers/staging/r8= 188eu/os_dep/os_intfs.c index dd4c89d7390d..490e0c7dc034 100644 --- a/drivers/staging/r8188eu/os_dep/os_intfs.c +++ b/drivers/staging/r8188eu/os_dep/os_intfs.c @@ -461,7 +461,7 @@ u8 rtw_reset_drv_sw(struct adapter *padapter) =20 u8 rtw_init_drv_sw(struct adapter *padapter) { - if ((rtw_init_cmd_priv(&padapter->cmdpriv)) =3D=3D _FAIL) { + if (rtw_init_cmd_priv(&padapter->cmdpriv)) { dev_err(dvobj_to_dev(padapter->dvobj), "rtw_init_cmd_priv failed\n"); return _FAIL; } --=20 2.37.3