Received: by 2002:a05:6a10:f3d0:0:0:0:0 with SMTP id a16csp2360381pxv; Sun, 11 Jul 2021 10:38:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy9xf7n08eUfNM559MkiQA6XEn7sm6XTeJ/qo1lhLa+IXy8UxUh39FcdFdr6uvNPLfoYaRc X-Received: by 2002:a17:907:2d23:: with SMTP id gs35mr2187091ejc.222.1626025110092; Sun, 11 Jul 2021 10:38:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626025110; cv=none; d=google.com; s=arc-20160816; b=JWQ99QzHB4ECRUw1HTfK6RL71tCu/guBszK9ClDg5oZV5KPo/igiakA4CbLlkeX481 ZHOmAnG3YjLWgSq9vm0LMXmgDFKRqQ+b5BBggkACcE4cHmLRtaZgYPSMnHSo4j/7uuYF l3bRROLyH4a8RW+xTN6oPlCQK+VHBBvv738f0IOMlnAaQni3hCshCbgiAUcLZeU6YhLF n6j/oMwYy3a3rMsL6ZdgJWjFQZLvvESOsCOj3PZ21aghDhefLmf2jvBAwDdkjeNF3QC1 q10NPSkpdsH/dDNcDrguuAtmq3a/1TLbj6A7tp5zibklO7cgpUThpOAmaEW1/+x4NDei PJjg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=ff/ll1z+AHH4qdO8COvMwL772B1c7xMUj0aix7H/Kys=; b=ZExlAmVSU6oWh7w6M5QgI2gOlslWOUcm3e10WDrfs6PDwuawlcLN5fRDj0APkhNOcK DZeAeT6MIpltDt6vJsnPwnxgYIqYGRJjE9b0mjsJLgT0zyJtfux3gqHTxP1I6ZOe8AAm qMmzdXC66cBmNYaQiD2jWFMMiY9RxLkK9DSbLR/siEpEKi/Eqgj0qtEAonnTg3BnS+zV YA8C4OHSY/qFxTfcnedpVypNAtYqNjIXnbRzzUyA7o4g44sDdF1R/vm5aZfrHIl+dBM3 7h5PZrDbUzqd6QgCLInwVIm1YzTUFV8YYtffi6LLP2a7kbPCaXXGu3vJil1CF3etoISO GhDQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmx.net header.s=badeba3b8450 header.b=lB+tdjK9; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmx.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id p21si15444606eds.590.2021.07.11.10.37.46; Sun, 11 Jul 2021 10:38:30 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@gmx.net header.s=badeba3b8450 header.b=lB+tdjK9; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmx.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232441AbhGKR1r (ORCPT + 99 others); Sun, 11 Jul 2021 13:27:47 -0400 Received: from mout.gmx.net ([212.227.15.15]:60537 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230353AbhGKR1q (ORCPT ); Sun, 11 Jul 2021 13:27:46 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1626024293; bh=AnCY0pjNVPxfMlK/RMJloKhD8Gf9lUzrKmoISOVbvLE=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date; b=lB+tdjK9F5mr7KbWU43j91pvP4kG8HHIeFXJfFX9OFpzesLHLy82JVTU9Br221rlw 36OSTOcyJxsudtd/aVIHznaa53epieu38pVnCpdTTfVRzcD3UdgVEk24/GqJ2s/JjX d4lWs+kOpCo+xOgi30C0/Aj93EWAflGymBh0/hvE= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([83.52.228.41]) by mail.gmx.net (mrgmx005 [212.227.17.184]) with ESMTPSA (Nemesis) id 1MUGe1-1lbRWo0pRD-00RIK7; Sun, 11 Jul 2021 19:24:53 +0200 From: Len Baker To: Harry Wentland , Leo Li , Alex Deucher , =?UTF-8?q?Christian=20K=C3=B6nig?= , "Pan, Xinhui" , David Airlie , Daniel Vetter Cc: Len Baker , Wenjing Liu , Martin Tsai , Kees Cook , George Shen , Yu-ting Shen , Nicholas Kazlauskas , Bhawanpreet Lakha , amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH] drm/amd/display: Fix identical code for different branches Date: Sun, 11 Jul 2021 19:24:33 +0200 Message-Id: <20210711172433.2777-1-len.baker@gmx.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:Y3gzwZrH3SZG80PK9ruDRlopijLNaqyUfz3yCTcTZ7jUMp6kn+f Tx5otUZe2s3OfMm9+BPkH8unLbEPc1a0/kZhoUaW1YOK9gmNKBKJCwvmzXP6leaVdpatS8U B1iXIqAzC8kSVw2eSqWvCGxztVaLL3RG3KB72Mt1bGw91fWJsF7kByjyIwuIHITd1MHps79 uD4CRPByosFd4JbGAY7nA== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:0T9ZeVYgxY4=:YLkjJGazRzNGjutU36UaUz 5730Dr5vyRWA3EMPbahBhqYOnyGyKnagYVBswS2ON0rpEWb1IX8Q+K5Q8QhmcKPxSKP0jZKek xZazM6kYa1YObHOmrFpHuXsbB7rm/tuTgLE5yN7g0gfTp/x7sm5S/eJ4WjKmqrOtbdwISJyis uUjoKeVyveinL7GLmjFql1S2V+ITHRBikZjQjt1jo+Ucuj0aYrL+DUMw6X0WHe5J3wgYjKB/Z am4uZWEi2Cj4IsdKj+XENTZgEpksIdq7R+Jt0MvcaZZrOIlqapnX1PCWp+WJVO6BPEiQweTkE a7OM7igelptWVtIbd2JLlYi2ANqbhb4hOd5Ahq2PapnKmkY951UKjz80O4zkruZZKOLKgtDQ4 okTdQYsnnYzXW44Le7arDuuCOC9wZfuofmLKM42ugdK/49VQc/GWPffs8A3Gpd6Yj3zHEl4om J1f6J/suPoGHxYtL4yK/nLiPPQ8PTN8l9s6JRdrGQCPfT0m3wun/fbjHFUmy8cJ4rr2noucmn c660ROZfKj9jNbPPwknzLNnMsAcF7JBznhLcNBucLDZ9yKpn9LQhT8EM1tyRHp/dg0OMLWo1i w6IcbHQOn2P1kSNg2ighjmcDlrFZSOIoSoe7HA43MkIfv1H9AOSMCJa2STd/Cy6ul0jeWu0rZ Ngnu5gZaCTsjHamo5fBdllpLaBTuwclA7K3EFZ/FIJO1az5z3k/RmC+TBBd5WmL/AG2f/prGb AIzXPwsVw3SDPv9cmM2SgedQWA6MRd25vAwFLt3/Op4kgxf+FdCwfSEEc12pYXhOm3mITZ7Gp 5dI5OehFKrdb6A0wojisoQhdfUqu0+z3PRPs9P16zu+ugq4lQvOehd5gEBNZ2c6M+ZzO55L4q t5GSFJknFfmy/ATpwKm3vq70YCR7b2QsMm3Q3aPMRt680r1b9/ZYveR4h1uFCfAhjMDqOCEIk zSe6AW/+cHCJN4SJ1DCWymg9UIBVRtp4D9dohPvgf6IaCGI06gL6ZPDXxlosq5LuusOuUGfOU M9TDhIq4oznlBI75V704o7bMI5HsFPSYZGh3VrrFu6pPkIqC5NHU2wtdrr/GJaogLJkAAEhZW CtvchthcNqspn1a1mHmQrouzdUWJdzQLMwZ Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The branches of the "if" statement are the same. So remove the unnecessary if and goto statements. Addresses-Coverity-ID: 1456916 ("Identical code for different branches") Fixes: 4c283fdac08ab ("drm/amd/display: Add HDCP module") Signed-off-by: Len Baker =2D-- drivers/gpu/drm/amd/display/modules/hdcp/hdcp1_execution.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/amd/display/modules/hdcp/hdcp1_execution.c b/= drivers/gpu/drm/amd/display/modules/hdcp/hdcp1_execution.c index de872e7958b0..d0c565567102 100644 =2D-- a/drivers/gpu/drm/amd/display/modules/hdcp/hdcp1_execution.c +++ b/drivers/gpu/drm/amd/display/modules/hdcp/hdcp1_execution.c @@ -305,10 +305,8 @@ static enum mod_hdcp_status wait_for_ready(struct mod= _hdcp *hdcp, hdcp, "bcaps_read")) goto out; } - if (!mod_hdcp_execute_and_set(check_ksv_ready, - &input->ready_check, &status, - hdcp, "ready_check")) - goto out; + mod_hdcp_execute_and_set(check_ksv_ready, &input->ready_check, &status, + hdcp, "ready_check"); out: return status; } =2D- 2.25.1