From nobody Mon May 11 08:30:47 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 DF0E3C433F5 for ; Mon, 11 Apr 2022 10:23:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244230AbiDKKZk (ORCPT ); Mon, 11 Apr 2022 06:25:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50374 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345444AbiDKKZO (ORCPT ); Mon, 11 Apr 2022 06:25:14 -0400 Received: from mail-pg1-x535.google.com (mail-pg1-x535.google.com [IPv6:2607:f8b0:4864:20::535]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6AC8144769 for ; Mon, 11 Apr 2022 03:21:59 -0700 (PDT) Received: by mail-pg1-x535.google.com with SMTP id k14so13821603pga.0 for ; Mon, 11 Apr 2022 03:21:59 -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=ioOLOPRMwxuocGQiKn3ZypvnZg8gicvD1hlKV7CC/G0=; b=WScTtEoPg8rfuBUuUvYtHKVp0wwTmhBMdvNJ3OF1NaBNKpunV+yblivfIzRpwSEYLO TC41U82zJnuLIx/l60Ou+clbet6SWmkwv3PDiX46bnipEQ588owetbfOSiDDxftyt+zd Dbp+0eWhV54Hs1gwrQ6aOFn9aZAmpjAt9ek/qzC66ynoDPt+YF31lN5hMsIcIbygMizh DBrDu4qbfylwp04MCHBSXuZK4yy+DLfI+TNGr4sOzl+OK3qfFz/3yXzICxlLCYA0Mqs9 1k40WYjdwGckv3bWdF8GvCp3GX2bK/0muGVGJC3KYH8i9v/gQ5BFRvigKCscFqmTuaFD oUGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ioOLOPRMwxuocGQiKn3ZypvnZg8gicvD1hlKV7CC/G0=; b=7STpGDSl6oRAZQuXi7Hi25Gi6xbEg0mAeaq19QShh3da0Am7u2oxPeYoMglk4ESSco X2PbUkvQQxLRTWDEGLylzmodUOPf6ML+53mZBxkrGkO44fi2HSgdhXN3GT7CKjryyGZF GlWYeXxJ5WIpURuYTqI26HZpbsApFUCO4fY8T2h26zcC29ki99QJJ57HTOQT5f7KN646 b2WOIkp0yLVsH1v8pregkSjpA0RWOzY2O56ZI0h+4dL7SXzh3cGlkgmXyNEmZE6GPBJH GPi7PHrKn16krgCC3sOUDvptrGsr6Hr+5oSWNqCwdGoqm41OE0AjA0eDimI3X2qxW+0l rAkg== X-Gm-Message-State: AOAM530bdWukEHPBO38ei4qb8lNCyTAXIBh9XyQ16w3vLpwPFBjX35EQ FV6iEwTf3Bi3P6qws5v/nR8= X-Google-Smtp-Source: ABdhPJxWW43ktUsUtlSzuScY28viShh0aFgK9c2HjNrjsN6GhUbKT3q7NqL0ND9Nn5oRS3U56JX9yQ== X-Received: by 2002:a65:47c4:0:b0:39d:4f85:40e0 with SMTP id f4-20020a6547c4000000b0039d4f8540e0mr4041654pgs.309.1649672518843; Mon, 11 Apr 2022 03:21:58 -0700 (PDT) Received: from makvihas.localhost.com ([2405:201:202b:15:4376:c658:ae1e:1781]) by smtp.gmail.com with ESMTPSA id z14-20020a17090a170e00b001cb7e69ee5csm4886318pjd.54.2022.04.11.03.21.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Apr 2022 03:21:58 -0700 (PDT) From: Vihas Makwana To: Larry Finger , Phillip Potter , Greg Kroah-Hartman , Michael Straube Cc: linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Dan Carpenter , Pavel Skripkin , Vihas Makwana Subject: [PATCH v2 1/7] staging: r8188eu: drop unnecessary wrapper _rtw_free_cmd_priv Date: Mon, 11 Apr 2022 15:51:30 +0530 Message-Id: <20220411102136.14937-2-makvihas@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220411102136.14937-1-makvihas@gmail.com> References: <20220411102136.14937-1-makvihas@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" Drop unnecessary wrapper _rtw_free_cmd_priv and move its logic to rtw_free_cmd_priv. Signed-off-by: Vihas Makwana Reviewed-by: Dan Carpenter --- drivers/staging/r8188eu/core/rtw_cmd.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_cmd.c b/drivers/staging/r8188= eu/core/rtw_cmd.c index f036a980e..d53217900 100644 --- a/drivers/staging/r8188eu/core/rtw_cmd.c +++ b/drivers/staging/r8188eu/core/rtw_cmd.c @@ -87,14 +87,6 @@ void rtw_free_evt_priv(struct evt_priv *pevtpriv) } } =20 -static void _rtw_free_cmd_priv(struct cmd_priv *pcmdpriv) -{ - if (pcmdpriv) { - kfree(pcmdpriv->cmd_allocated_buf); - kfree(pcmdpriv->rsp_allocated_buf); - } -} - /* Calling Context: * * rtw_enqueue_cmd can only be called between kernel thread, @@ -159,7 +151,10 @@ u32 rtw_init_evt_priv(struct evt_priv *pevtpriv) =20 void rtw_free_cmd_priv(struct cmd_priv *pcmdpriv) { - _rtw_free_cmd_priv(pcmdpriv); + if (pcmdpriv) { + kfree(pcmdpriv->cmd_allocated_buf); + kfree(pcmdpriv->rsp_allocated_buf); + } } =20 static int rtw_cmd_filter(struct cmd_priv *pcmdpriv, struct cmd_obj *cmd_o= bj) --=20 2.30.2 From nobody Mon May 11 08:30:47 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 08444C433EF for ; Mon, 11 Apr 2022 10:23:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345481AbiDKKZr (ORCPT ); Mon, 11 Apr 2022 06:25:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55444 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345414AbiDKKZW (ORCPT ); Mon, 11 Apr 2022 06:25:22 -0400 Received: from mail-pf1-x42e.google.com (mail-pf1-x42e.google.com [IPv6:2607:f8b0:4864:20::42e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 21FFC44A12 for ; Mon, 11 Apr 2022 03:22:03 -0700 (PDT) Received: by mail-pf1-x42e.google.com with SMTP id f3so14227080pfe.2 for ; Mon, 11 Apr 2022 03:22:02 -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=UDJwfC4bXVfds8p9uj2dvjrmmyg7JkvC30fvf514tUw=; b=atCReM7GsEniNQu0eCNJ6aQxRV2SMOdKBHn4gjkvwZaPYYBYmaAoAA09Ho6TWsw2lJ UlepctMkONgP33D7RXbn7vHddoESrb/UmCTLYuJ+ZdXlAh8V7eeiSdhkGSP12UPKuy1f L+z9Wd8pchqmYJIiU2FxlrVE3kVYIMcrpBiB+iCROQctDLErcjO1bZlp3Za/t7npcBW+ l6vzKDo+UGuFFfwONCgp78q30rWiwNojvQ/T74pqyUY+6/DkNIaOZt00lhNlicmd01/C Rhpaa6Co/kxuSfiWCuRSjJgCnRfrQlqHpMaa8XNj1V4QzunLH6Z4EFGrD22OsEuRBEF3 ZTLQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=UDJwfC4bXVfds8p9uj2dvjrmmyg7JkvC30fvf514tUw=; b=Vpsb3rUssTA2eUQyXn1TKkH7t2KM6pCN078ejbjDnYCJfb9XWsDSFvji3BJpJbsqhu S07ZTQvhcl8hFqQMKFT4aXflNU7k2nvTUs0RfkK6aN6eKI5G3Ol7H/qy9M8iYK87JJ+1 aTuGGG5emJ43yAs4Dp00zNSG7R0GpqeqyG1WF5SfYeVd1MpLXcPF3DEzb//EwanqCqNW fuw4tiezMVIQXU/yMpZBlD09vpSljhmECmPrm57nS3PTwzETcN4EPEvmfT4NOy8JWO1N 1Exo4LrlAxgbKI6uVdHLKeRV0JXMwsTy75ZOsBKF9dXnLZ5NMH7fKjO2HDXjun2nzdq0 s97Q== X-Gm-Message-State: AOAM533yp/KsevM3XVxaNNkuOhc7ulLyDfOHlI9yJ0GKZhkm1QD8NRsx xfHEKOjqF4aqepkynzZbaWk= X-Google-Smtp-Source: ABdhPJzNPJjwDfyVPTKLgVA7IrxOrALdvl+BXQbDiROT9w1bmwz9EZklAQiEYiv+as26Osv/zA5eNw== X-Received: by 2002:a63:f048:0:b0:39d:6f6d:47ad with SMTP id s8-20020a63f048000000b0039d6f6d47admr1130450pgj.494.1649672522385; Mon, 11 Apr 2022 03:22:02 -0700 (PDT) Received: from makvihas.localhost.com ([2405:201:202b:15:4376:c658:ae1e:1781]) by smtp.gmail.com with ESMTPSA id z14-20020a17090a170e00b001cb7e69ee5csm4886318pjd.54.2022.04.11.03.21.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Apr 2022 03:22:02 -0700 (PDT) From: Vihas Makwana To: Larry Finger , Phillip Potter , Greg Kroah-Hartman , Michael Straube Cc: linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Dan Carpenter , Pavel Skripkin , Vihas Makwana Subject: [PATCH v2 2/7] staging: r8188eu: drop unnecessary wrapper _rtw_init_cmd_priv Date: Mon, 11 Apr 2022 15:51:31 +0530 Message-Id: <20220411102136.14937-3-makvihas@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220411102136.14937-1-makvihas@gmail.com> References: <20220411102136.14937-1-makvihas@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" Drop unnecessary wrapper _rtw_init_cmd_priv and move its logic to rtw_init_cmd_priv. Signed-off-by: Vihas Makwana Reviewed-by: Dan Carpenter --- drivers/staging/r8188eu/core/rtw_cmd.c | 77 ++++++++++++-------------- 1 file changed, 34 insertions(+), 43 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_cmd.c b/drivers/staging/r8188= eu/core/rtw_cmd.c index d53217900..3d1fdc852 100644 --- a/drivers/staging/r8188eu/core/rtw_cmd.c +++ b/drivers/staging/r8188eu/core/rtw_cmd.c @@ -15,47 +15,6 @@ * No irqsave is necessary. */ =20 -static int _rtw_init_cmd_priv(struct cmd_priv *pcmdpriv) -{ - int res =3D _SUCCESS; - - init_completion(&pcmdpriv->enqueue_cmd); - /* sema_init(&(pcmdpriv->cmd_done_sema), 0); */ - init_completion(&pcmdpriv->start_cmd_thread); - init_completion(&pcmdpriv->stop_cmd_thread); - - rtw_init_queue(&pcmdpriv->cmd_queue); - - /* allocate DMA-able/Non-Page memory for cmd_buf and rsp_buf */ - - pcmdpriv->cmd_seq =3D 1; - - pcmdpriv->cmd_allocated_buf =3D kzalloc(MAX_CMDSZ + CMDBUFF_ALIGN_SZ, - GFP_KERNEL); - - if (!pcmdpriv->cmd_allocated_buf) { - res =3D _FAIL; - goto exit; - } - - pcmdpriv->cmd_buf =3D pcmdpriv->cmd_allocated_buf + CMDBUFF_ALIGN_SZ - = ((size_t)(pcmdpriv->cmd_allocated_buf) & (CMDBUFF_ALIGN_SZ - 1)); - - pcmdpriv->rsp_allocated_buf =3D kzalloc(MAX_RSPSZ + 4, GFP_KERNEL); - - if (!pcmdpriv->rsp_allocated_buf) { - res =3D _FAIL; - goto exit; - } - - pcmdpriv->rsp_buf =3D pcmdpriv->rsp_allocated_buf + 4 - ((size_t)(pcmdp= riv->rsp_allocated_buf) & 3); - - pcmdpriv->cmd_done_cnt =3D 0; - pcmdpriv->rsp_cnt =3D 0; -exit: - - return res; -} - static void c2h_wk_callback(struct work_struct *work); =20 static int _rtw_init_evt_priv(struct evt_priv *pevtpriv) @@ -133,9 +92,41 @@ static struct cmd_obj *_rtw_dequeue_cmd(struct __queue = *queue) =20 u32 rtw_init_cmd_priv(struct cmd_priv *pcmdpriv) { - u32 res; + u32 res =3D _SUCCESS; + + init_completion(&pcmdpriv->enqueue_cmd); + /* sema_init(&(pcmdpriv->cmd_done_sema), 0); */ + init_completion(&pcmdpriv->start_cmd_thread); + init_completion(&pcmdpriv->stop_cmd_thread); + + rtw_init_queue(&pcmdpriv->cmd_queue); + + /* allocate DMA-able/Non-Page memory for cmd_buf and rsp_buf */ + + pcmdpriv->cmd_seq =3D 1; + + pcmdpriv->cmd_allocated_buf =3D kzalloc(MAX_CMDSZ + CMDBUFF_ALIGN_SZ, + GFP_KERNEL); + + if (!pcmdpriv->cmd_allocated_buf) { + res =3D _FAIL; + goto exit; + } + + pcmdpriv->cmd_buf =3D pcmdpriv->cmd_allocated_buf + CMDBUFF_ALIGN_SZ - = ((size_t)(pcmdpriv->cmd_allocated_buf) & (CMDBUFF_ALIGN_SZ - 1)); + + pcmdpriv->rsp_allocated_buf =3D kzalloc(MAX_RSPSZ + 4, GFP_KERNEL); + + if (!pcmdpriv->rsp_allocated_buf) { + res =3D _FAIL; + goto exit; + } =20 - res =3D _rtw_init_cmd_priv(pcmdpriv); + pcmdpriv->rsp_buf =3D pcmdpriv->rsp_allocated_buf + 4 - ((size_t)(pcmdp= riv->rsp_allocated_buf) & 3); + + pcmdpriv->cmd_done_cnt =3D 0; + pcmdpriv->rsp_cnt =3D 0; +exit: =20 return res; } --=20 2.30.2 From nobody Mon May 11 08:30:47 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 9DAD6C433F5 for ; Mon, 11 Apr 2022 10:24:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345524AbiDKK0S (ORCPT ); Mon, 11 Apr 2022 06:26:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52444 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345488AbiDKKZX (ORCPT ); Mon, 11 Apr 2022 06:25:23 -0400 Received: from mail-pl1-x630.google.com (mail-pl1-x630.google.com [IPv6:2607:f8b0:4864:20::630]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4EF0A44A28 for ; Mon, 11 Apr 2022 03:22:06 -0700 (PDT) Received: by mail-pl1-x630.google.com with SMTP id s14so3845072plk.8 for ; Mon, 11 Apr 2022 03:22:06 -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=+lgjywWBVQmpZrn9ZKLreOJoALlRHPio16ACwlfnaJI=; b=d7rxJ+WZDC/jumO0M6nhsIm/EvJFwzJlyjaIVOFxY4HjphZSBQxsdtT960isCe5iit K6iZXL1Vq+bP1qtBM8muP7wtGOE2jbM0pgK7d5g6hwbXyMdtJwf3o4f1GIO3sa7tAd5d nvw2lWVy+CtXSVi1a76Pz7tA6qmTnAdlX0oiKJ0FqWOnbPDp1mjPViotd/ICEasQHM6c Y9NCQYx5wlY8LGhchJofcdURg7hU6eu8982d0nLflSfIm6P2O9IFUaIkhWH3hPgtIWSg a6QS9DeawegMypCz3ZvxhiYktBMRl4Nq/IYmp+25x1Ot4cVNs7TTw1pFUiEcGIdw2CbR nWhg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=+lgjywWBVQmpZrn9ZKLreOJoALlRHPio16ACwlfnaJI=; b=IEWZIhCcHXbQN2f96CnluF3It6a1J0s8a59Ti3Vuz01/1AnLMNxd+nFlhH5o24XUdN WdSBeFPIvtc0shmFPD9II6/K11ObszjXFe6ViRhHZJbfsvkPtOW+N6wPAOjD6paRhQ7S FvAWUTKc1/GwKInb9NHshT50yxABYT62AyJgYWmCdJQkNegu/KsOV4Nx9oKGmNClVO37 JHrCD58it5Nhc6kIG8D1qlJaChqF38Mkt6K8AeE/vzcETsB0I5/v4yaDfjoVs9HC0ph8 GpgzYXNwRLZc3DcWn8q1ngSESgfuyqoj4RzMfAMTYQKWBv7EY4IJVLJ1sgRyEj3Qjph7 B9lA== X-Gm-Message-State: AOAM530jADbsmVB01JCXTfcddRFxQxnQpc8wwzrFKroSKRrYHlVRcoSP byFE9uGE/Ze0j+u9pHn6SVDZ0UdPtU4QIpL/ X-Google-Smtp-Source: ABdhPJyeaS1sxH+615n08xEVAzTOHEZPU/3I6q1yhe6Wg0OVgR5ePq0jgn/eRBNwPrt9PVkSdvsKBg== X-Received: by 2002:a17:902:cf05:b0:156:2aa:6e13 with SMTP id i5-20020a170902cf0500b0015602aa6e13mr31406752plg.137.1649672525858; Mon, 11 Apr 2022 03:22:05 -0700 (PDT) Received: from makvihas.localhost.com ([2405:201:202b:15:4376:c658:ae1e:1781]) by smtp.gmail.com with ESMTPSA id z14-20020a17090a170e00b001cb7e69ee5csm4886318pjd.54.2022.04.11.03.22.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Apr 2022 03:22:05 -0700 (PDT) From: Vihas Makwana To: Larry Finger , Phillip Potter , Greg Kroah-Hartman , Michael Straube Cc: linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Dan Carpenter , Pavel Skripkin , Vihas Makwana Subject: [PATCH v2 3/7] staging: r8188eu: drop unnecessary wrapper _rtw_init_evt_priv Date: Mon, 11 Apr 2022 15:51:32 +0530 Message-Id: <20220411102136.14937-4-makvihas@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220411102136.14937-1-makvihas@gmail.com> References: <20220411102136.14937-1-makvihas@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" Drop unnecessary wrapper _rtw_init_evt_priv and move its logic to rtw_init_evt_priv. Signed-off-by: Vihas Makwana Reviewed-by: Dan Carpenter --- drivers/staging/r8188eu/core/rtw_cmd.c | 27 +++++++++----------------- 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_cmd.c b/drivers/staging/r8188= eu/core/rtw_cmd.c index 3d1fdc852..3781706f7 100644 --- a/drivers/staging/r8188eu/core/rtw_cmd.c +++ b/drivers/staging/r8188eu/core/rtw_cmd.c @@ -17,22 +17,6 @@ =20 static void c2h_wk_callback(struct work_struct *work); =20 -static int _rtw_init_evt_priv(struct evt_priv *pevtpriv) -{ - int res =3D _SUCCESS; - - /* allocate DMA-able/Non-Page memory for cmd_buf and rsp_buf */ - atomic_set(&pevtpriv->event_seq, 0); - - INIT_WORK(&pevtpriv->c2h_wk, c2h_wk_callback); - 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 res; -} - void rtw_free_evt_priv(struct evt_priv *pevtpriv) { cancel_work_sync(&pevtpriv->c2h_wk); @@ -133,9 +117,16 @@ u32 rtw_init_cmd_priv(struct cmd_priv *pcmdpriv) =20 u32 rtw_init_evt_priv(struct evt_priv *pevtpriv) { - int res; + u32 res =3D _SUCCESS; + + /* allocate DMA-able/Non-Page memory for cmd_buf and rsp_buf */ + atomic_set(&pevtpriv->event_seq, 0); =20 - res =3D _rtw_init_evt_priv(pevtpriv); + INIT_WORK(&pevtpriv->c2h_wk, c2h_wk_callback); + 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; =20 return res; } --=20 2.30.2 From nobody Mon May 11 08:30:47 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 B291AC433F5 for ; Mon, 11 Apr 2022 10:23:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345401AbiDKK0C (ORCPT ); Mon, 11 Apr 2022 06:26:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50288 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345494AbiDKKZY (ORCPT ); Mon, 11 Apr 2022 06:25:24 -0400 Received: from mail-pg1-x529.google.com (mail-pg1-x529.google.com [IPv6:2607:f8b0:4864:20::529]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F17B344A31 for ; Mon, 11 Apr 2022 03:22:09 -0700 (PDT) Received: by mail-pg1-x529.google.com with SMTP id 32so11663341pgl.4 for ; Mon, 11 Apr 2022 03:22:09 -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=pihteJgws3CPWC4SIMyqFCTdNFf4a7DVbmyRBkvm3cc=; b=ozYrBwVoW8GtsA2LMBdHt6bDeJZtkGzYW2+K2uSshw5P4MKZPC6ecevfqXHrxlNoKX TempNdL6Nw8L916q5BfA915Cha2mG1sTewnDh/g+NpQTeohWwR3/uvpoJNSDdnRY8ob5 RC5xWCYcKmls1v5W34MCI1hksCjg9tAKgI8xz6Rcu92eXDERMbIqHbx+p5Vk9K63ZQwu 5BvNrUsLDsWNg3nTIZpno1vecNM2rFLVclLCnUxPccXBkE7qs/5ta/37e1agqvoZJH4Z yj2PL0FZ1RooB4GiTE1scRriMt54bZp1mVbRlFe4aMyhmay5cv1SOxqfmzzm16w68Pfn r92g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=pihteJgws3CPWC4SIMyqFCTdNFf4a7DVbmyRBkvm3cc=; b=dY85CtUb/w4mnvNu3MGu2iJS96Zp6N2vP+aRG1Tb8XTvkTVctFPd6QgWtVSA80cVLE DqeFZGaV5d6d85cAz3JDakiyAi2KURGcYwA9hrN51GyWQSEJ72LzxvhxacCeBqpV8H4H G8ESxUHKeL0N9BNYbg6c8gImHNAM58otrTBYMkOujb86IU2RFc/et4TmXAWIaRIy+eHS 0B9ASCx5pbHB4BZQaqnOcyyiRQXuwm2lJDwhDdG2q6bGgGQxIvzVIzPBlWcuxf72caQD PYtGxyw+BgGF3Gev3UYKyK+EzPg7l0K7n7FX7EQg7bVPWRAhhCCKhQ+sEWQ239Nsj4WU v0uA== X-Gm-Message-State: AOAM531qTrbF6cSAS3M6kzRBOcumRZ8EezMC3exObgFjmJ2ClX01Zz0l u9Y+CGn9th174MZMPnLkMo1A5oHl3LRCZBT3 X-Google-Smtp-Source: ABdhPJzlj6WhlOOW9qmB8onlQwlWiD/Ejx99i9RM2YVhF+dpyaVYOxXQA8UWKS+YVr80s/c5q77fVg== X-Received: by 2002:a63:35c1:0:b0:386:3620:3c80 with SMTP id c184-20020a6335c1000000b0038636203c80mr25577283pga.327.1649672529329; Mon, 11 Apr 2022 03:22:09 -0700 (PDT) Received: from makvihas.localhost.com ([2405:201:202b:15:4376:c658:ae1e:1781]) by smtp.gmail.com with ESMTPSA id z14-20020a17090a170e00b001cb7e69ee5csm4886318pjd.54.2022.04.11.03.22.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Apr 2022 03:22:09 -0700 (PDT) From: Vihas Makwana To: Larry Finger , Phillip Potter , Greg Kroah-Hartman , Michael Straube Cc: linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Dan Carpenter , Pavel Skripkin , Vihas Makwana Subject: [PATCH v2 4/7] staging: r8188eu: drop unnecessary wrapper _rtw_init_mlme_priv Date: Mon, 11 Apr 2022 15:51:33 +0530 Message-Id: <20220411102136.14937-5-makvihas@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220411102136.14937-1-makvihas@gmail.com> References: <20220411102136.14937-1-makvihas@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" Drop unnecessary wrapper _rtw_init_mlme_priv and move its logic to _rtw_init_mlme_priv. Signed-off-by: Vihas Makwana Reviewed-by: Dan Carpenter --- drivers/staging/r8188eu/core/rtw_mlme.c | 103 +++++++++++------------- 1 file changed, 47 insertions(+), 56 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_mlme.c b/drivers/staging/r818= 8eu/core/rtw_mlme.c index c90f36dee..6b8c80fe9 100644 --- a/drivers/staging/r8188eu/core/rtw_mlme.c +++ b/drivers/staging/r8188eu/core/rtw_mlme.c @@ -30,60 +30,6 @@ u8 rtw_to_roaming(struct adapter *adapter) return adapter->mlmepriv.to_roaming; } =20 -static int _rtw_init_mlme_priv(struct adapter *padapter) -{ - int i; - u8 *pbuf; - struct wlan_network *pnetwork; - struct mlme_priv *pmlmepriv =3D &padapter->mlmepriv; - int res =3D _SUCCESS; - - /* We don't need to memset padapter->XXX to zero, because adapter is all= ocated by vzalloc(). */ - - pmlmepriv->nic_hdl =3D (u8 *)padapter; - - pmlmepriv->pscanned =3D NULL; - pmlmepriv->fw_state =3D 0; - pmlmepriv->cur_network.network.InfrastructureMode =3D Ndis802_11AutoUnkno= wn; - pmlmepriv->scan_mode =3D SCAN_ACTIVE;/* 1: active, 0: pasive. Maybe some= day we should rename this varable to "active_mode" (Jeff) */ - - spin_lock_init(&pmlmepriv->lock); - rtw_init_queue(&pmlmepriv->free_bss_pool); - rtw_init_queue(&pmlmepriv->scanned_queue); - - set_scanned_network_val(pmlmepriv, 0); - - memset(&pmlmepriv->assoc_ssid, 0, sizeof(struct ndis_802_11_ssid)); - - pbuf =3D vzalloc(MAX_BSS_CNT * (sizeof(struct wlan_network))); - - if (!pbuf) { - res =3D _FAIL; - goto exit; - } - pmlmepriv->free_bss_buf =3D pbuf; - - pnetwork =3D (struct wlan_network *)pbuf; - - for (i =3D 0; i < MAX_BSS_CNT; i++) { - INIT_LIST_HEAD(&pnetwork->list); - - list_add_tail(&pnetwork->list, &pmlmepriv->free_bss_pool.queue); - - pnetwork++; - } - - /* allocate DMA-able/Non-Page memory for cmd_buf and rsp_buf */ - - rtw_clear_scan_deny(padapter); - - rtw_init_mlme_timer(padapter); - -exit: - - return res; -} - static void rtw_free_mlme_ie_data(u8 **ppie, u32 *plen) { kfree(*ppie); @@ -290,9 +236,54 @@ u8 *rtw_get_beacon_interval_from_ie(u8 *ie) =20 int rtw_init_mlme_priv(struct adapter *padapter)/* struct mlme_priv *pmlme= priv) */ { - int res; + int i; + u8 *pbuf; + struct wlan_network *pnetwork; + struct mlme_priv *pmlmepriv =3D &padapter->mlmepriv; + int res =3D _SUCCESS; + + /* We don't need to memset padapter->XXX to zero, because adapter is all= ocated by vzalloc(). */ + + pmlmepriv->nic_hdl =3D (u8 *)padapter; + + pmlmepriv->pscanned =3D NULL; + pmlmepriv->fw_state =3D 0; + pmlmepriv->cur_network.network.InfrastructureMode =3D Ndis802_11AutoUnkno= wn; + pmlmepriv->scan_mode =3D SCAN_ACTIVE;/* 1: active, 0: pasive. Maybe some= day we should rename this varable to "active_mode" (Jeff) */ + + spin_lock_init(&pmlmepriv->lock); + rtw_init_queue(&pmlmepriv->free_bss_pool); + rtw_init_queue(&pmlmepriv->scanned_queue); + + set_scanned_network_val(pmlmepriv, 0); + + memset(&pmlmepriv->assoc_ssid, 0, sizeof(struct ndis_802_11_ssid)); =20 - res =3D _rtw_init_mlme_priv(padapter);/* (pmlmepriv); */ + pbuf =3D vzalloc(MAX_BSS_CNT * (sizeof(struct wlan_network))); + + if (!pbuf) { + res =3D _FAIL; + goto exit; + } + pmlmepriv->free_bss_buf =3D pbuf; + + pnetwork =3D (struct wlan_network *)pbuf; + + for (i =3D 0; i < MAX_BSS_CNT; i++) { + INIT_LIST_HEAD(&pnetwork->list); + + list_add_tail(&pnetwork->list, &pmlmepriv->free_bss_pool.queue); + + pnetwork++; + } + + /* allocate DMA-able/Non-Page memory for cmd_buf and rsp_buf */ + + rtw_clear_scan_deny(padapter); + + rtw_init_mlme_timer(padapter); + +exit: =20 return res; } --=20 2.30.2 From nobody Mon May 11 08:30:47 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 DFEFCC433F5 for ; Mon, 11 Apr 2022 10:24:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345480AbiDKK0N (ORCPT ); Mon, 11 Apr 2022 06:26:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55134 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345373AbiDKKZ0 (ORCPT ); Mon, 11 Apr 2022 06:25:26 -0400 Received: from mail-pj1-x102e.google.com (mail-pj1-x102e.google.com [IPv6:2607:f8b0:4864:20::102e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9664E45040 for ; Mon, 11 Apr 2022 03:22:13 -0700 (PDT) Received: by mail-pj1-x102e.google.com with SMTP id mp16-20020a17090b191000b001cb5efbcab6so5687626pjb.4 for ; Mon, 11 Apr 2022 03:22:13 -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=u0Zrucn+WwL2muTuZbK71MP5TYNDykrOeiAojxdU0WI=; b=Ch7QdJknQqzcOMoV8qxSf6WOdf7BNtp+gc2rzVO0jw+mSNFxtNzmw/zu72/nAI7tbw u84t7t6no98vZm/up1Z8bUEbzFlFfeRkYmRPlwKjT+cscsV9eEHUZKNnBiuXUf3WhiT4 yPeU1K1tv8EeDkfGOupRpLBLT5r3GAPx9tkcLat/RfuI+z1KHRLY5mP3sBnpPbY5vGzV ChatEL3m4Iv7smjU4LZfDieL8WwozJFtKPBJ53+kk4lVstpqd9bhbnUlPZBXGGVoKRHA vS8onxkLGq1yq67MU22cpGaXBel69FYTvpn+BrITDN2uXhqbUtpOR2xOYOoCVC7saFlA Xgjg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=u0Zrucn+WwL2muTuZbK71MP5TYNDykrOeiAojxdU0WI=; b=yTGuILQsFKwJGFTbRyMuDyk8fHSsrq96KrQLx2tXjV8IQFfSlnC6sechTrZwlRoENa 9nOyixrdaCKlu+83G4Yt7j2aR/Gf93OPynFWO5158WEqjDYbozS5DEC2obg4D19b5Jr6 p6hGcChBxQ1wz7QL5CGanqOZ0t1v3P1o+ZOIOneuOmhchSWRorPW5yZK+RQJIrzcAMn0 DJaFOZ0HI8CipCNwfgS51A6WlkR7P+WtKh+0yaXyyaPeMNMom0gO/wmX1ns1w+VLNB8T UGxu8IwX5w9VOXVrAEPnCknYUT7PuScbHMpcxeXjQMaNRk8p9OUDYe9xR6KiGjokYkcI zO5g== X-Gm-Message-State: AOAM531oYjsvskGKL3F7qDz0m4oD3ML+uRneZKOnS5eBDDBJogTdB5u2 6+DEPWoF6FlfQVc1W11nHoo= X-Google-Smtp-Source: ABdhPJxYWMg1MZfRhJeYN5uUBu1QegtEZehtCCABl6fPidSMXprTMg1jnpqCwnjSCiprkDJGzgMJQA== X-Received: by 2002:a17:90b:4c92:b0:1c7:a9a3:6274 with SMTP id my18-20020a17090b4c9200b001c7a9a36274mr35551149pjb.148.1649672532937; Mon, 11 Apr 2022 03:22:12 -0700 (PDT) Received: from makvihas.localhost.com ([2405:201:202b:15:4376:c658:ae1e:1781]) by smtp.gmail.com with ESMTPSA id z14-20020a17090a170e00b001cb7e69ee5csm4886318pjd.54.2022.04.11.03.22.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Apr 2022 03:22:12 -0700 (PDT) From: Vihas Makwana To: Larry Finger , Phillip Potter , Greg Kroah-Hartman , Michael Straube Cc: linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Dan Carpenter , Pavel Skripkin , Vihas Makwana Subject: [PATCH v2 5/7] staging: r8188eu: drop unnecessary wrapper _rtw_free_mlme_priv Date: Mon, 11 Apr 2022 15:51:34 +0530 Message-Id: <20220411102136.14937-6-makvihas@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220411102136.14937-1-makvihas@gmail.com> References: <20220411102136.14937-1-makvihas@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" Drop unnecessary wrapper _rtw_free_mlme_priv and move its logic to rtw_free_mlme_priv. Signed-off-by: Vihas Makwana Reviewed-by: Dan Carpenter --- drivers/staging/r8188eu/core/rtw_mlme.c | 17 +++++------------ drivers/staging/r8188eu/include/rtw_mlme.h | 2 -- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_mlme.c b/drivers/staging/r818= 8eu/core/rtw_mlme.c index 6b8c80fe9..5584e1b84 100644 --- a/drivers/staging/r8188eu/core/rtw_mlme.c +++ b/drivers/staging/r8188eu/core/rtw_mlme.c @@ -53,17 +53,6 @@ void rtw_free_mlme_priv_ie_data(struct mlme_priv *pmlmep= riv) rtw_free_mlme_ie_data(&pmlmepriv->p2p_assoc_req_ie, &pmlmepriv->p2p_assoc= _req_ie_len); } =20 -void _rtw_free_mlme_priv(struct mlme_priv *pmlmepriv) -{ - - rtw_free_mlme_priv_ie_data(pmlmepriv); - - if (pmlmepriv) { - vfree(pmlmepriv->free_bss_buf); - } - -} - struct wlan_network *_rtw_alloc_network(struct mlme_priv *pmlmepriv)/* _qu= eue *free_queue) */ { struct wlan_network *pnetwork; @@ -290,7 +279,11 @@ int rtw_init_mlme_priv(struct adapter *padapter)/* str= uct mlme_priv *pmlmepriv) =20 void rtw_free_mlme_priv(struct mlme_priv *pmlmepriv) { - _rtw_free_mlme_priv(pmlmepriv); + rtw_free_mlme_priv_ie_data(pmlmepriv); + + if (pmlmepriv) { + vfree(pmlmepriv->free_bss_buf); + } } =20 static struct wlan_network *rtw_alloc_network(struct mlme_priv *pmlmepriv) diff --git a/drivers/staging/r8188eu/include/rtw_mlme.h b/drivers/staging/r= 8188eu/include/rtw_mlme.h index 1dc1fbf04..fc30793f4 100644 --- a/drivers/staging/r8188eu/include/rtw_mlme.h +++ b/drivers/staging/r8188eu/include/rtw_mlme.h @@ -560,8 +560,6 @@ void rtw_scan_timeout_handler(struct adapter *adapter); =20 void rtw_free_mlme_priv_ie_data(struct mlme_priv *pmlmepriv); =20 -void _rtw_free_mlme_priv(struct mlme_priv *pmlmepriv); - struct wlan_network *_rtw_alloc_network(struct mlme_priv *pmlmepriv); =20 void _rtw_free_network(struct mlme_priv *pmlmepriv, --=20 2.30.2 From nobody Mon May 11 08:30:47 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 B43F0C433F5 for ; Mon, 11 Apr 2022 10:23:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345348AbiDKK0G (ORCPT ); Mon, 11 Apr 2022 06:26:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55434 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345445AbiDKKZa (ORCPT ); Mon, 11 Apr 2022 06:25:30 -0400 Received: from mail-pg1-x52d.google.com (mail-pg1-x52d.google.com [IPv6:2607:f8b0:4864:20::52d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3806C45055 for ; Mon, 11 Apr 2022 03:22:17 -0700 (PDT) Received: by mail-pg1-x52d.google.com with SMTP id t13so13782511pgn.8 for ; Mon, 11 Apr 2022 03:22:17 -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=yl+s+hfKCeq5/g5ZuXagReICrGy9w2ZYqBzEvur9CXQ=; b=Pd5QdnSlOTFKqeIQk/tHI6gVXTXj37xy0Apv8pOeoLHcdd6gsN7A5o88Vtcev4CBVu TYxsrwuOZzC1RZ7j+MgFAJaZ5/lhS9ADQGR6+LKcDJWS7EvA9wi/HM2cj9LiulCS5N22 gRDNA3uWnhpRwrb7OGGmrgaEKwFAlfw3IO6nNgxTKTOOGbjXzEBKAO31Kx5iOqCtOkGv SlcgCIJ361ycbQ9/yAxzpWB0dwrrmOmnvgwiY5044oOIpmLfM88NXH7NdqQ5ZDSOYAED m4RB0qL3w2gSUOaVpMP5ifPYpKm/l7XASbzaXFvM54X6tgAsk1xLoW+p/iyAFp59te+D 3nKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=yl+s+hfKCeq5/g5ZuXagReICrGy9w2ZYqBzEvur9CXQ=; b=IBgvUzlJvFH8vEujpJMnsoPT+/rWJSWitMKHekR/MEA0tuqp3MdY2zOmKV71jfrWkF /X926BxXFbCdfuK82QOM+EuWsKhmKEls9oyq4xEw6pE/N8tJB17u7+IB0UtWq2CnX1Wx cYMVGcWmupMfxivDIPb9i3915/hRWyxzoV4EOJl2lZUNOqmiZC5X41TJjAKADj+szQ9z EROMKq6Xfbp81Vr6u6mCHSUT34PkztxpvnyiP0IjDqn9/eWsjPsVueOCr4TcSH+LDa3q VOPuQLH3NQT15Alhur/jFwnGHNR0p+EOuCOPY7FgcXP39lGbbKqiVY8onu2ZOlvGg5PL aohA== X-Gm-Message-State: AOAM533Jd4XVhS5isUCXIC4StAT6YdeJIHwTIL/+6GJKBDLndTxzlmWg yjd570puMf732g1Pkvk32Iw= X-Google-Smtp-Source: ABdhPJwEjcYvNIrxOhNhNP8a/KJ22xsCXtH+eu4FqsmRTEV4fiFQrge6nR1WP7fU6xiiTJDStESYvg== X-Received: by 2002:aa7:88d4:0:b0:4fd:ad26:c52f with SMTP id k20-20020aa788d4000000b004fdad26c52fmr31668472pff.25.1649672536593; Mon, 11 Apr 2022 03:22:16 -0700 (PDT) Received: from makvihas.localhost.com ([2405:201:202b:15:4376:c658:ae1e:1781]) by smtp.gmail.com with ESMTPSA id z14-20020a17090a170e00b001cb7e69ee5csm4886318pjd.54.2022.04.11.03.22.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Apr 2022 03:22:16 -0700 (PDT) From: Vihas Makwana To: Larry Finger , Phillip Potter , Greg Kroah-Hartman , Michael Straube Cc: linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Dan Carpenter , Pavel Skripkin , Vihas Makwana Subject: [PATCH v2 6/7] staging: r8188eu: drop unnecessary wrapper _rtw_alloc_network Date: Mon, 11 Apr 2022 15:51:35 +0530 Message-Id: <20220411102136.14937-7-makvihas@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220411102136.14937-1-makvihas@gmail.com> References: <20220411102136.14937-1-makvihas@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" Drop unnecessary wrapper _rtw_alloc_network and move its logic to rtw_alloc_network. Signed-off-by: Vihas Makwana Reviewed-by: Dan Carpenter --- drivers/staging/r8188eu/core/rtw_cmd.c | 2 +- drivers/staging/r8188eu/core/rtw_mlme.c | 59 +++++++++------------- drivers/staging/r8188eu/include/rtw_mlme.h | 2 +- 3 files changed, 27 insertions(+), 36 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_cmd.c b/drivers/staging/r8188= eu/core/rtw_cmd.c index 3781706f7..959b69be5 100644 --- a/drivers/staging/r8188eu/core/rtw_cmd.c +++ b/drivers/staging/r8188eu/core/rtw_cmd.c @@ -1457,7 +1457,7 @@ void rtw_createbss_cmd_callback(struct adapter *padap= ter, struct cmd_obj *pcmd) rtw_indicate_connect(padapter); } else { =20 - pwlan =3D _rtw_alloc_network(pmlmepriv); + pwlan =3D rtw_alloc_network(pmlmepriv); spin_lock_bh(&pmlmepriv->scanned_queue.lock); if (!pwlan) { pwlan =3D rtw_get_oldest_wlan_network(&pmlmepriv->scanned_queue); diff --git a/drivers/staging/r8188eu/core/rtw_mlme.c b/drivers/staging/r818= 8eu/core/rtw_mlme.c index 5584e1b84..31a5f252c 100644 --- a/drivers/staging/r8188eu/core/rtw_mlme.c +++ b/drivers/staging/r8188eu/core/rtw_mlme.c @@ -53,38 +53,6 @@ void rtw_free_mlme_priv_ie_data(struct mlme_priv *pmlmep= riv) rtw_free_mlme_ie_data(&pmlmepriv->p2p_assoc_req_ie, &pmlmepriv->p2p_assoc= _req_ie_len); } =20 -struct wlan_network *_rtw_alloc_network(struct mlme_priv *pmlmepriv)/* _qu= eue *free_queue) */ -{ - struct wlan_network *pnetwork; - struct __queue *free_queue =3D &pmlmepriv->free_bss_pool; - struct list_head *plist =3D NULL; - - spin_lock_bh(&free_queue->lock); - - if (list_empty(&free_queue->queue)) { - pnetwork =3D NULL; - goto exit; - } - plist =3D (&free_queue->queue)->next; - - pnetwork =3D container_of(plist, struct wlan_network, list); - - list_del_init(&pnetwork->list); - - pnetwork->network_type =3D 0; - pnetwork->fixed =3D false; - pnetwork->last_scanned =3D jiffies; - pnetwork->aid =3D 0; - pnetwork->join_res =3D 0; - - pmlmepriv->num_of_scanned++; - -exit: - spin_unlock_bh(&free_queue->lock); - - return pnetwork; -} - void _rtw_free_network(struct mlme_priv *pmlmepriv, struct wlan_network *p= network, u8 isfreeall) { u32 curr_time, delta_time; @@ -286,11 +254,34 @@ void rtw_free_mlme_priv(struct mlme_priv *pmlmepriv) } } =20 -static struct wlan_network *rtw_alloc_network(struct mlme_priv *pmlmepriv) +struct wlan_network *rtw_alloc_network(struct mlme_priv *pmlmepriv) { struct wlan_network *pnetwork; + struct __queue *free_queue =3D &pmlmepriv->free_bss_pool; + struct list_head *plist =3D NULL; + + spin_lock_bh(&free_queue->lock); =20 - pnetwork =3D _rtw_alloc_network(pmlmepriv); + if (list_empty(&free_queue->queue)) { + pnetwork =3D NULL; + goto exit; + } + plist =3D (&free_queue->queue)->next; + + pnetwork =3D container_of(plist, struct wlan_network, list); + + list_del_init(&pnetwork->list); + + pnetwork->network_type =3D 0; + pnetwork->fixed =3D false; + pnetwork->last_scanned =3D jiffies; + pnetwork->aid =3D 0; + pnetwork->join_res =3D 0; + + pmlmepriv->num_of_scanned++; + +exit: + spin_unlock_bh(&free_queue->lock); =20 return pnetwork; } diff --git a/drivers/staging/r8188eu/include/rtw_mlme.h b/drivers/staging/r= 8188eu/include/rtw_mlme.h index fc30793f4..95c23bf11 100644 --- a/drivers/staging/r8188eu/include/rtw_mlme.h +++ b/drivers/staging/r8188eu/include/rtw_mlme.h @@ -560,7 +560,7 @@ void rtw_scan_timeout_handler(struct adapter *adapter); =20 void rtw_free_mlme_priv_ie_data(struct mlme_priv *pmlmepriv); =20 - struct wlan_network *_rtw_alloc_network(struct mlme_priv *pmlmepriv); +struct wlan_network *rtw_alloc_network(struct mlme_priv *pmlmepriv); =20 void _rtw_free_network(struct mlme_priv *pmlmepriv, struct wlan_network *pnetwork, u8 isfreeall); --=20 2.30.2 From nobody Mon May 11 08:30:47 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 EEA33C433F5 for ; Mon, 11 Apr 2022 10:23:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345456AbiDKK0J (ORCPT ); Mon, 11 Apr 2022 06:26:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49904 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345442AbiDKKZb (ORCPT ); Mon, 11 Apr 2022 06:25:31 -0400 Received: from mail-pf1-x435.google.com (mail-pf1-x435.google.com [IPv6:2607:f8b0:4864:20::435]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D73E345061 for ; Mon, 11 Apr 2022 03:22:20 -0700 (PDT) Received: by mail-pf1-x435.google.com with SMTP id bo5so14211281pfb.4 for ; Mon, 11 Apr 2022 03:22:20 -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=TVXrBloFtORkonGCujGmdgK1BPi5/BKdnl6pJMRy7hs=; b=Q40Tkt7prSxfeUG0mZFUtG9SRNWCCsWmxBgoXKMlowy/nXoUagFtxhayjTlYcgKWjh ozjjM9ZwuzkhlR+/XhGWKToKJf+deAihW7QXvFDeYp75aNXAPDLS0p8pNiR+l4H+qfgC 1L8/QuPPUlszG1+VO3fnsdkM9xIf2TeSMFSGEhv1UnpzESEMblVaLuDF8CaOUyksMLPj byiXEqP3nA+hME6WWe/jRXCnHbvT1tlNhFB5avC3VkXa7xJxdIsOcVYXgXR012saBEDM 3FU04QUm/8aGwV9czYBGjB2SNKbJC97JnlOjvsmcIK2GiTGVX0P+DnWNCd0q68PH4fWj hofA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=TVXrBloFtORkonGCujGmdgK1BPi5/BKdnl6pJMRy7hs=; b=K6/OjqpH1dgn3t6RLYjtoks8RPFuPDEQtfB1thKIIZM13Sp+FVWeCyFsHzao82n0QK JxfPxQZI9k8y02yOUri4JPAkDdRWsSyxw4hlovRhfzdG9TwV0W+4bp4TpBfT6arf7NVh 3GQ26WdiPGwhEd4hvBfsWpwWwqCVeYNQuk6GzzCc2WEjkn88asJee0ZgU7V3Yww3Ay0F +D9uxGYee5xId9s9W4Rnmzdl6S4kj9bQZ0LUD/yP85TVKzcuWxZITW1WiVQDp/CHCwjC v3r5VOR++lyfoZD9zmYYwpqNswt8TCYe29dH1HWqta/YufiDjN+F8daGi6urnItS6Fpw faFw== X-Gm-Message-State: AOAM533o1AjpE0/79YaFQjy0RNipmFU3itSdlCaba7Fn8vYtNOhfdg6r f4+sOJ/s7BqBm6yqHH63fjA= X-Google-Smtp-Source: ABdhPJyi/0jnHlVtNF5gztu7grts6sCy3pvGJMA1LOCs5u3Uq2KPFjULHgxllvbbDe9Mxa8xuqXUQw== X-Received: by 2002:a05:6a00:1701:b0:505:c49b:d2eb with SMTP id h1-20020a056a00170100b00505c49bd2ebmr3991648pfc.12.1649672540250; Mon, 11 Apr 2022 03:22:20 -0700 (PDT) Received: from makvihas.localhost.com ([2405:201:202b:15:4376:c658:ae1e:1781]) by smtp.gmail.com with ESMTPSA id z14-20020a17090a170e00b001cb7e69ee5csm4886318pjd.54.2022.04.11.03.22.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Apr 2022 03:22:19 -0700 (PDT) From: Vihas Makwana To: Larry Finger , Phillip Potter , Greg Kroah-Hartman , Michael Straube Cc: linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Dan Carpenter , Pavel Skripkin , Vihas Makwana Subject: [PATCH v2 7/7] staging: r8188eu: drop unnecessary wrapper _rtw_dequeue_cmd Date: Mon, 11 Apr 2022 15:51:36 +0530 Message-Id: <20220411102136.14937-8-makvihas@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220411102136.14937-1-makvihas@gmail.com> References: <20220411102136.14937-1-makvihas@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" Drop unnecessary wrapper _rtw_dequeue_cmd and move its logic to rtw_dequeue_cmd. Signed-off-by: Vihas Makwana Reviewed-by: Dan Carpenter --- drivers/staging/r8188eu/core/rtw_cmd.c | 34 ++++++++++---------------- 1 file changed, 13 insertions(+), 21 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_cmd.c b/drivers/staging/r8188= eu/core/rtw_cmd.c index 959b69be5..06523d919 100644 --- a/drivers/staging/r8188eu/core/rtw_cmd.c +++ b/drivers/staging/r8188eu/core/rtw_cmd.c @@ -56,24 +56,6 @@ static int _rtw_enqueue_cmd(struct __queue *queue, struc= t cmd_obj *obj) return _SUCCESS; } =20 -static struct cmd_obj *_rtw_dequeue_cmd(struct __queue *queue) -{ - struct cmd_obj *obj; - unsigned long flags; - - spin_lock_irqsave(&queue->lock, flags); - if (list_empty(&queue->queue)) { - obj =3D NULL; - } else { - obj =3D container_of((&queue->queue)->next, struct cmd_obj, list); - list_del_init(&obj->list); - } - - spin_unlock_irqrestore(&queue->lock, flags); - - return obj; -} - u32 rtw_init_cmd_priv(struct cmd_priv *pcmdpriv) { u32 res =3D _SUCCESS; @@ -180,11 +162,21 @@ u32 rtw_enqueue_cmd(struct cmd_priv *pcmdpriv, struct= cmd_obj *cmd_obj) =20 struct cmd_obj *rtw_dequeue_cmd(struct cmd_priv *pcmdpriv) { - struct cmd_obj *cmd_obj; + struct cmd_obj *obj; + struct __queue *queue =3D &pcmdpriv->cmd_queue; + unsigned long flags; + + spin_lock_irqsave(&queue->lock, flags); + if (list_empty(&queue->queue)) { + obj =3D NULL; + } else { + obj =3D container_of((&queue->queue)->next, struct cmd_obj, list); + list_del_init(&obj->list); + } =20 - cmd_obj =3D _rtw_dequeue_cmd(&pcmdpriv->cmd_queue); + spin_unlock_irqrestore(&queue->lock, flags); =20 - return cmd_obj; + return obj; } =20 void rtw_free_cmd_obj(struct cmd_obj *pcmd) --=20 2.30.2