From nobody Mon Apr 6 14:55:01 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 783D3C433FE for ; Sun, 2 Oct 2022 07:48:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229732AbiJBHs4 (ORCPT ); Sun, 2 Oct 2022 03:48:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54712 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229717AbiJBHsw (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 39F102AE0B for ; Sun, 2 Oct 2022 00:48:49 -0700 (PDT) Received: by mail-ed1-x532.google.com with SMTP id y8so10866253edc.10 for ; Sun, 02 Oct 2022 00:48:49 -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=w+EWhQ/spGU7Ku7CRdrNSboZT6E/J8iiRvKE32O8saI=; b=B4KhHBB0VlRi4Wqe3ZxycoZkgdRkGgdABoqeX87nPUnLh5kfybH1xYSqKJDenZ7U5v tlUccxpIaExWL7joyMlrZj0WxmDXo1KFZ8FEpUKRZwLJpoFw73qy9O/phAFSFJU2KSCa OuTLqBKjn+MD/cpscCn33HdqZnXiug6Exq37sQvi1LNl9wsYwuQeCRh+RBefTL+OIlBM YlzleyygGEyDF1hovX6sFF6pZMgN2cU1KX9n17T1Yuuqcj+vref2ONK9P0cYgtckzWt6 qzikF3k02A9UKOTrRGWmcXP+574gDN0eqhx7z+9S2iWm1aVZXIlSRIvx1o6/bAc+T6o9 Delw== 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=w+EWhQ/spGU7Ku7CRdrNSboZT6E/J8iiRvKE32O8saI=; b=yGHWiuuEozRxP8PJGuCIuwty9X8Qd4bt9ouLymxcvvFKR1OeqNG+BasL6r9H4lIHWC amCO8BqYUtYkqWniE6cUuwKWWMUBrrPH89Xzxm89rf2mjbDiPHHrzkrk3ZP9rNmZxNCB K653gbn+x3d5g0EMSqLc9HPGupkPfzAHXBgCTaQUyUqKvTJ+EEoE/zKMDe2e2iyO4PUm UIX0u1ujjRzf6ZNLbN7JVj6I+XL7lnPqMr1zryPM6I9mPaA/x7LuQyHgHzbTHEOTf5sX eORxEAto7dn8XGAifXkojbSFbnCM+txF4nxBDhnrZo4AxM/xOB3iMAOfKQcnHixfHiyi 5ALA== X-Gm-Message-State: ACrzQf1Z7BaocXgNWvh4AAd3OeVehANSz0/FX6m51ySQXBQLAnPV3sBj nB4At3sj1pQ+LckuVEs33dg= X-Google-Smtp-Source: AMsMyM6unR/8rXfKlWjqDnUQZhBl+DfICMc7oVL+kzOWeow7f43gxUO3rz73V4jXfEs6UK8M0JTtqw== X-Received: by 2002:a05:6402:34d5:b0:451:335c:2f1e with SMTP id w21-20020a05640234d500b00451335c2f1emr13944586edc.160.1664696927700; Sun, 02 Oct 2022 00:48:47 -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.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 Oct 2022 00:48:47 -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/5] staging: r8188eu: merge odm_types.h into other headers Date: Sun, 2 Oct 2022 09:48:23 +0200 Message-Id: <20221002074827.8566-2-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" The macros SET_TX_DESC_ANTSEL_{A,B,C}_88E are used in odm_RTL8188E.c. Move them from odm_types.h to odm_RTL8188E.h. ODM_CE is used in places where also ODM_ITRF_USB is used in the code. Move the ODM_CE define to the header that defines ODM_ITRF_USB. While at it remove an extra space between '#' and 'define ODM_ITRF_USB'. The haeder odm_types.h is now empty and we can remove it. Signed-off-by: Michael Straube Tested-by: Philipp Hortmann # Edimax N150 --- drivers/staging/r8188eu/include/odm.h | 3 ++- drivers/staging/r8188eu/include/odm_RTL8188E.h | 7 +++++++ drivers/staging/r8188eu/include/odm_types.h | 16 ---------------- drivers/staging/r8188eu/include/rtl8188e_hal.h | 1 - 4 files changed, 9 insertions(+), 18 deletions(-) delete mode 100644 drivers/staging/r8188eu/include/odm_types.h diff --git a/drivers/staging/r8188eu/include/odm.h b/drivers/staging/r8188e= u/include/odm.h index f131e17167bf..89b01dd614ba 100644 --- a/drivers/staging/r8188eu/include/odm.h +++ b/drivers/staging/r8188eu/include/odm.h @@ -119,7 +119,8 @@ enum odm_ability_def { ODM_BB_PWR_TRA =3D BIT(8), }; =20 -# define ODM_ITRF_USB 0x2 +#define ODM_ITRF_USB 0x2 +#define ODM_CE 0x04 =20 /* ODM_CMNINFO_WM_MODE */ enum odm_wireless_mode { diff --git a/drivers/staging/r8188eu/include/odm_RTL8188E.h b/drivers/stagi= ng/r8188eu/include/odm_RTL8188E.h index 3c6471f1a893..4f16af248591 100644 --- a/drivers/staging/r8188eu/include/odm_RTL8188E.h +++ b/drivers/staging/r8188eu/include/odm_RTL8188E.h @@ -11,6 +11,13 @@ #define MAIN_ANT_CGCS_RX 0 #define AUX_ANT_CGCS_RX 1 =20 +#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) \ + le32p_replace_bits((__le32 *)(__ptxdesc + 8), __value, BIT(25)) +#define SET_TX_DESC_ANTSEL_C_88E(__ptxdesc, __value) \ + le32p_replace_bits((__le32 *)(__ptxdesc + 28), __value, BIT(29)) + void ODM_AntennaDiversityInit_88E(struct odm_dm_struct *pDM_Odm); =20 void ODM_AntennaDiversity_88E(struct odm_dm_struct *pDM_Odm); diff --git a/drivers/staging/r8188eu/include/odm_types.h b/drivers/staging/= r8188eu/include/odm_types.h deleted file mode 100644 index 76302df4b330..000000000000 --- a/drivers/staging/r8188eu/include/odm_types.h +++ /dev/null @@ -1,16 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */ -/* Copyright(c) 2007 - 2011 Realtek Corporation. */ - -#ifndef __ODM_TYPES_H__ -#define __ODM_TYPES_H__ - -#define ODM_CE 0x04 /* BIT(2) */ - -#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) \ - le32p_replace_bits((__le32 *)(__ptxdesc + 8), __value, BIT(25)) -#define SET_TX_DESC_ANTSEL_C_88E(__ptxdesc, __value) \ - le32p_replace_bits((__le32 *)(__ptxdesc + 28), __value, BIT(29)) - -#endif /* __ODM_TYPES_H__ */ diff --git a/drivers/staging/r8188eu/include/rtl8188e_hal.h b/drivers/stagi= ng/r8188eu/include/rtl8188e_hal.h index ed4091e7cc7e..a1e88e6d5c0c 100644 --- a/drivers/staging/r8188eu/include/rtl8188e_hal.h +++ b/drivers/staging/r8188eu/include/rtl8188e_hal.h @@ -14,7 +14,6 @@ #include "rtl8188e_xmit.h" #include "rtl8188e_cmd.h" #include "rtw_efuse.h" -#include "odm_types.h" #include "odm.h" #include "odm_HWConfig.h" #include "odm_RegDefine11N.h" --=20 2.37.3 From nobody Mon Apr 6 14:55:01 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 6E430C433FE for ; Sun, 2 Oct 2022 07:49:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229730AbiJBHtE (ORCPT ); Sun, 2 Oct 2022 03:49:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54718 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229722AbiJBHsw (ORCPT ); Sun, 2 Oct 2022 03:48:52 -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 96E2D2AE13 for ; Sun, 2 Oct 2022 00:48:49 -0700 (PDT) Received: by mail-ed1-x530.google.com with SMTP id a41so10863251edf.4 for ; Sun, 02 Oct 2022 00:48:49 -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=MeUagKMqLt8xwygfI7Rpy9NQam9xN4XTEL4NIRU0X5U=; b=X88fLBEp/yxMlHnIPnDMWluSdNXYBG+JJCy2GcrYkxP4+y4Ew++JA/32GKUKFW064z 9tEJRuqa7ZzqiZPr4PFMn5qMsd08HP0W/oyekST+9AmfJMiS3hGZrkdr7PoM3UGcrhO4 Yq/rIPF/0jWYUkrb/KHRjnKRZMH8GTVQkuBdKQGmT40niFD5VQGvwwUdyX231f2peCDF TPb+zwrDAMhzLXV3vTRugwxnUfES6dvSYChDrOeoT+iFbT53tZCMtryCAw/pioubTnld AzfwBhbNlTzru6OqRhk1ci/wra1YAfpF/GHKdvzFGUx6RlWXS8oweFdul8YVV9KWYfLJ HaRg== 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=MeUagKMqLt8xwygfI7Rpy9NQam9xN4XTEL4NIRU0X5U=; b=AzhplT2/ZfW12L9o0IRwoXRstNq45IbwGDNuGAuf1GUEP3IFXY7fwyAqpKs+RxVPMh 4VtE7gSokc+YKy2k8gGa3c9/YywLvsJ5PrOCUAo+E0h8sgPNCL+66bvlinEHrFqwc+58 cwGOYHztCSJqEAEx8h56F+/8v+lsd90wsMi4SBkYk4mbDxnxLcyF2NPLdBUcuLfsTLNO 8C5XgHrhJW5QROkFko08Huq+rrDWi4dVt9nf4JR2BGIm+S7htXkup5pSCNBqpHAdEbS5 j46ccbA0COcy8oJDjhcqtzVOdAlfRggELJwzemLD4DiGA+OIirYdxtRvIBto8U8qaNAC 4vfA== X-Gm-Message-State: ACrzQf1wC5zke3GIkVgKcwlvviLP0CRtPZhhLXK+UcoAOWeO74L1n6FM 8NndCTyUEWWvtWK9FaZhLfk= X-Google-Smtp-Source: AMsMyM4SKYf2u5KGEOkJ72hBl/3xQH6I+tj5+Zc7/drnjl7FqUag/vegCrfr4/0MLTNXinkxIDzXaw== X-Received: by 2002:a05:6402:3603:b0:451:fdda:dddd with SMTP id el3-20020a056402360300b00451fddaddddmr13748554edb.81.1664696928230; 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.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 Oct 2022 00:48:47 -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/5] staging: r8188eu: convert rtw_init_evt_priv() to common error logic Date: Sun, 2 Oct 2022 09:48:24 +0200 Message-Id: <20221002074827.8566-3-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_evt_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 Tested-by: Philipp Hortmann # Edimax N150 --- 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, 5 insertions(+), 7 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_cmd.c b/drivers/staging/r8188= eu/core/rtw_cmd.c index 3fadace33de6..88b939e42f5a 100644 --- a/drivers/staging/r8188eu/core/rtw_cmd.c +++ b/drivers/staging/r8188eu/core/rtw_cmd.c @@ -90,10 +90,8 @@ u32 rtw_init_cmd_priv(struct cmd_priv *pcmdpriv) return _SUCCESS; } =20 -u32 rtw_init_evt_priv(struct evt_priv *pevtpriv) +int rtw_init_evt_priv(struct evt_priv *pevtpriv) { - u32 res =3D _SUCCESS; - /* allocate DMA-able/Non-Page memory for cmd_buf and rsp_buf */ atomic_set(&pevtpriv->event_seq, 0); =20 @@ -101,9 +99,9 @@ u32 rtw_init_evt_priv(struct evt_priv *pevtpriv) pevtpriv->c2h_wk_alive =3D false; pevtpriv->c2h_queue =3D rtw_cbuf_alloc(C2H_QUEUE_MAX_LEN + 1); if (!pevtpriv->c2h_queue) - res =3D _FAIL; + return -ENOMEM; =20 - return res; + return 0; } =20 void rtw_free_cmd_priv(struct cmd_priv *pcmdpriv) diff --git a/drivers/staging/r8188eu/include/rtw_cmd.h b/drivers/staging/r8= 188eu/include/rtw_cmd.h index 9a76aa85de94..c6c48e1fb961 100644 --- a/drivers/staging/r8188eu/include/rtw_cmd.h +++ b/drivers/staging/r8188eu/include/rtw_cmd.h @@ -85,7 +85,7 @@ int rtw_cmd_thread(void *context); u32 rtw_init_cmd_priv(struct cmd_priv *pcmdpriv); void rtw_free_cmd_priv(struct cmd_priv *pcmdpriv); =20 -u32 rtw_init_evt_priv(struct evt_priv *pevtpriv); +int rtw_init_evt_priv(struct evt_priv *pevtpriv); void rtw_free_evt_priv(struct evt_priv *pevtpriv); void rtw_evt_notify_isr(struct evt_priv *pevtpriv); u8 p2p_protocol_wk_cmd(struct adapter *padapter, int intCmdType); diff --git a/drivers/staging/r8188eu/os_dep/os_intfs.c b/drivers/staging/r8= 188eu/os_dep/os_intfs.c index 6a45315d01a2..dd4c89d7390d 100644 --- a/drivers/staging/r8188eu/os_dep/os_intfs.c +++ b/drivers/staging/r8188eu/os_dep/os_intfs.c @@ -468,7 +468,7 @@ u8 rtw_init_drv_sw(struct adapter *padapter) =20 padapter->cmdpriv.padapter =3D padapter; =20 - if ((rtw_init_evt_priv(&padapter->evtpriv)) =3D=3D _FAIL) { + if (rtw_init_evt_priv(&padapter->evtpriv)) { dev_err(dvobj_to_dev(padapter->dvobj), "rtw_init_evt_priv failed\n"); goto free_cmd_priv; } --=20 2.37.3 From nobody Mon Apr 6 14:55:01 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 Tested-by: Philipp Hortmann # Edimax N150 --- 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 From nobody Mon Apr 6 14:55:01 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 8B0DBC433F5 for ; Sun, 2 Oct 2022 07:49:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229769AbiJBHtI (ORCPT ); Sun, 2 Oct 2022 03:49:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54740 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229726AbiJBHsy (ORCPT ); Sun, 2 Oct 2022 03:48:54 -0400 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 AE7722AE1D for ; Sun, 2 Oct 2022 00:48:50 -0700 (PDT) Received: by mail-ed1-x536.google.com with SMTP id c93so2054483edf.11 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=PQPZkn7E5IjiLWsvX5daUSv5IaF5YUgb6ZmfCxE/RZQ=; b=ZrGFv4b2DSYT5IqxyTQV6K+cYO43+OVSR1ZWMZJuvFAGqI0NmptJj+Z6x2AQtZOjUD lYBMiKS0GaxM1YygX6HIYW+II+2kSiR6aT+hcdfg5PKXY+AZX1l1pINWukruQW5SZBAn aGtK7FpfncUs1rxIgusSpUpGvIDKriOeBXyvWjnTq81VZBFEz9F7UXuGjb4X1mg1i4Zr FndW2PsjTolR9jG/jbWBiUIeBHXkElQur/4OF4NnKpQ/VvZNXhnID159e7PYGM9YCWPQ 8drgIIgM44WtoYLjBDkK8clu0ZgjS5trJ8trCfFeRIGXr8jDuH5Yzi/8qLs8WO195mmg 6QPA== 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=PQPZkn7E5IjiLWsvX5daUSv5IaF5YUgb6ZmfCxE/RZQ=; b=SCAYpu4eGpjfFp1BSuzg9nLPPfzf0o4xojRBfh2MXyQBV4sjbxSEOCh3SAHxUs+r7g lgWE9nRaxYgaYKS0WiaQrhJWm1bb+gHKXjQKFKtUkm5+kBRX3eSxYJiCrrW9GItQl1Pl xx7Iup7J3mA11YiqrQuKyj1WG6QNNO6DZfEUZ9HGaTa4FhX0yigQO/YhkLppMLQUDY0H C3tRwrFClXYO7Mzf5Byb+dN1jlT+QDmkfAs1WWRDaE/ra8prsiQdBbx1emduNqe/nZfi 0IaWllH7tIAJeNwNgxylGCfHPI0dm+MTxmS/XytWJmGbto6VSshBpOgJ29S22c1IS9UC z8vQ== X-Gm-Message-State: ACrzQf2HlEbDiWDHrgKwiAILVvGoIM2748uFVeJ4ynupAx33jQJNNDmf bSP05aIRgvaoxPCZw23WdZY= X-Google-Smtp-Source: AMsMyM7ZRWsWpq6K7vtK3ZZdsgqx0pVubQ570QaJcYyengIesZq4nhM1VWgrAV0/f3zPOYYiKlRUsw== X-Received: by 2002:a05:6402:557:b0:458:7488:8958 with SMTP id i23-20020a056402055700b0045874888958mr9907041edx.242.1664696929291; Sun, 02 Oct 2022 00:48:49 -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:49 -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/5] staging: r8188eu: convert rtw_init_mlme_priv() to common error logic Date: Sun, 2 Oct 2022 09:48:26 +0200 Message-Id: <20221002074827.8566-5-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_mlme_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 Tested-by: Philipp Hortmann # Edimax N150 --- drivers/staging/r8188eu/core/rtw_mlme.c | 12 ++++-------- drivers/staging/r8188eu/os_dep/os_intfs.c | 2 +- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_mlme.c b/drivers/staging/r818= 8eu/core/rtw_mlme.c index 5ca03d6cac32..1f69e5c57d5d 100644 --- a/drivers/staging/r8188eu/core/rtw_mlme.c +++ b/drivers/staging/r8188eu/core/rtw_mlme.c @@ -224,7 +224,6 @@ int rtw_init_mlme_priv(struct adapter *padapter)/* stru= ct mlme_priv *pmlmepriv) u8 *pbuf; struct wlan_network *pnetwork; struct mlme_priv *pmlmepriv =3D &padapter->mlmepriv; - int res =3D _SUCCESS; =20 /* We don't need to memset padapter->XXX to zero, because adapter is all= ocated by vzalloc(). */ =20 @@ -245,10 +244,9 @@ int rtw_init_mlme_priv(struct adapter *padapter)/* str= uct mlme_priv *pmlmepriv) =20 pbuf =3D vzalloc(MAX_BSS_CNT * (sizeof(struct wlan_network))); =20 - if (!pbuf) { - res =3D _FAIL; - goto exit; - } + if (!pbuf) + return -ENOMEM; + pmlmepriv->free_bss_buf =3D pbuf; =20 pnetwork =3D (struct wlan_network *)pbuf; @@ -265,9 +263,7 @@ int rtw_init_mlme_priv(struct adapter *padapter)/* stru= ct mlme_priv *pmlmepriv) =20 rtw_init_mlme_timer(padapter); =20 -exit: - - return res; + return 0; } =20 void rtw_free_mlme_priv(struct mlme_priv *pmlmepriv) diff --git a/drivers/staging/r8188eu/os_dep/os_intfs.c b/drivers/staging/r8= 188eu/os_dep/os_intfs.c index 490e0c7dc034..d8b8a5291e40 100644 --- a/drivers/staging/r8188eu/os_dep/os_intfs.c +++ b/drivers/staging/r8188eu/os_dep/os_intfs.c @@ -473,7 +473,7 @@ u8 rtw_init_drv_sw(struct adapter *padapter) goto free_cmd_priv; } =20 - if (rtw_init_mlme_priv(padapter) =3D=3D _FAIL) { + if (rtw_init_mlme_priv(padapter)) { dev_err(dvobj_to_dev(padapter->dvobj), "rtw_init_mlme_priv failed\n"); goto free_evt_priv; } --=20 2.37.3 From nobody Mon Apr 6 14:55:01 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 9C553C4332F for ; Sun, 2 Oct 2022 07:49:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229748AbiJBHtL (ORCPT ); Sun, 2 Oct 2022 03:49:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54742 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229727AbiJBHsy (ORCPT ); Sun, 2 Oct 2022 03:48:54 -0400 Received: from mail-ej1-x630.google.com (mail-ej1-x630.google.com [IPv6:2a00:1450:4864:20::630]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 537882AE26 for ; Sun, 2 Oct 2022 00:48:51 -0700 (PDT) Received: by mail-ej1-x630.google.com with SMTP id bj12so16629135ejb.13 for ; Sun, 02 Oct 2022 00:48:51 -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=VnF8lssJzqyw2+RAZUEdl7sARBhzjYhR50rZlgAc+Sc=; b=AgsVf+ypiATLgkFdL8xTjahYAFDUBpIrGcSiOhVz2XeAR17fVjssXQcRr7YCUxRAF7 +Z7mKeB0oNvkkoeURFF3GynBOt0gkGbSRYnk0eq3U+KLBhAfSlJh17X3bj44MZSO8Dz7 +WrZSJyAZCFXuXxx8clxSiEcxUweR2+teNDPEq+mj5UTAPnxed8gCXDHo+Dgx6bInhcQ T856Sh6ZTfqQDGSKjDTDjzqEVLVXVPE71ntc0NHlKByniY2gpS5cA34FhzeuCYjnk7cn 1ZOrdk3ozEtKpOh6hmCBFjyveP7gfLOTONmROZ7PyC59P6WSf7Ko8ugbkhub7KQ/flUF zp6Q== 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=VnF8lssJzqyw2+RAZUEdl7sARBhzjYhR50rZlgAc+Sc=; b=2c8syxjtD8ImOpqSVY6g6tNZX9yiOZyqdA305IeLQ31yVsLCOXDYdvT4RYxgq3uMwk q5DEsch2GOtj6rvO59IRuL0souIHExXr5CeKwxqE6RUMrs5PV6PWlG5L4rYy3hZsS8WZ Ykasz+UlkC05Qqxq+RE0X/r3eQAzlNa5pptt4KhErGnEEWxMsAn7vHY0zj2ytA057+vo 0YVgsRAF1je4WEg+yXv5bamFPfTsf4E3XUtUWe6IaXyo9iEvb8rjwKqnpuV6zyaTv6QX AZQPoTyB37Uwa7sHSKGH0eiWqH3ykf/KssGmgTWZlYr2VJhjhQDSDI1SKpEzDNRMku/q s4nw== X-Gm-Message-State: ACrzQf1jE875laN3YPY83IQDlD4/0PNRvI4SBF/+mQe/0keRdXzYvXeL zf0L7nkp+mb76W56s0LrzZw= X-Google-Smtp-Source: AMsMyM5Bj6mtOlkggNTfJbCLk9+jkGnGUlknm89bkPnTp4ivZGdb10+Kl4mKjdBqxWkgkrebOAmlMQ== X-Received: by 2002:a17:906:fe45:b0:788:15a5:7495 with SMTP id wz5-20020a170906fe4500b0078815a57495mr7230253ejb.633.1664696929878; Sun, 02 Oct 2022 00:48:49 -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.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 Oct 2022 00:48:49 -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 5/5] staging: r8188eu: convert _rtw_init_sta_priv() to common error logic Date: Sun, 2 Oct 2022 09:48:27 +0200 Message-Id: <20221002074827.8566-6-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_sta_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 Tested-by: Philipp Hortmann # Edimax N150 --- drivers/staging/r8188eu/core/rtw_sta_mgt.c | 6 +++--- drivers/staging/r8188eu/include/sta_info.h | 2 +- drivers/staging/r8188eu/os_dep/os_intfs.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_sta_mgt.c b/drivers/staging/r= 8188eu/core/rtw_sta_mgt.c index 98eeb16cab6c..bbde5c03f9ae 100644 --- a/drivers/staging/r8188eu/core/rtw_sta_mgt.c +++ b/drivers/staging/r8188eu/core/rtw_sta_mgt.c @@ -45,7 +45,7 @@ static void _rtw_init_stainfo(struct sta_info *psta) psta->keep_alive_trycnt =3D 0; } =20 -u32 _rtw_init_sta_priv(struct sta_priv *pstapriv) +int _rtw_init_sta_priv(struct sta_priv *pstapriv) { struct sta_info *psta; s32 i; @@ -53,7 +53,7 @@ u32 _rtw_init_sta_priv(struct sta_priv *pstapriv) pstapriv->pallocated_stainfo_buf =3D vzalloc(sizeof(struct sta_info) * NU= M_STA + 4); =20 if (!pstapriv->pallocated_stainfo_buf) - return _FAIL; + return -ENOMEM; =20 pstapriv->pstainfo_buf =3D pstapriv->pallocated_stainfo_buf + 4 - ((size_t)(pstapriv->pallocated_stainfo_buf) & 3); @@ -93,7 +93,7 @@ u32 _rtw_init_sta_priv(struct sta_priv *pstapriv) pstapriv->expire_to =3D 3; /* 3*2 =3D 6 sec */ pstapriv->max_num_sta =3D NUM_STA; =20 - return _SUCCESS; + return 0; } =20 inline int rtw_stainfo_offset(struct sta_priv *stapriv, struct sta_info *s= ta) diff --git a/drivers/staging/r8188eu/include/sta_info.h b/drivers/staging/r= 8188eu/include/sta_info.h index 4112c837bcef..f76e086b5701 100644 --- a/drivers/staging/r8188eu/include/sta_info.h +++ b/drivers/staging/r8188eu/include/sta_info.h @@ -295,7 +295,7 @@ static inline u32 wifi_mac_hash(u8 *mac) return x; } =20 -extern u32 _rtw_init_sta_priv(struct sta_priv *pstapriv); +extern int _rtw_init_sta_priv(struct sta_priv *pstapriv); extern void _rtw_free_sta_priv(struct sta_priv *pstapriv); =20 #define stainfo_offset_valid(offset) (offset < NUM_STA && offset >=3D 0) diff --git a/drivers/staging/r8188eu/os_dep/os_intfs.c b/drivers/staging/r8= 188eu/os_dep/os_intfs.c index d8b8a5291e40..e43ef7e5ba70 100644 --- a/drivers/staging/r8188eu/os_dep/os_intfs.c +++ b/drivers/staging/r8188eu/os_dep/os_intfs.c @@ -494,7 +494,7 @@ u8 rtw_init_drv_sw(struct adapter *padapter) goto free_xmit_priv; } =20 - if (_rtw_init_sta_priv(&padapter->stapriv) =3D=3D _FAIL) { + if (_rtw_init_sta_priv(&padapter->stapriv)) { dev_err(dvobj_to_dev(padapter->dvobj), "_rtw_init_sta_priv failed\n"); goto free_recv_priv; } --=20 2.37.3