From nobody Sun May 10 21:18:02 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 52335C433EF for ; Fri, 22 Apr 2022 19:55:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229704AbiDVT6d (ORCPT ); Fri, 22 Apr 2022 15:58:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50470 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229437AbiDVT6b (ORCPT ); Fri, 22 Apr 2022 15:58:31 -0400 Received: from mail-vk1-xa34.google.com (mail-vk1-xa34.google.com [IPv6:2607:f8b0:4864:20::a34]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EB78C20250B for ; Fri, 22 Apr 2022 12:42:13 -0700 (PDT) Received: by mail-vk1-xa34.google.com with SMTP id bi49so4308146vkb.10 for ; Fri, 22 Apr 2022 12:42: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=QZuIM4H3I0u7C5gWHQSYMoqDFBwcnj1tL4ssQv+FDjg=; b=C5zEIjuqLhF0O8OKX9K3xRWoxxaX+MOE9Ljz8iGorUw8xRiMnnoQ+N6zMUdHp+R4bz XUqG7zUmnB7keraNYNpA+u8FegVcu89NqRIVShyydZvHVFAJL3TzjPV+cIi0MtsfqtJm xCDtdDYK1ixaLhJrwfGmKs1LiHox8dQvj9mcsFEm4mYSk2efgLph5d517g9hn2ubTCcZ ahGV56nMA5IObW2QiQ6UuEdOmzxrHOaWbYn/bxMcw85fHfiNOBIq6Ze/C316rNCSqGZ1 NxRkvaCrN/IvWXZOTV4bCaty8D0D+Ldsl+2ubaMG3D8dZDXuzEEY3sDXecPilgMXMUxL 3r7A== 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=QZuIM4H3I0u7C5gWHQSYMoqDFBwcnj1tL4ssQv+FDjg=; b=FiWxfQvP5BYjDFtdUKfzQoaVbpLo/tV/2iLyyt3MOAW8JraTruaymp8g+T9u3qsITB heuswiBa+GACjoboOeky7YJq9oAF+kO62cu5WchXRqlsjnnlUHOCuwT/XeBXgM2Yxs5m JglRKVpQerNhdSbQ4jrg+KhINworK4gBsC84AkgRNj/YrpFHSVH9OWaVMAcrZFCR0iOd XYzLYjuGF84ISFCjxuVkhiqAWi2KGKvZ50NbF7XfUarApMxJeQ1eUye0GQeFCZXh2+3z U0x0x85tusnRfDmTCdegYuhvuid6RAnqRLdUYCE9i8fSGyA9Dq3T+KS/fxmfgriyQSbe WFig== X-Gm-Message-State: AOAM532HDY2RKrVTd3SygJ2fRyB9Jr5OfOdxu+51A6nc3ZQSZPMiIbxe 5UG+KlHroeWLsPvh1YWU8dud5APz0CdjfA== X-Google-Smtp-Source: ABdhPJylTXse+Ff0tFYd/5CXjfUZ59tlKiBuN9JUvi6oAr0HbyHIegGeg/CVnJp4qYUocR2Z79wWaw== X-Received: by 2002:a17:902:b7ca:b0:15c:df6a:be86 with SMTP id v10-20020a170902b7ca00b0015cdf6abe86mr1095811plz.70.1650655957313; Fri, 22 Apr 2022 12:32:37 -0700 (PDT) Received: from makvihas.localhost.com ([2405:201:202b:15:bfe0:e8c0:bea6:ee63]) by smtp.gmail.com with ESMTPSA id z5-20020a056a00240500b004e15d39f15fsm3518932pfh.83.2022.04.22.12.32.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Apr 2022 12:32:37 -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 v3 1/7] staging: r8188eu: drop unnecessary wrapper _rtw_free_cmd_priv Date: Sat, 23 Apr 2022 01:02:17 +0530 Message-Id: <20220422193223.11948-2-makvihas@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220422193223.11948-1-makvihas@gmail.com> References: <20220422193223.11948-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. Reviewed-by: Dan Carpenter Signed-off-by: Vihas Makwana --- 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 ebe2479d1..32589e76e 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 Sun May 10 21:18:02 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 B9D4DC433EF for ; Fri, 22 Apr 2022 21:58:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230270AbiDVWBG (ORCPT ); Fri, 22 Apr 2022 18:01:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46208 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230494AbiDVWAu (ORCPT ); Fri, 22 Apr 2022 18:00:50 -0400 Received: from mail-il1-x135.google.com (mail-il1-x135.google.com [IPv6:2607:f8b0:4864:20::135]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6D01F40F78B for ; Fri, 22 Apr 2022 13:43:59 -0700 (PDT) Received: by mail-il1-x135.google.com with SMTP id f5so5762620ilj.13 for ; Fri, 22 Apr 2022 13:43: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=MEpHLec1VfOXZ957xfGm8Ejr+pJnneWUL+vw0yvfhv4=; b=Y21IM1rnk46dBDp5zwaK/T1TXHMTuGORzT5eW8AYSStysCesIgFjYOHUFUS15e5bWT OLlD0gyAbpiz3KkteHv1Nqwc8wpCCdvufOl4o/J+QKzULC0QgvH1e5eQBYT1LUnNJah7 thkLfoYy48I+ubx7Bx8rYchaUA1fXXvWxObBe+lyquCKt9butEJZM7mj9YSLjaPBBK3U xWCvbV4wpd1gNa1Mo6SVgRePSZjUVQ4r3jhUqxKO/hO9oSq7Qv/UOc3/MbLx8+qiQhww 2iWMgYvLS1emJhluirYzm6HwZKBJU9uKVhxf0+uCrs7OCVKMI+g6Jfjk/kgQggOrILNp bTJA== 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=MEpHLec1VfOXZ957xfGm8Ejr+pJnneWUL+vw0yvfhv4=; b=It2mX8SVW11lDIBHlTqPx4hKDNmjqnbFVjVIOCygFLbyTnjpuLAsEuCKo6qb7inTQR ndHrjf0fm6CovSzHCEHsjpDQTYXrhLUY8Yewjkjn5+mYDN3f379/xFSDkO/aGd6tpIRt oJdyd8qRFShgskRf9qNfIf1D4v7n4Kds4dUsNfB9HpxD88SHVmHWBrjOs7YLlzn73N2L p+Lfr4KSkhUjjS642oS83T0lbhbknrVmRvAojz9YAmAGjsumwoZSZ4HSRKl2Me+C1bxZ D9DAD0b5m5kSQbiW2oLaNS/eU4JuOP0rjnZAZtDjw2Atl+tg4JP/9xvyGelusOo+S8xD yxOQ== X-Gm-Message-State: AOAM533RMaMdEfekbVBmL5T1pwn2nDlIieu3Qxe0jHh4F8oe2K8YB5gP WYs4/R0ZqrQ2N3Y5aOpTcF3TVRK5NejD8w== X-Google-Smtp-Source: ABdhPJyq6Pev+frdReFdEQoGFh0hjvvnByHxD+Yshmj8pigE+7KWpHfHfR2682kvF4p8GYrGMZxPzw== X-Received: by 2002:a63:6ac5:0:b0:3aa:f01e:3280 with SMTP id f188-20020a636ac5000000b003aaf01e3280mr416174pgc.207.1650655960827; Fri, 22 Apr 2022 12:32:40 -0700 (PDT) Received: from makvihas.localhost.com ([2405:201:202b:15:bfe0:e8c0:bea6:ee63]) by smtp.gmail.com with ESMTPSA id z5-20020a056a00240500b004e15d39f15fsm3518932pfh.83.2022.04.22.12.32.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Apr 2022 12:32:40 -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 v3 2/7] staging: r8188eu: drop unnecessary wrapper _rtw_init_cmd_priv Date: Sat, 23 Apr 2022 01:02:18 +0530 Message-Id: <20220422193223.11948-3-makvihas@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220422193223.11948-1-makvihas@gmail.com> References: <20220422193223.11948-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. Reviewed-by: Dan Carpenter Signed-off-by: Vihas Makwana --- 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 32589e76e..fc955fce2 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 Sun May 10 21:18:02 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 28D0BC433EF for ; Fri, 22 Apr 2022 22:11:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232367AbiDVWOE (ORCPT ); Fri, 22 Apr 2022 18:14:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56094 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232317AbiDVWMA (ORCPT ); Fri, 22 Apr 2022 18:12:00 -0400 Received: from mail-il1-x136.google.com (mail-il1-x136.google.com [IPv6:2607:f8b0:4864:20::136]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B8A4F18C287 for ; Fri, 22 Apr 2022 13:58:47 -0700 (PDT) Received: by mail-il1-x136.google.com with SMTP id d3so5775207ilr.10 for ; Fri, 22 Apr 2022 13:58:47 -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=BUpSqOzVYiFBHHL5wyZniliWxqmPr3GRK8w6NgSpN5Y=; b=XcmVK7JwNu54yeoZvUVgRE4ycDDruCjbj+O5/cIqn5LV67XjhrDem/poh9j9WGzYTq LnUDaJvHfOKnKPlTahgjH/qcg22qtd5Ff1o4h3AgL+7IUtNgRfd71+gL6T35uZxuSGE/ 0cl58yjKwbyagr1pWsEYjmcGKECgKksbTZEzCqO1gUMr8ksXXPPnbQNTSIM3eRUCdtfN /Qb8DAB56KwthFkmyNNza4ZsncLT3Xlal8f6W70u74xt5+hlKR3zpY9dT+FBJOi9/3Oc QvMOpyk26Nc9Q+j17urh7MTZvzuJAbyRiftOILa9thZn7wEV4+ua/tcuTjW+BZYloL5v mKgw== 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=BUpSqOzVYiFBHHL5wyZniliWxqmPr3GRK8w6NgSpN5Y=; b=2b+ksWnklLhZgwBpN4k4GfPyXC8zhWjULHH9t0atDbY5civ2swMzb4LoCDsAZk//dM cZoZvu7mLolIbjEXxdI16a9kC4KkExb/PfhWEa1p+4ImnPN9ZToq+u+Cl7bVKj1SYE5k 49hP0Je3eFkWEuE4p4ewCUEs8K0AN2ZjOoxybZ8uX/euJlfR4IzCJhISEmV0/qhta0PP QnIbPJzO4DcV1R3JpS/5cdRGVgpq0ZhQ33mtG5Bb5lg2M8I2CTDP5mAy+kWUgPXbFsfh eJX7+jHd+H/Ub6qfNM5jo4wi4Cf5jcJzE6Cocw0P48742ynamxoglT2TEgTJMSYJp2YU lObA== X-Gm-Message-State: AOAM533Nx7pkXGKxtMJTvuVjO7Z8Dt9g/REJpOpT4dhpKuV9SQtaTsFR VFjMEPf08/V4mguctr4/yUvIjXTaw4M0Tw== X-Google-Smtp-Source: ABdhPJzUh4luMNplztXSuP6L7uMw2SWA7GRGbpG/TNQKBppwZ6TtQARW2I6z2+myuIpakDIbUiI0Xw== X-Received: by 2002:a63:2c4c:0:b0:398:997d:b5b8 with SMTP id s73-20020a632c4c000000b00398997db5b8mr5303391pgs.86.1650655964090; Fri, 22 Apr 2022 12:32:44 -0700 (PDT) Received: from makvihas.localhost.com ([2405:201:202b:15:bfe0:e8c0:bea6:ee63]) by smtp.gmail.com with ESMTPSA id z5-20020a056a00240500b004e15d39f15fsm3518932pfh.83.2022.04.22.12.32.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Apr 2022 12:32:43 -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 v3 3/7] staging: r8188eu: drop unnecessary wrapper _rtw_init_evt_priv Date: Sat, 23 Apr 2022 01:02:19 +0530 Message-Id: <20220422193223.11948-4-makvihas@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220422193223.11948-1-makvihas@gmail.com> References: <20220422193223.11948-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. Reviewed-by: Dan Carpenter Signed-off-by: Vihas Makwana --- 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 fc955fce2..512896b86 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 Sun May 10 21:18:02 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 158F2C433F5 for ; Fri, 22 Apr 2022 21:36:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230131AbiDVVjl (ORCPT ); Fri, 22 Apr 2022 17:39:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43676 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230125AbiDVVjh (ORCPT ); Fri, 22 Apr 2022 17:39:37 -0400 Received: from mail-il1-x12a.google.com (mail-il1-x12a.google.com [IPv6:2607:f8b0:4864:20::12a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B28042D358B for ; Fri, 22 Apr 2022 13:46:01 -0700 (PDT) Received: by mail-il1-x12a.google.com with SMTP id r11so5789216ila.1 for ; Fri, 22 Apr 2022 13:46:01 -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=WZMlpwmjON05raKFGDQgTKXed4pbMzjEU/f7GpRcKxk=; b=mMjUvoeU7khCqxILg6UhdkcGTrULEYt3h6NEoR3C9tZq15DQ+u2wQJbEae0E2/OnSq nXZ4Y9Sh1wtbGvU4BOWFS/FHjZiyDMDcZWFHB72m+HQPTSBmxB+kWeYyx+DQ8EvP6Udq REbku2UZ9VRL294uVCkmhHlD9BNzPE3x7rTRuyx78NBtj3RWIqrvyH5S+3LHhz64Iam0 iqk1M9yqg+cYzFsZIOQ6o3AWIwXJPXxRulGmYgzWR+EHW4C1MYPF3x1JAWjDrZx7sbKm R5UhQc6J6Xf0It0KsW3U7vwGl5KHmRUUSmGR6Pb29Vu5j54tgLX4MTvVvWtTxAOr4ztk a7FQ== 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=WZMlpwmjON05raKFGDQgTKXed4pbMzjEU/f7GpRcKxk=; b=TIUpWKwsRWgD3PpOrkeITc6gCw+HYc6YTiL58mVUZ5CFnHDUYx9Wv5NcWScQWW7EYU mx0ajHcpx7CAF6n4IrYUbpUmMGkgiBgbMIDd53TOLprLIJ73upB4BNv5oO17NMuGOpSR MJ5gaWeGUc+wN3K97U77t4z1Fo9+RYe9MA1pYTQPmi42jx/xkJHoQVuUChPI3HPTwTLK 0FREGwytMqtuCZMl2mj+Hv+OBwX5eSvKsS6s6shmxyD8GZi7gofS18Zu+o6dEdEkYCIr ZCTxDUBdheWerSJMZn5mj7CkvuMJ/jKDfPXt9Q0yGIwdY0YUNOywd/O7t4fSPG4Z4wcc TSug== X-Gm-Message-State: AOAM5330uJ/DFyA5mNeUISQ9SASRItRJyXVwkR7pVpFMj7WpXLG6eEa2 VpnjdSEZLDDrUGt9+RNrAtAO9HwmE5dpow== X-Google-Smtp-Source: ABdhPJwf1R9PUV4mgIvU1nqQLy0/9uBmokjqz+5KcU+gSfYHapHv5UiGBPk1nizg2H8mRtBEfoDOlA== X-Received: by 2002:a63:591c:0:b0:3aa:506c:b50b with SMTP id n28-20020a63591c000000b003aa506cb50bmr5219423pgb.77.1650655967838; Fri, 22 Apr 2022 12:32:47 -0700 (PDT) Received: from makvihas.localhost.com ([2405:201:202b:15:bfe0:e8c0:bea6:ee63]) by smtp.gmail.com with ESMTPSA id z5-20020a056a00240500b004e15d39f15fsm3518932pfh.83.2022.04.22.12.32.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Apr 2022 12:32:47 -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 v3 4/7] staging: r8188eu: drop unnecessary wrapper _rtw_init_mlme_priv Date: Sat, 23 Apr 2022 01:02:20 +0530 Message-Id: <20220422193223.11948-5-makvihas@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220422193223.11948-1-makvihas@gmail.com> References: <20220422193223.11948-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. Reviewed-by: Dan Carpenter Signed-off-by: Vihas Makwana --- 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 081c02417..50a65a4e2 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); @@ -289,9 +235,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 Sun May 10 21:18:02 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 DACE6C433EF for ; Fri, 22 Apr 2022 21:36:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230118AbiDVVjd (ORCPT ); Fri, 22 Apr 2022 17:39:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43426 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230098AbiDVVjc (ORCPT ); Fri, 22 Apr 2022 17:39:32 -0400 Received: from mail-pg1-x52b.google.com (mail-pg1-x52b.google.com [IPv6:2607:f8b0:4864:20::52b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 14D054169E6 for ; Fri, 22 Apr 2022 13:45:59 -0700 (PDT) Received: by mail-pg1-x52b.google.com with SMTP id k14so8279970pga.0 for ; Fri, 22 Apr 2022 13:45: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=7IQD1XVsVgNtpnSIJlyB1Igy1Zt/tIoNBydvA5N9QY8=; b=lMzILyzVY4s6HqsqcMbieRZUuzRhTfhOR3I/bs3u5XTfI/8c0Q8csI4tw+7aSR7FzJ lZhHjenfud/GLz8MrvPhRok6un812iDrEpnDXIce7PSTQcfKM42NahuNIBku3irxgGlg Hg/x7ZvBxQ51J9+vnDV5d3QrkFrWDo0liJh1zQU3Vr39aVF6R2+KylmIF46tvPc20lEP aLnEykbAWUoE4X1f15OOk4c6l67AOSi3PXp0Z+4g6QXXEeSCFhZh4mTcTDUzB8X4hgWr BbqhFW3WwnAPLzKmTZHmDPu3QQvaHfYT3z+DxUBp4jT8SabsJ0r9b2pID7g+W5c4yY1Q Q2Gg== 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=7IQD1XVsVgNtpnSIJlyB1Igy1Zt/tIoNBydvA5N9QY8=; b=NWmTJtECvZUAfY5gaJLJ8QXBdpi1QbF+pWPiskBTKNABc/wOQh6X6YvmB2adyoKPSi 3Ge+rWjes7/uiUASsra+5L7BnKMxM1JW/IvIufG72LYjTt7+Eay0z55MDl5/W2Ebgsx4 WJB4IlDPwwjnRdvEB9zD9K6fS/vG/5/O3Pw1/jkhOqKPsbltVqNsgLmetWfnih0HFuEt vYdTpwSKQM0UcJbeKowiNqnwPjTEW1No5b29ZpEghHaXmuEjppC6INSAriUTlvpEv8t0 Ze3sqP2YoRMk1jtoyuOoTqaa86eVlL+IO/29JiXQDHNRHTfbsI3VhVANwFv/ekJ6GmKH hYxQ== X-Gm-Message-State: AOAM531MeDt4G0XSdsPjAn+/egjb5OA6XVBXkxV0GbCmKDvovo3k4lnD B3baRK7jdHrbXKd+JCdl3aoj9I+ft1Kt4A== X-Google-Smtp-Source: ABdhPJwck26beUm/r/6Y9AyQaLFefvEwf0yPOn/B0kTV9OwEcXXwd2UxbZV63DbOsNL6PH9M1hnwbw== X-Received: by 2002:a17:902:b106:b0:159:5c6:cb53 with SMTP id q6-20020a170902b10600b0015905c6cb53mr6148972plr.99.1650655971280; Fri, 22 Apr 2022 12:32:51 -0700 (PDT) Received: from makvihas.localhost.com ([2405:201:202b:15:bfe0:e8c0:bea6:ee63]) by smtp.gmail.com with ESMTPSA id z5-20020a056a00240500b004e15d39f15fsm3518932pfh.83.2022.04.22.12.32.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Apr 2022 12:32:50 -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 v3 5/7] staging: r8188eu: drop unnecessary wrapper _rtw_free_mlme_priv Date: Sat, 23 Apr 2022 01:02:21 +0530 Message-Id: <20220422193223.11948-6-makvihas@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220422193223.11948-1-makvihas@gmail.com> References: <20220422193223.11948-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. Reviewed-by: Dan Carpenter Signed-off-by: Vihas Makwana --- drivers/staging/r8188eu/core/rtw_mlme.c | 15 ++++----------- drivers/staging/r8188eu/include/rtw_mlme.h | 2 -- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_mlme.c b/drivers/staging/r818= 8eu/core/rtw_mlme.c index 50a65a4e2..fb64954a0 100644 --- a/drivers/staging/r8188eu/core/rtw_mlme.c +++ b/drivers/staging/r8188eu/core/rtw_mlme.c @@ -53,16 +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; @@ -289,7 +279,10 @@ 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 Sun May 10 21:18:02 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 09755C433F5 for ; Fri, 22 Apr 2022 19:58:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229847AbiDVUBi (ORCPT ); Fri, 22 Apr 2022 16:01:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37050 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229437AbiDVUBg (ORCPT ); Fri, 22 Apr 2022 16:01:36 -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 A655730FDC3 for ; Fri, 22 Apr 2022 12:47:10 -0700 (PDT) Received: by mail-pf1-x42e.google.com with SMTP id c1so2367378pfo.0 for ; Fri, 22 Apr 2022 12:47:10 -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=y+doHSiz3zcutbur9voJocSmaAz48vDvOlIUUyf7FWM=; b=a89x4nKawOtJHTWqZbbFoLA02HiA2GzJbSC41mQ0wwzZCECYB6TfQJyr2/Df//ex6j XmT7P5B7iv2ke14uKxII/CpVdU/jGI3+z1MIfk01HgLY9e7jNF9Ef2GADrch0NvHa2Y3 e0KdE6OauULyRg0pbergxbJPNWhKph4DwTXjsVF841dpy6vNTRdBbFB4kG6CDGiBe/En Qb0hJIxgcUjt+X3s6hrUD5N9ZqrYgaixHHLzZl+0DDb3SAg7tffEOtAZ3BhMwk+Jk8Q8 uA7WNM97/AFXWvlT4MeMpnEo8UMFQt1R3aNEVDwn5c6WaCgsPEVAFR101CSOBwwYA7K6 c4kA== 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=y+doHSiz3zcutbur9voJocSmaAz48vDvOlIUUyf7FWM=; b=xKGR+wbhJcystiwDLF8Rk3/XSDsdr8jiu1tXel9+Re4YpVmnMaYHN/qLPao4VQf4nh ZugRyFVGQxwJIvjrkg2Mf+joD3iWAzJvMJBovF9LC2l6aADO97uE7fDYP69VxdpxiRx2 8SOFflEbLFK/YQ9A0H3jRymQr2ajaN/3lLClFxHhhqEmt2UI2649i987AFx6d7KZ4rDK Y3i+3cBFdcnZTmNdBSB20/gWt6CCijNIwIy4bahfr5fle5i6BhUDROeRGswlbkD8BrXf ohS/sgB1POa5TuUbJ6Yow9kkMktsRJ9zKbWGFluZcd5FenF/U+a3aI62yLlJPuabiasx wDXw== X-Gm-Message-State: AOAM531GYmqRkKsOKWQIW70ZwTPfJTdLnKfF3qKT8UBc8Gpr733VdFhK 3LTE5COrNtD6n7B9I9a7PIQr+QFy1FBU4A== X-Google-Smtp-Source: ABdhPJxEUUev7ihPovjIZboLjGNyvTtHcPOY4eAutzFYv8bD3wyzHsFImEWTBe+Xfe0zGML0moa32Q== X-Received: by 2002:a62:a504:0:b0:50a:ceee:5f4 with SMTP id v4-20020a62a504000000b0050aceee05f4mr6608640pfm.13.1650655974887; Fri, 22 Apr 2022 12:32:54 -0700 (PDT) Received: from makvihas.localhost.com ([2405:201:202b:15:bfe0:e8c0:bea6:ee63]) by smtp.gmail.com with ESMTPSA id z5-20020a056a00240500b004e15d39f15fsm3518932pfh.83.2022.04.22.12.32.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Apr 2022 12:32:54 -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 v3 6/7] staging: r8188eu: drop unnecessary wrapper _rtw_alloc_network Date: Sat, 23 Apr 2022 01:02:22 +0530 Message-Id: <20220422193223.11948-7-makvihas@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220422193223.11948-1-makvihas@gmail.com> References: <20220422193223.11948-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. Reviewed-by: Dan Carpenter Signed-off-by: Vihas Makwana --- 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 512896b86..ab462eb40 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 fb64954a0..080e07385 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; @@ -285,11 +253,34 @@ void rtw_free_mlme_priv(struct mlme_priv *pmlmepriv) vfree(pmlmepriv->free_bss_buf); } =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..e982f0615 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 Sun May 10 21:18:02 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 DAB1DC433F5 for ; Fri, 22 Apr 2022 21:14:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229823AbiDVVRr (ORCPT ); Fri, 22 Apr 2022 17:17:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39256 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229776AbiDVVRc (ORCPT ); Fri, 22 Apr 2022 17:17:32 -0400 Received: from mail-pl1-x632.google.com (mail-pl1-x632.google.com [IPv6:2607:f8b0:4864:20::632]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2799623955B for ; Fri, 22 Apr 2022 13:13:03 -0700 (PDT) Received: by mail-pl1-x632.google.com with SMTP id u15so9774634ple.4 for ; Fri, 22 Apr 2022 13:13:03 -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=IoveYgPzkVQxQlEHYjiT25fHGi8jPmqGfk3V2Lj3tG0=; b=p0+mBZk4Xc8pDoDk7SDXGalwSRX0py90m6dqVle4PP72Tn684vhS4UbdpKP/r96uic QggE8UqQZ9YOhfUPTqUM6wurtooEqpVGGKOYdIYTTBFda7K1kCjkhPPRlTSwJEI7/bQx RF8co3a7PaaO39iScZ0+oV7TUYl6pz+xzKjT+4QZHmO1jDscbZe6kzeD0fARclZ+NwH/ bKagFH67K0/tJHT5i1YovY93R9hD/rOmbK+w3MhphPxW+8uIviqRF+DZnDi0iYH8DJnc ABPx4/Pzv1/pvnwxCI29X+reSydFwhJtAXkp71IPj9v8G6yylW7NDFQD8PClhukWhS/L jOVQ== 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=IoveYgPzkVQxQlEHYjiT25fHGi8jPmqGfk3V2Lj3tG0=; b=lGDPHJxm0+g9UyvBcK/nyiXrDsB7c7I6zLlRe7D3yZbzgJW00Mg1cy5M9WSR2u3pyP grlwbDdI3oFqZzG3R0wNRML15dvW2XoyL9TstEqD+M9MwrDKnfmlmfm2zFw0tUlLhFtl ZpsL4DoyaLEOlXqv/fLukMrIu01vdNddlVDSxEnkmR/VKxVnRlDBQNOtB/FysyUHgI7Z R/UcMAgmPtXEvqLpTIm3EsLp181aIOAunz011uxLoTa+nr4qWu2fhoa9ny4wk4uZq+SD EOoNRocpyEnPlLXpMba4jZuk6kIZKtGocCR7zeq94S4aUJhvDc0hvSRZcO5a7wsm+VFl HOnA== X-Gm-Message-State: AOAM5313ja7VxEqpcVp+eeCT33vHDjjkDiVtL9q6sZQ9PjtcJAvWC4yJ 0WJZTRgCkjxpBmwAlVP2FgmbYBtINk8VaQ== X-Google-Smtp-Source: ABdhPJxLh3K98aNfOR6TCroIxTuAyj+Djkxy+F5QWbVMM7iEsJq/MJRfBO/lMAOzuPWZcmyKGXrAzQ== X-Received: by 2002:a17:902:b692:b0:14c:935b:2b03 with SMTP id c18-20020a170902b69200b0014c935b2b03mr6057316pls.81.1650655978393; Fri, 22 Apr 2022 12:32:58 -0700 (PDT) Received: from makvihas.localhost.com ([2405:201:202b:15:bfe0:e8c0:bea6:ee63]) by smtp.gmail.com with ESMTPSA id z5-20020a056a00240500b004e15d39f15fsm3518932pfh.83.2022.04.22.12.32.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Apr 2022 12:32: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 v3 7/7] staging: r8188eu: drop unnecessary wrapper _rtw_dequeue_cmd Date: Sat, 23 Apr 2022 01:02:23 +0530 Message-Id: <20220422193223.11948-8-makvihas@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220422193223.11948-1-makvihas@gmail.com> References: <20220422193223.11948-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. Reviewed-by: Dan Carpenter Signed-off-by: Vihas Makwana --- 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 ab462eb40..06881a871 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