From nobody Tue Jun 23 03:13:48 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 3C95DC433EF for ; Fri, 11 Mar 2022 10:33:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344342AbiCKKea (ORCPT ); Fri, 11 Mar 2022 05:34:30 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33072 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232985AbiCKKe3 (ORCPT ); Fri, 11 Mar 2022 05:34:29 -0500 Received: from mail.meizu.com (edge07.meizu.com [112.91.151.210]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8ABC7F407B for ; Fri, 11 Mar 2022 02:33:25 -0800 (PST) Received: from IT-EXMB-1-125.meizu.com (172.16.1.125) by mz-mail11.meizu.com (172.16.1.15) with Microsoft SMTP Server (TLS) id 14.3.487.0; Fri, 11 Mar 2022 18:33:25 +0800 Received: from meizu.meizu.com (172.16.137.70) by IT-EXMB-1-125.meizu.com (172.16.1.125) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.14; Fri, 11 Mar 2022 18:33:23 +0800 From: Haowen Bai To: , , CC: , , "Haowen Bai" Subject: [PATCH] staging: r8188eu: simplify unnecessary NULL check Date: Fri, 11 Mar 2022 18:33:21 +0800 Message-ID: <1646994801-26211-1-git-send-email-baihaowen@meizu.com> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 X-Originating-IP: [172.16.137.70] X-ClientProxiedBy: IT-EXMB-1-126.meizu.com (172.16.1.126) To IT-EXMB-1-125.meizu.com (172.16.1.125) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" remove the optimisation of NULL checking it inline, kfree/rtw_free_netdev will take care if that would ever be the case. Signed-off-by: Haowen Bai --- drivers/staging/r8188eu/os_dep/usb_intf.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/staging/r8188eu/os_dep/usb_intf.c b/drivers/staging/r8= 188eu/os_dep/usb_intf.c index 91792df..8d1ac48 100644 --- a/drivers/staging/r8188eu/os_dep/usb_intf.c +++ b/drivers/staging/r8188eu/os_dep/usb_intf.c @@ -425,10 +425,8 @@ static struct adapter *rtw_usb_if1_init(struct dvobj_p= riv *dvobj, rtw_handle_dualmac(padapter, 0); free_adapter: if (status !=3D _SUCCESS) { - if (pnetdev) - rtw_free_netdev(pnetdev); - else if (padapter) - vfree(padapter); + rtw_free_netdev(pnetdev); + vfree(padapter); padapter =3D NULL; } exit: --=20 2.7.4