From nobody Mon May 11 08:30:44 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 ADF6BC433EF for ; Sun, 10 Apr 2022 16:32:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243599AbiDJQeI (ORCPT ); Sun, 10 Apr 2022 12:34:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45674 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239348AbiDJQeG (ORCPT ); Sun, 10 Apr 2022 12:34:06 -0400 Received: from mail-pl1-x62a.google.com (mail-pl1-x62a.google.com [IPv6:2607:f8b0:4864:20::62a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 37AA711142 for ; Sun, 10 Apr 2022 09:31:53 -0700 (PDT) Received: by mail-pl1-x62a.google.com with SMTP id 12so136390pll.12 for ; Sun, 10 Apr 2022 09:31:53 -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=yu+DOzbMStngixhP79yoddJQGuRy4inbocK2zOrcGto=; b=pCBhWJqmkG0mgoQPc+uUcPxA8D+8AD22e3F3/BZ25oBw6cCRjlJk7ImQxzrRG5L1px +qlffMHhPNyftxtKIRaokWzKVYSSCWsB2cThwTDKaIV4xx+6RoZygWbogU6DLrUfRcJG 54uQWXnhFcoAB1Fj8VBRGN99O4qv1Tbl6K7rvxiIsn8E7kUK/MSpmBY5bgp1xZU7IsVd zu3ZhOAhaBKdlos3Fh1Hi41ftSfH0S2PS84uISdkZJ+taXlQ3udZ6WHQV6ZslZVk9Zqh NBtwMb1pzJae+DUoT2HtZK61UHz2kSmF+gA5WNK4XyHfo8tOIJqIwqBIfkGmojkJnseH J22w== 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=yu+DOzbMStngixhP79yoddJQGuRy4inbocK2zOrcGto=; b=BTd6nF9s1Jzp9CS3Jedgd+7U6D9ZRDwVK4q/zUjT7IycAI0Cb/6dbQer2sczfkkPm6 34b7uBM0MB3bUa9uFA6GpVVAsoU2rubXw1F3j9d/Fm91UTOSEzq6KHYyRuR4MWkqkX9c rQqzF22ejDR8LH7sckavv3mrlaVEhOaCouQFxKl5C2vHJNpWIGdlFQHOP2fxoLyqsYha pJStrRep7kW2i5XtMJ0QA026YJls+vej1KUkcc8YqklA6Gd5nQCBGX6/DT/G+Nklj8Yu DDGexdstZxwcw6vLc6h2qISA9oqnjXhkieaFK+499vLMHRvnpWwe2TnFQrnn3EklkbXC KpEg== X-Gm-Message-State: AOAM5302W+0r0z2u0ge02jsFd9TK8s3ITkR4wiHMOjU+VmB57JXlfink HPExumm3KpJHuPfjVxDJkmo= X-Google-Smtp-Source: ABdhPJy2YFIzY4kdYR8dLnADsAt5RhTaoQDlRcF3K0qZQBq0LdjOi6dvjWhh2kjDU4gUSuB0uDDENQ== X-Received: by 2002:a17:90a:5d0b:b0:1cb:42a7:8af5 with SMTP id s11-20020a17090a5d0b00b001cb42a78af5mr13831325pji.170.1649608312624; Sun, 10 Apr 2022 09:31:52 -0700 (PDT) Received: from makvihas.localhost.com ([2405:201:202b:15:606b:10e4:2085:6825]) by smtp.gmail.com with ESMTPSA id f12-20020a056a001acc00b004fb37ecc6b2sm31940021pfv.29.2022.04.10.09.31.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 10 Apr 2022 09:31:52 -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 1/6] staging: r8188eu: drop unnecessary wrapper rtw_free_cmd_priv Date: Sun, 10 Apr 2022 22:01:12 +0530 Message-Id: <20220410163117.3964-2-makvihas@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220410163117.3964-1-makvihas@gmail.com> References: <20220410163117.3964-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" Remove the unnecessary wrapper. The logic of rtw_free_cmd_priv can be moved to _rtw_free_cmd_priv. Signed-off-by: Vihas Makwana --- drivers/staging/r8188eu/core/rtw_cmd.c | 7 +------ drivers/staging/r8188eu/include/rtw_cmd.h | 2 +- drivers/staging/r8188eu/os_dep/os_intfs.c | 4 ++-- 3 files 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..4d88bc847 100644 --- a/drivers/staging/r8188eu/core/rtw_cmd.c +++ b/drivers/staging/r8188eu/core/rtw_cmd.c @@ -87,7 +87,7 @@ void rtw_free_evt_priv(struct evt_priv *pevtpriv) } } =20 -static void _rtw_free_cmd_priv(struct cmd_priv *pcmdpriv) +void _rtw_free_cmd_priv(struct cmd_priv *pcmdpriv) { if (pcmdpriv) { kfree(pcmdpriv->cmd_allocated_buf); @@ -157,11 +157,6 @@ u32 rtw_init_evt_priv(struct evt_priv *pevtpriv) return res; } =20 -void rtw_free_cmd_priv(struct cmd_priv *pcmdpriv) -{ - _rtw_free_cmd_priv(pcmdpriv); -} - static int rtw_cmd_filter(struct cmd_priv *pcmdpriv, struct cmd_obj *cmd_o= bj) { u8 bAllow =3D false; /* set to true to allow enqueuing cmd when hw_init_c= ompleted is false */ diff --git a/drivers/staging/r8188eu/include/rtw_cmd.h b/drivers/staging/r8= 188eu/include/rtw_cmd.h index 6b6d560d7..d3a20dc23 100644 --- a/drivers/staging/r8188eu/include/rtw_cmd.h +++ b/drivers/staging/r8188eu/include/rtw_cmd.h @@ -83,7 +83,7 @@ void rtw_free_cmd_obj(struct cmd_obj *pcmd); int rtw_cmd_thread(void *context); =20 u32 rtw_init_cmd_priv(struct cmd_priv *pcmdpriv); -void rtw_free_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); void rtw_free_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 390d1cc0e..702e5b350 100644 --- a/drivers/staging/r8188eu/os_dep/os_intfs.c +++ b/drivers/staging/r8188eu/os_dep/os_intfs.c @@ -534,7 +534,7 @@ u8 rtw_init_drv_sw(struct adapter *padapter) rtw_free_evt_priv(&padapter->evtpriv); =20 free_cmd_priv: - rtw_free_cmd_priv(&padapter->cmdpriv); + _rtw_free_cmd_priv(&padapter->cmdpriv); =20 return _FAIL; } @@ -572,7 +572,7 @@ u8 rtw_free_drv_sw(struct adapter *padapter) =20 free_mlme_ext_priv(&padapter->mlmeextpriv); =20 - rtw_free_cmd_priv(&padapter->cmdpriv); + _rtw_free_cmd_priv(&padapter->cmdpriv); =20 rtw_free_evt_priv(&padapter->evtpriv); =20 --=20 2.30.2 From nobody Mon May 11 08:30:44 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 DF02CC433F5 for ; Sun, 10 Apr 2022 16:32:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243611AbiDJQeQ (ORCPT ); Sun, 10 Apr 2022 12:34:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45870 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243603AbiDJQeK (ORCPT ); Sun, 10 Apr 2022 12:34:10 -0400 Received: from mail-pl1-x62c.google.com (mail-pl1-x62c.google.com [IPv6:2607:f8b0:4864:20::62c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BDA1412758 for ; Sun, 10 Apr 2022 09:31:56 -0700 (PDT) Received: by mail-pl1-x62c.google.com with SMTP id s14so2330666plk.8 for ; Sun, 10 Apr 2022 09:31:56 -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=IMj05DlNH3/duK3OGv5ITfGzW1UwrXXvGGzncOUobEQ=; b=bub1+D+Fm5rOeIqLcFoKetxFrtLwdrbBPZQSSBlmveQnl1H9giDv5FUo2qL31Yj5We E1S+MaKLluNaBeg1FHjG9ZnqxINTdrcVpL0bFuutRoW5xVhVy4gPnBfrB0enlMO1bCtm IB8hQIFKnSxsQ9qOphQwYNqS/Yit3CE+Z8FqckXdUjJQ6nLteG04HsUabtvUxKXykXKp F4ctDaiZozvCgjBZD/JSzibH0RySCb0sS3cQlNO9CIcrfEvXyKsKL5ez5wDqEVhXIoT4 4GE2WpBfLI1MKVV64HGOvNfLK4/GEfXTI5pIqz0iz9Me1fzOgjtgccsYG2L1eQXhU/w5 QxzQ== 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=IMj05DlNH3/duK3OGv5ITfGzW1UwrXXvGGzncOUobEQ=; b=FvGPmfrYefXkaoR1YcYRkTuqFw9naFvbye5lB5Kry4FALJLE0j0tP5cegeh+avIU3V I6/+nbLS/gx+1AXV1EmiEUlE7AdU1VT25TBS83fWheIXu92Rp2gNgURSOEW3lTMVPh4X LuwEHpIkcjUOEb2VTzpugkoMX7oZ5FA7orv6oAJ6caFvcrti8k/ckzXzc0HUJtIK9MJr btQUTp1Y/CT/TLXSFHVqItvl5bCg8Dba9Co9iKs4GLoNKR+KgY5y4IX1XXWGj+CQawf8 77eVltJziSrzV/w4x6htxKbaB/+xCm7l/a+8o4V59tJvYfBNhcIf9Z0LSVp7Vuu2B1hJ M7Lg== X-Gm-Message-State: AOAM533OsGNp4GnZ+krw0MUbTPCeBEhD5LKUntl7IVNEt1ZgIlZCAdfa Oscah79+OEuo4pHeiQRWtQqcEVBd9kvjWy6M X-Google-Smtp-Source: ABdhPJzB2GG1qcmGG+RG76cxoMtd4oF3viTx/4NMGsMqsA/Jhw1ui1Rop9F/IKTxF9XXEf86z5wTKQ== X-Received: by 2002:a17:90b:4c8e:b0:1c6:d1ed:f6b2 with SMTP id my14-20020a17090b4c8e00b001c6d1edf6b2mr32127156pjb.166.1649608315895; Sun, 10 Apr 2022 09:31:55 -0700 (PDT) Received: from makvihas.localhost.com ([2405:201:202b:15:606b:10e4:2085:6825]) by smtp.gmail.com with ESMTPSA id f12-20020a056a001acc00b004fb37ecc6b2sm31940021pfv.29.2022.04.10.09.31.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 10 Apr 2022 09:31:55 -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 2/6] staging: r8188eu: drop unnecessary wrapper rtw_init_cmd_priv Date: Sun, 10 Apr 2022 22:01:13 +0530 Message-Id: <20220410163117.3964-3-makvihas@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220410163117.3964-1-makvihas@gmail.com> References: <20220410163117.3964-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" Remove the unnecessary wrapper. The logic of rtw_init_cmd_priv can be moved to _rtw_init_cmd_priv. Signed-off-by: Vihas Makwana --- drivers/staging/r8188eu/core/rtw_cmd.c | 11 +---------- drivers/staging/r8188eu/include/rtw_cmd.h | 2 +- drivers/staging/r8188eu/os_dep/os_intfs.c | 2 +- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_cmd.c b/drivers/staging/r8188= eu/core/rtw_cmd.c index 4d88bc847..d843e9997 100644 --- a/drivers/staging/r8188eu/core/rtw_cmd.c +++ b/drivers/staging/r8188eu/core/rtw_cmd.c @@ -15,7 +15,7 @@ * No irqsave is necessary. */ =20 -static int _rtw_init_cmd_priv(struct cmd_priv *pcmdpriv) +int _rtw_init_cmd_priv(struct cmd_priv *pcmdpriv) { int res =3D _SUCCESS; =20 @@ -139,15 +139,6 @@ static struct cmd_obj *_rtw_dequeue_cmd(struct __queue= *queue) return obj; } =20 -u32 rtw_init_cmd_priv(struct cmd_priv *pcmdpriv) -{ - u32 res; - - res =3D _rtw_init_cmd_priv(pcmdpriv); - - return res; -} - u32 rtw_init_evt_priv(struct evt_priv *pevtpriv) { int res; diff --git a/drivers/staging/r8188eu/include/rtw_cmd.h b/drivers/staging/r8= 188eu/include/rtw_cmd.h index d3a20dc23..ab47d3785 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 u32 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 702e5b350..c611e9246 100644 --- a/drivers/staging/r8188eu/os_dep/os_intfs.c +++ b/drivers/staging/r8188eu/os_dep/os_intfs.c @@ -466,7 +466,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)) =3D=3D _FAIL) { dev_err(dvobj_to_dev(padapter->dvobj), "rtw_init_cmd_priv failed\n"); return _FAIL; } --=20 2.30.2 From nobody Mon May 11 08:30:44 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 7F854C433F5 for ; Sun, 10 Apr 2022 16:32:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243619AbiDJQeS (ORCPT ); Sun, 10 Apr 2022 12:34:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46204 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243605AbiDJQeN (ORCPT ); Sun, 10 Apr 2022 12:34:13 -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 6BDE313D56 for ; Sun, 10 Apr 2022 09:31:59 -0700 (PDT) Received: by mail-pf1-x435.google.com with SMTP id j17so11093972pfi.9 for ; Sun, 10 Apr 2022 09:31: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=u9rqV99953emrj7ssEIoOOZLspKEgCoMFpGDn+F1RrE=; b=Pzi94e4PpDZb5dCXz3nOcQirN1WWnCfBSnZLadD3vR0Ksctj63D2PqayZL7k4oG97f FLKr4DEWu5Lr5W0NpB/FuBLMvFDF5GS21FeLZjKk9ehFt2HXbzV+yMaVFh2iPJahsixA vBSXLPi8yVdTZusIcTMRNSBzBmZUbk8/4TxsOasguNJMk91n0kpRa9QM8WjJKyPZtwWm pKKRVWJi4CQTNmZVsgKP+LkIxuanA89K/oWq9NhZQIKYCNaVvqJnXNaL5efqlLxckJ5H jM066WxV9vXtQUXDZTv9vNZ1ogM6QkQs65QRgRFNhBaMynBWnl/LDjT+g3JEogDc/0zc FXYg== 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=u9rqV99953emrj7ssEIoOOZLspKEgCoMFpGDn+F1RrE=; b=IfJFGQnrGPNDm8wRKoKwVnCUM1HUSCE/i1VqhVtrnWSORi5j6OiFWb3BrGXhs+O4RC c0E8wGMHMV3NXsBagtf74/Zz5zT0Bry/VgZTLJ4bPJJD597nHfLrqUqat982wgK07fC5 Yr/IsbEAsmNpmUs8/fJ2YgVFhZc+tGRTEAUb0QAGLjw1e+hjGLWnoaXyDSXqdHv3+UWK WVrbfl1Cn79SQK9h+qrHfbsSXkv5qX2rmPiRjCLOXQob0nvOlT2rzw6kGkuymN0D16o5 1mlUc4DS63Ui78S+Bc2K+QOU/HvlrI59j0OjXyxVRrXjX3w3YmMwUZq3szYWTeFyAcxY fkRw== X-Gm-Message-State: AOAM533rG51n/t05Fs0wuRrhTHyGNy/oG6BkTwzLSLX0MYFy990ssa8o cH2QUpxSbht9GdodxqwYph4= X-Google-Smtp-Source: ABdhPJzrVAXlGTxXOkCRkcBojbjEjxvI9GxlPSJj/qD9/PgEGvUAZBxDFnu1Gnf1fOi5+o1enspZXQ== X-Received: by 2002:a63:3f84:0:b0:381:f11:20d7 with SMTP id m126-20020a633f84000000b003810f1120d7mr23502541pga.612.1649608319361; Sun, 10 Apr 2022 09:31:59 -0700 (PDT) Received: from makvihas.localhost.com ([2405:201:202b:15:606b:10e4:2085:6825]) by smtp.gmail.com with ESMTPSA id f12-20020a056a001acc00b004fb37ecc6b2sm31940021pfv.29.2022.04.10.09.31.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 10 Apr 2022 09:31:59 -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 3/6] staging: r8188eu: drop unnecessary wrapper rtw_init_evt_priv Date: Sun, 10 Apr 2022 22:01:14 +0530 Message-Id: <20220410163117.3964-4-makvihas@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220410163117.3964-1-makvihas@gmail.com> References: <20220410163117.3964-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" Remove the unnecessary wrapper. The logic of rtw_init_evt_priv can be moved to _rtw_init_evt_priv. Signed-off-by: Vihas Makwana --- drivers/staging/r8188eu/core/rtw_cmd.c | 11 +---------- drivers/staging/r8188eu/include/rtw_cmd.h | 2 +- drivers/staging/r8188eu/os_dep/os_intfs.c | 2 +- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_cmd.c b/drivers/staging/r8188= eu/core/rtw_cmd.c index d843e9997..ac6e710e5 100644 --- a/drivers/staging/r8188eu/core/rtw_cmd.c +++ b/drivers/staging/r8188eu/core/rtw_cmd.c @@ -58,7 +58,7 @@ int _rtw_init_cmd_priv(struct cmd_priv *pcmdpriv) =20 static void c2h_wk_callback(struct work_struct *work); =20 -static int _rtw_init_evt_priv(struct evt_priv *pevtpriv) +int _rtw_init_evt_priv(struct evt_priv *pevtpriv) { int res =3D _SUCCESS; =20 @@ -139,15 +139,6 @@ static struct cmd_obj *_rtw_dequeue_cmd(struct __queue= *queue) return obj; } =20 -u32 rtw_init_evt_priv(struct evt_priv *pevtpriv) -{ - int res; - - res =3D _rtw_init_evt_priv(pevtpriv); - - return res; -} - static int rtw_cmd_filter(struct cmd_priv *pcmdpriv, struct cmd_obj *cmd_o= bj) { u8 bAllow =3D false; /* set to true to allow enqueuing cmd when hw_init_c= ompleted is false */ diff --git a/drivers/staging/r8188eu/include/rtw_cmd.h b/drivers/staging/r8= 188eu/include/rtw_cmd.h index ab47d3785..7edce0f88 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); int _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 c611e9246..f041c3d87 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) =20 padapter->cmdpriv.padapter =3D padapter; =20 - if ((rtw_init_evt_priv(&padapter->evtpriv)) =3D=3D _FAIL) { + if ((_rtw_init_evt_priv(&padapter->evtpriv)) =3D=3D _FAIL) { dev_err(dvobj_to_dev(padapter->dvobj), "rtw_init_evt_priv failed\n"); goto free_cmd_priv; } --=20 2.30.2 From nobody Mon May 11 08:30:44 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 16530C433EF for ; Sun, 10 Apr 2022 16:32:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243630AbiDJQeV (ORCPT ); Sun, 10 Apr 2022 12:34:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46318 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243604AbiDJQeO (ORCPT ); Sun, 10 Apr 2022 12:34:14 -0400 Received: from mail-pg1-x534.google.com (mail-pg1-x534.google.com [IPv6:2607:f8b0:4864:20::534]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 53D0E13FA0 for ; Sun, 10 Apr 2022 09:32:03 -0700 (PDT) Received: by mail-pg1-x534.google.com with SMTP id k14so12153733pga.0 for ; Sun, 10 Apr 2022 09:32: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=isbZTSF51sQ2FdPVyH6jc9Gphy+CzzvzSabiko7I6mc=; b=WQ6NrFWjgSROqckS7LZwaf2sC8rup0FYK90P5hEB5nGjeUppWwR2JJCEwHYN+LsJaP 02tCUiWEVQaC5PpKqlM0TpO6r1hmFEWQAVAmM4k5XNhtKOxhNoj+P5BiH/Rl8oCQDPlL pSM86wRl3fFr6cq/g2nj4LQeW4LiXhQyf4SDLjCAgzptOiKu3ul6+/4zlCh+lXcunRka Iol3zQQxHbbaP5q4QOsjOjbT/7chZVGCFFarKZzNDf1xqF3GAgnrT4cbH9xh5PZo5c5m 2mYdu/UZ9UtDfRKxLx1aCS58JQzhU9+vh03RQwl4XZkCoMk864dhvFNE2NBFBZRwiG2m vcTQ== 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=isbZTSF51sQ2FdPVyH6jc9Gphy+CzzvzSabiko7I6mc=; b=C94MY3QQJ89p7/0PhAgVdQzYhEWbR7NOKtbPvEJCf2T7jyazG6ugepTF4Vd3mXbqk2 bDviINuaaeM1Qrp6X9AhY+pPxALCDaV+J6bwRJIRC6YpGEBTtAWVTKOzeEMQfz79iUky k53x2yvEoeJ+9uk4D7VxhHBHeiE/IQIg26Wlmhtcp9qfB/iRzwhBhmjhSutQyWaCge5Q SvX8LU93Wn82qoHvVmGELqBOSiIPY5PpKHYD25JLYdZOrICbq9VV3VKahzM1iiaIQZ6o WnTb2sL0pj1m2/qjn4336M2LU3Q6XeVp3LoDcub2jnoIP3gCddTYmjTEjXw/qRkC0qip J8Rw== X-Gm-Message-State: AOAM533op8bHTHCU2kAkqjKeDMOOc+8mK0/Nd0TrNE1ADH2Bdb4L3Ef7 3m3HSyPU/7Fm+JANxr/x2kw= X-Google-Smtp-Source: ABdhPJzsjuokRfZ4sVFRJ05ODDxjzY9aXs4YH+x2yITz4ZIwskSlkbJNeDFx2Fl7jlZhMBVV0LjyQA== X-Received: by 2002:a63:6c04:0:b0:398:54fb:5632 with SMTP id h4-20020a636c04000000b0039854fb5632mr22918201pgc.78.1649608322658; Sun, 10 Apr 2022 09:32:02 -0700 (PDT) Received: from makvihas.localhost.com ([2405:201:202b:15:606b:10e4:2085:6825]) by smtp.gmail.com with ESMTPSA id f12-20020a056a001acc00b004fb37ecc6b2sm31940021pfv.29.2022.04.10.09.31.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 10 Apr 2022 09:32: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 4/6] staging: r8188eu: drop unnecessary wrapper rtw_dequeue_cmd Date: Sun, 10 Apr 2022 22:01:15 +0530 Message-Id: <20220410163117.3964-5-makvihas@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220410163117.3964-1-makvihas@gmail.com> References: <20220410163117.3964-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" Remove the unnecessary wrapper. The logic of rtw_dequeue_cmd can be moved to _rtw_dequeue_cmd. Signed-off-by: Vihas Makwana --- drivers/staging/r8188eu/core/rtw_cmd.c | 16 ++++------------ drivers/staging/r8188eu/include/rtw_cmd.h | 2 +- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_cmd.c b/drivers/staging/r8188= eu/core/rtw_cmd.c index ac6e710e5..9d1beca43 100644 --- a/drivers/staging/r8188eu/core/rtw_cmd.c +++ b/drivers/staging/r8188eu/core/rtw_cmd.c @@ -121,10 +121,11 @@ static int _rtw_enqueue_cmd(struct __queue *queue, st= ruct cmd_obj *obj) return _SUCCESS; } =20 -static struct cmd_obj *_rtw_dequeue_cmd(struct __queue *queue) +struct cmd_obj *_rtw_dequeue_cmd(struct cmd_priv *pcmdpriv) { struct cmd_obj *obj; unsigned long flags; + struct __queue *queue =3D &pcmdpriv->cmd_queue; =20 spin_lock_irqsave(&queue->lock, flags); if (list_empty(&queue->queue)) { @@ -178,15 +179,6 @@ u32 rtw_enqueue_cmd(struct cmd_priv *pcmdpriv, struct = cmd_obj *cmd_obj) return res; } =20 -struct cmd_obj *rtw_dequeue_cmd(struct cmd_priv *pcmdpriv) -{ - struct cmd_obj *cmd_obj; - - cmd_obj =3D _rtw_dequeue_cmd(&pcmdpriv->cmd_queue); - - return cmd_obj; -} - void rtw_free_cmd_obj(struct cmd_obj *pcmd) { =20 @@ -230,7 +222,7 @@ int rtw_cmd_thread(void *context) padapter->bSurpriseRemoved) break; =20 - pcmd =3D rtw_dequeue_cmd(pcmdpriv); + pcmd =3D _rtw_dequeue_cmd(pcmdpriv); if (!pcmd) continue; =20 @@ -280,7 +272,7 @@ int rtw_cmd_thread(void *context) =20 /* free all cmd_obj resources */ do { - pcmd =3D rtw_dequeue_cmd(pcmdpriv); + pcmd =3D _rtw_dequeue_cmd(pcmdpriv); if (!pcmd) break; =20 diff --git a/drivers/staging/r8188eu/include/rtw_cmd.h b/drivers/staging/r8= 188eu/include/rtw_cmd.h index 7edce0f88..d581deebb 100644 --- a/drivers/staging/r8188eu/include/rtw_cmd.h +++ b/drivers/staging/r8188eu/include/rtw_cmd.h @@ -77,7 +77,7 @@ struct c2h_evt_hdr { #define c2h_evt_exist(c2h_evt) ((c2h_evt)->id || (c2h_evt)->plen) =20 u32 rtw_enqueue_cmd(struct cmd_priv *pcmdpriv, struct cmd_obj *obj); -struct cmd_obj *rtw_dequeue_cmd(struct cmd_priv *pcmdpriv); +struct cmd_obj *_rtw_dequeue_cmd(struct cmd_priv *pcmdpriv); void rtw_free_cmd_obj(struct cmd_obj *pcmd); =20 int rtw_cmd_thread(void *context); --=20 2.30.2 From nobody Mon May 11 08:30:44 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 E969BC433F5 for ; Sun, 10 Apr 2022 16:32:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243635AbiDJQeZ (ORCPT ); Sun, 10 Apr 2022 12:34:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46302 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243614AbiDJQeR (ORCPT ); Sun, 10 Apr 2022 12:34:17 -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 7A14515835 for ; Sun, 10 Apr 2022 09:32:06 -0700 (PDT) Received: by mail-pg1-x535.google.com with SMTP id r66so12127259pgr.3 for ; Sun, 10 Apr 2022 09:32: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=QN6xP3dvTt8eDyyxi0GOR7k7xaEfRxM7p59jD419ae4=; b=h9NPejbZZiVsyzDuJB41AHo0EZuxX1138V+yJNlXFfy50OodXO0hQP+E/YgUDwPv/e NBEaq+RvL7ZBwasX+sSSXA+IGct0dw4A4fI43uBRInPJYk58MJrWy5wGyJ3LvNfzFmQB fqDI1DDoidIKsZo9P6Wokl0ThG07WfVGrMSP7J7ONujW05Bz38wWC49tOUkaJXHRfFhF UVZ6+EroYgo6rntyOfW90xgj7684lZBWUsrutg9yBLiYIp1TmDYtwSa4nMeLF51flP7T TMk1XFhyxpFT330mI5ZuCedwWlEkfZjMfylRsBqcH9rIOP4LjrINcYZkonlx2tXcl/5l KS5A== 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=QN6xP3dvTt8eDyyxi0GOR7k7xaEfRxM7p59jD419ae4=; b=mBUVoEMSZJ/PBFFhq4ritcDS9IK5v7wDwpuX4ApRYSbM+MFOrcUdyUrh9lqqXCxxxC 5rm0Wg8DrVAKkoBX3DkT1SPh91J9huxyzDZ8OceNYQTpY7tPPPKu5mw9mfOfYRgtaX6s 0MR/VK4l0eCZl3vasx7Oh9/eQL/VjHV6PSJr2f+9zBRdgloGtFb1eIEBVqph79aY8tmc V5B0f6NT/6j6BRyP6m1deoFMJt0rPpN/6GQAnM+iL4D3yFXnc2wvyKiBqZP/1INuhAnX e37QwcS6Zu39iT1IFHDwBY82Qtlu4+5s/R/OfRYLrKsDd3wyB9L1uQ7fAjIuyCk58xBS qhIg== X-Gm-Message-State: AOAM530WFsSolGmz36fsuLe2B/gW3dpcsVfH93bXwJHYU8iZTwHAZ0GM 503uC476yhojDO5Yc/dUgAI= X-Google-Smtp-Source: ABdhPJxIK56wYzdB6oyCxjj2QAgoMYhH9R78QWHe529frT47k3gqhIOYunoTMmgsb0l2DVS5E2ZNvA== X-Received: by 2002:a65:6951:0:b0:381:f10:ccaa with SMTP id w17-20020a656951000000b003810f10ccaamr22824522pgq.587.1649608325970; Sun, 10 Apr 2022 09:32:05 -0700 (PDT) Received: from makvihas.localhost.com ([2405:201:202b:15:606b:10e4:2085:6825]) by smtp.gmail.com with ESMTPSA id f12-20020a056a001acc00b004fb37ecc6b2sm31940021pfv.29.2022.04.10.09.32.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 10 Apr 2022 09:32: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 5/6] staging: r8188eu: drop unnecessary wrapper rtw_init_mlme_priv Date: Sun, 10 Apr 2022 22:01:16 +0530 Message-Id: <20220410163117.3964-6-makvihas@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220410163117.3964-1-makvihas@gmail.com> References: <20220410163117.3964-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" Remove the unnecessary wrapper. The logic of rtw_init_mlme_priv can be moved to _rtw_init_mlme_priv. Signed-off-by: Vihas Makwana --- drivers/staging/r8188eu/core/rtw_mlme.c | 11 +---------- drivers/staging/r8188eu/include/rtw_mlme.h | 2 +- drivers/staging/r8188eu/os_dep/os_intfs.c | 2 +- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_mlme.c b/drivers/staging/r818= 8eu/core/rtw_mlme.c index c90f36dee..f2a61c162 100644 --- a/drivers/staging/r8188eu/core/rtw_mlme.c +++ b/drivers/staging/r8188eu/core/rtw_mlme.c @@ -30,7 +30,7 @@ u8 rtw_to_roaming(struct adapter *adapter) return adapter->mlmepriv.to_roaming; } =20 -static int _rtw_init_mlme_priv(struct adapter *padapter) +int _rtw_init_mlme_priv(struct adapter *padapter) { int i; u8 *pbuf; @@ -288,15 +288,6 @@ u8 *rtw_get_beacon_interval_from_ie(u8 *ie) return ie + 8; } =20 -int rtw_init_mlme_priv(struct adapter *padapter)/* struct mlme_priv *pmlme= priv) */ -{ - int res; - - res =3D _rtw_init_mlme_priv(padapter);/* (pmlmepriv); */ - - return res; -} - void rtw_free_mlme_priv(struct mlme_priv *pmlmepriv) { _rtw_free_mlme_priv(pmlmepriv); diff --git a/drivers/staging/r8188eu/include/rtw_mlme.h b/drivers/staging/r= 8188eu/include/rtw_mlme.h index 1dc1fbf04..b5b1a0e10 100644 --- a/drivers/staging/r8188eu/include/rtw_mlme.h +++ b/drivers/staging/r8188eu/include/rtw_mlme.h @@ -438,7 +438,7 @@ int event_thread(void *context); void rtw_join_timeout_handler (struct timer_list *t); void _rtw_scan_timeout_handler (struct timer_list *t); void rtw_free_network_queue(struct adapter *adapter, u8 isfreeall); -int rtw_init_mlme_priv(struct adapter *adapter); +int _rtw_init_mlme_priv(struct adapter *adapter); void rtw_free_mlme_priv (struct mlme_priv *pmlmepriv); int rtw_select_and_join_from_scanned_queue(struct mlme_priv *pmlmepriv); int rtw_set_key(struct adapter *adapter, struct security_priv *psecuritypr= iv, diff --git a/drivers/staging/r8188eu/os_dep/os_intfs.c b/drivers/staging/r8= 188eu/os_dep/os_intfs.c index f041c3d87..448ea9533 100644 --- a/drivers/staging/r8188eu/os_dep/os_intfs.c +++ b/drivers/staging/r8188eu/os_dep/os_intfs.c @@ -478,7 +478,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) =3D=3D _FAIL) { dev_err(dvobj_to_dev(padapter->dvobj), "rtw_init_mlme_priv failed\n"); goto free_evt_priv; } --=20 2.30.2 From nobody Mon May 11 08:30:44 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 08493C433F5 for ; Sun, 10 Apr 2022 16:32:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243623AbiDJQeh (ORCPT ); Sun, 10 Apr 2022 12:34:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46982 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243625AbiDJQeU (ORCPT ); Sun, 10 Apr 2022 12:34:20 -0400 Received: from mail-pf1-x429.google.com (mail-pf1-x429.google.com [IPv6:2607:f8b0:4864:20::429]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C7370165B1 for ; Sun, 10 Apr 2022 09:32:09 -0700 (PDT) Received: by mail-pf1-x429.google.com with SMTP id s8so12536623pfk.12 for ; Sun, 10 Apr 2022 09:32: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=H1U7ig0yIYDqqdZdu4wVkYgw4NSUR1m80doAifHbSXg=; b=gVpK4lNxM7SmpfWWIq6ooT0wacd8j3RXrqoxFe8fhV0ureF9rZCnTWPLKZSKvZpiPO rlg+OUiCIEDO/lJRs95bKzafvIH6lTy+S8WB9dZcykiZ0jrUCBDEitQ5AXEvXpPtZbWR rZ7s3VH3O239WHcSmi5TOqN4U2J3ppVHi9LjYWkHPKBDCh4hJpQk8+/bOBP9lAPCwnK9 oh4lhM1wdxpryANakPH3swYUH6fI1n52GsXI6EEdHZ8Rcwn+wDgh1OzG72bkc5pYh336 a67AgupEomzdrRyBLksE6+DcyrssQQ8D6HqiJP4Vd3GfxEL4pe90Z3cbFJ+AEVcf4e5H TMKA== 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=H1U7ig0yIYDqqdZdu4wVkYgw4NSUR1m80doAifHbSXg=; b=efUVN8xJK6GCLR8EC1cKivhuxj4VLm51ePqj3kgv6fQLdtSAjA9Oryo79WMn5bafyo 5R1Jb5PsGerWodz/aaJmFr8qB/FEIxBDE3qISFpOWh8WjLx+cvoInIyizOkqeObdTX+z L52JiasqQUZOi6hWpckNpfOErl1/Z5NfWfh1c8kNW1k1ahelPFMpmho9CipQO+J8Bzk2 S3ShlxWVegh+vmPdmSgohZhN8dJ077f53NsXhqmvk6bmUPJZFFSX+QhcGRSHohK4ATWl cZVrNsqpdcLGY1PzCGBGfDrcVAIAuUK3+HQ3Qv3bF1SH+nb5GOkN3BBoteK7VNXKxRlD P5Qw== X-Gm-Message-State: AOAM530WG12gGiqsl6Ck5K7DhQlqi/s3CDY+/7t4oaAKNz5OGnE0Qnmv knPErHFuxFSBAk8I488gUcw= X-Google-Smtp-Source: ABdhPJz4eUGNhq0nhWYowhDapkqRvXBafHMP7p7w4C4Eq0u7PXK4HDz8GAdi1GmOQe5VQmH2f69Sow== X-Received: by 2002:a05:6a00:238f:b0:4f6:b09a:4c63 with SMTP id f15-20020a056a00238f00b004f6b09a4c63mr29014047pfc.35.1649608329324; Sun, 10 Apr 2022 09:32:09 -0700 (PDT) Received: from makvihas.localhost.com ([2405:201:202b:15:606b:10e4:2085:6825]) by smtp.gmail.com with ESMTPSA id f12-20020a056a001acc00b004fb37ecc6b2sm31940021pfv.29.2022.04.10.09.32.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 10 Apr 2022 09:32: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 6/6] staging: r8188eu: drop unnecessary wrapper rtw_free_mlme_priv Date: Sun, 10 Apr 2022 22:01:17 +0530 Message-Id: <20220410163117.3964-7-makvihas@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220410163117.3964-1-makvihas@gmail.com> References: <20220410163117.3964-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" Remove the unnecessary wrapper. Drop rtw_free_mlme_priv and use=20 _rtw_free_mlme_priv instead. Signed-off-by: Vihas Makwana --- drivers/staging/r8188eu/core/rtw_mlme.c | 5 ----- drivers/staging/r8188eu/include/rtw_mlme.h | 1 - drivers/staging/r8188eu/os_dep/os_intfs.c | 4 ++-- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_mlme.c b/drivers/staging/r818= 8eu/core/rtw_mlme.c index f2a61c162..c09a565b4 100644 --- a/drivers/staging/r8188eu/core/rtw_mlme.c +++ b/drivers/staging/r8188eu/core/rtw_mlme.c @@ -288,11 +288,6 @@ u8 *rtw_get_beacon_interval_from_ie(u8 *ie) return ie + 8; } =20 -void rtw_free_mlme_priv(struct mlme_priv *pmlmepriv) -{ - _rtw_free_mlme_priv(pmlmepriv); -} - static struct wlan_network *rtw_alloc_network(struct mlme_priv *pmlmepriv) { struct wlan_network *pnetwork; diff --git a/drivers/staging/r8188eu/include/rtw_mlme.h b/drivers/staging/r= 8188eu/include/rtw_mlme.h index b5b1a0e10..4055a15e2 100644 --- a/drivers/staging/r8188eu/include/rtw_mlme.h +++ b/drivers/staging/r8188eu/include/rtw_mlme.h @@ -439,7 +439,6 @@ void rtw_join_timeout_handler (struct timer_list *t); void _rtw_scan_timeout_handler (struct timer_list *t); void rtw_free_network_queue(struct adapter *adapter, u8 isfreeall); int _rtw_init_mlme_priv(struct adapter *adapter); -void rtw_free_mlme_priv (struct mlme_priv *pmlmepriv); int rtw_select_and_join_from_scanned_queue(struct mlme_priv *pmlmepriv); int rtw_set_key(struct adapter *adapter, struct security_priv *psecuritypr= iv, int keyid, u8 set_tx); diff --git a/drivers/staging/r8188eu/os_dep/os_intfs.c b/drivers/staging/r8= 188eu/os_dep/os_intfs.c index 448ea9533..adfc1e763 100644 --- a/drivers/staging/r8188eu/os_dep/os_intfs.c +++ b/drivers/staging/r8188eu/os_dep/os_intfs.c @@ -528,7 +528,7 @@ u8 rtw_init_drv_sw(struct adapter *padapter) free_mlme_ext: free_mlme_ext_priv(&padapter->mlmeextpriv); =20 - rtw_free_mlme_priv(&padapter->mlmepriv); + _rtw_free_mlme_priv(&padapter->mlmepriv); =20 free_evt_priv: rtw_free_evt_priv(&padapter->evtpriv); @@ -576,7 +576,7 @@ u8 rtw_free_drv_sw(struct adapter *padapter) =20 rtw_free_evt_priv(&padapter->evtpriv); =20 - rtw_free_mlme_priv(&padapter->mlmepriv); + _rtw_free_mlme_priv(&padapter->mlmepriv); _rtw_free_xmit_priv(&padapter->xmitpriv); =20 _rtw_free_sta_priv(&padapter->stapriv); /* will free bcmc_stainfo here */ --=20 2.30.2