From mboxrd@z Thu Jan 1 00:00:00 1970 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 1D7D7C433F5 for ; Fri, 11 Mar 2022 19:13:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1351005AbiCKTOz (ORCPT ); Fri, 11 Mar 2022 14:14:55 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36532 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239581AbiCKTOx (ORCPT ); Fri, 11 Mar 2022 14:14:53 -0500 Received: from mail-lf1-x129.google.com (mail-lf1-x129.google.com [IPv6:2a00:1450:4864:20::129]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EFC4B75C38 for ; Fri, 11 Mar 2022 11:13:49 -0800 (PST) Received: by mail-lf1-x129.google.com with SMTP id l20so16633917lfg.12 for ; Fri, 11 Mar 2022 11:13:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:date:mime-version:user-agent:subject:content-language:to :cc:references:from:in-reply-to:content-transfer-encoding; bh=aIl3qyAJQDV5o+ArVkOH0QKLBlNpboQaLuO8XFWfnr4=; b=ZxB0bjMnh3W+v4rXJtn/5FJdqM9Z+8ET/FwPKp0ht2Z34agafOBgclCABLR5Rk8nDT jej9or3aW+ZIYljJ3//wz9hjh+qjxF6GOtRRDePHzVvQAddXOiam1W7t1KuxQWMCDVG9 Tdr/+j3g5xv+/oCt0FvPj3BwLnB1aEAa9wDsELm1fFVfjKoz7BvREK2tuVyBBkkUqS8A GtWz5L65W/0nau9AGpSYlbePS4lnLKaQl6+K50gc1DXrrtt2h0154PaVLlWmFDzGkeSl viGGMEGw+6cb8Oq3gwH8/2ueoiQnzADUKAlHFSbopPmpIuXYiF2TSwKcg7Q9K5rbrbgV dVXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:subject :content-language:to:cc:references:from:in-reply-to :content-transfer-encoding; bh=aIl3qyAJQDV5o+ArVkOH0QKLBlNpboQaLuO8XFWfnr4=; b=yAI+6b7rRkF4+mKGkc6OvTSciPtSgItWqBaHzPlLYeBeq9pENNqw423eDuIbF4tb+r 7IKGPm8i79ObkwhfPCG35kFQQE+BMWIjhwQAgefNLbki84aRC9flRjaJaWR9HgpS0Gce ESSjUbcOmuEVS/AuENC5XdRJQSIxp6MOOMbIy90VNfcdKREgIrxyI/w1AumLmFcxfxaG CO0KYj7S9EHTXMGabIYWQ0PsOHaYREUHes7d/h9C2svK0UGEPXNWQREjxbb/j+WYYjO9 9xpIKczc4LcfGxvYfsWIJXu6Pze8WLvL6gOzTlG1bYQKCjJBxH5lJPsA7x2DqofO2hJ/ cFfw== X-Gm-Message-State: AOAM530fPVx4aOaNmF8jzxwDwx+ZBb0a2jMESJULX8XyFXxNGklH1x8H iJ/XpBrAif0R3pFTBNwcotORgJ0nk24= X-Google-Smtp-Source: ABdhPJwOY3jvr12Q0QCOoAzPM61VxdF/xvDSkyW4H/fkHJ6XmBt8tQ7JgpddmLa/EuRAmexogIueEQ== X-Received: by 2002:a05:6512:31d4:b0:448:3937:c09c with SMTP id j20-20020a05651231d400b004483937c09cmr6860184lfe.158.1647026027995; Fri, 11 Mar 2022 11:13:47 -0800 (PST) Received: from [192.168.1.11] ([94.103.229.107]) by smtp.gmail.com with ESMTPSA id h23-20020a19ca57000000b004486be4b96csm797465lfj.118.2022.03.11.11.13.44 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 11 Mar 2022 11:13:47 -0800 (PST) Message-ID: Date: Fri, 11 Mar 2022 22:13:43 +0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.6.1 Subject: Re: [PATCH] staging: r8188eu: simplify unnecessary NULL check Content-Language: en-US To: Haowen Bai , Larry.Finger@lwfinger.net, phil@philpotter.co.uk, gregkh@linuxfoundation.org Cc: linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org References: <1646994801-26211-1-git-send-email-baihaowen@meizu.com> From: Pavel Skripkin In-Reply-To: <1646994801-26211-1-git-send-email-baihaowen@meizu.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Haowen, On 3/11/22 13:33, Haowen Bai wrote: > 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/r8188eu/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_priv *dvobj, > rtw_handle_dualmac(padapter, 0); > free_adapter: > if (status != _SUCCESS) { > - if (pnetdev) > - rtw_free_netdev(pnetdev); > - else if (padapter) > - vfree(padapter); > + rtw_free_netdev(pnetdev); > + vfree(padapter); > padapter = NULL; > } > exit: I don't see such code on staging-testing branch. All error handling code was refactored in commit 13456b9. Please, always base your code on top of newest branch but not upstream one With regards, Pavel Skripkin