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 X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 80448C48BDF for ; Sun, 13 Jun 2021 22:01:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5585E6135A for ; Sun, 13 Jun 2021 22:01:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232170AbhFMWDP (ORCPT ); Sun, 13 Jun 2021 18:03:15 -0400 Received: from mail-lf1-f49.google.com ([209.85.167.49]:35720 "EHLO mail-lf1-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232165AbhFMWDM (ORCPT ); Sun, 13 Jun 2021 18:03:12 -0400 Received: by mail-lf1-f49.google.com with SMTP id q20so2892163lfo.2 for ; Sun, 13 Jun 2021 15:01:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=tGZcYBQ2b4s2j0BWEMwIAhBZh9sckOPxFzNpQIAfc4g=; b=GZPRoV/Kb2mBlgdPnYzkyjpeRAK7XqXEHq3/9xHql/STuB4+0uf2DymK/akAs9Ftr3 lKf4gznA/xMwq5As9VHiv3/hgz3KJ/g97gDlfPketd+9uUAfo0AEQ8lz7BsY7j9a45do p2Ss46pojf4BFv+sgx3PjsFlsZbhmRoLTMS54PejXlT35Vv4GrCC+WB9V0QoVsIe3wHM Tmv4OtOJrbodaDvRAJUa8CGlkH6pbIK8LVjWK87alfMG5LL3uBbG3DTzrlqvD5+izB6K fr/ggTeVaIrW/QCWIEzQ5AiMOYh5wejEALjraM9UZ0mUip50d3eEQJxpWUWFicALxTQx jBzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=tGZcYBQ2b4s2j0BWEMwIAhBZh9sckOPxFzNpQIAfc4g=; b=GQ8buw1sIz/UhPRbP6u6x4JuC/CSkY++KGyWN+qegwFrrcZEBzx9Gr3HqskZiaJXlS asx0pMSVtQlm9iezlAUbVGDovhPsRFcXBnvE1LfNgrjwEnb/ERkgCNLlHpTORnMRTd3x CHGZZdSOIvnnr36ZhJCokfbVbm2We7MhrNMqsKv/x7QjypaSjZW9mpaaCPS9tTLHHTPd 5SUjFr0OAzAdmPEbuJsDhzYCK2KbjNTLCtQP64oFMqNirNJK1jPidSO7Bn10xiNpO5Df dyjOt9N1GdxwhXy7vYKjwuG91vlsfGvgtGl59+t3sqEMHRYxSn6DqkQ9QMs35UCDWArM go8g== X-Gm-Message-State: AOAM530qRDp5VIeEUfpPeztc7FIkehypnrEVsyOmrW/00QOd7E/D25BI Ng128dHnLT/QOGXAcaJTRzI= X-Google-Smtp-Source: ABdhPJxh8EjFB+47DApBXpyZ8syX5c3mpbt/xUX3NSDlq19VHF59lYaKMqhlixA3iuzxYfFlJJ8F3w== X-Received: by 2002:a05:6512:3d17:: with SMTP id d23mr9769937lfv.596.1623621610131; Sun, 13 Jun 2021 15:00:10 -0700 (PDT) Received: from localhost.localdomain ([94.103.229.24]) by smtp.gmail.com with ESMTPSA id d9sm1280739lfi.287.2021.06.13.15.00.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 13 Jun 2021 15:00:09 -0700 (PDT) From: Pavel Skripkin To: Larry.Finger@lwfinger.net, florian.c.schilhabel@googlemail.com, gregkh@linuxfoundation.org Cc: linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Pavel Skripkin Subject: [PATCH 1/3] staging: rtl8712: remove redundant check in r871xu_drv_init Date: Mon, 14 Jun 2021 01:00:07 +0300 Message-Id: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org padapter->dvobj_init is initialized rigth before initialization check. There is no need for any branching here. Signed-off-by: Pavel Skripkin --- drivers/staging/rtl8712/usb_intf.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/staging/rtl8712/usb_intf.c b/drivers/staging/rtl8712/usb_intf.c index dc21e7743349..c482a6d1998b 100644 --- a/drivers/staging/rtl8712/usb_intf.c +++ b/drivers/staging/rtl8712/usb_intf.c @@ -380,13 +380,11 @@ static int r871xu_drv_init(struct usb_interface *pusb_intf, /* step 3. * initialize the dvobj_priv */ - if (!padapter->dvobj_init) { + + status = padapter->dvobj_init(padapter); + if (status != _SUCCESS) goto error; - } else { - status = padapter->dvobj_init(padapter); - if (status != _SUCCESS) - goto error; - } + /* step 4. */ status = r8712_init_drv_sw(padapter); if (status) -- 2.32.0