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.7 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 2DEF4C4338F for ; Mon, 2 Aug 2021 07:05:35 +0000 (UTC) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 46E9060E76 for ; Mon, 2 Aug 2021 07:05:34 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 46E9060E76 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 365AF82E3F; Mon, 2 Aug 2021 09:05:32 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="oKinRSWP"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 3D98C82E3F; Mon, 2 Aug 2021 09:05:30 +0200 (CEST) Received: from mail-ej1-x632.google.com (mail-ej1-x632.google.com [IPv6:2a00:1450:4864:20::632]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 7987482051 for ; Mon, 2 Aug 2021 09:05:27 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=bmeng.cn@gmail.com Received: by mail-ej1-x632.google.com with SMTP id qk33so29214660ejc.12 for ; Mon, 02 Aug 2021 00:05:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=1moA0W05PylifNGSGgP7swOlMur++LuiYCmOnC+yWk0=; b=oKinRSWPruNkEZ5pc4dUprhwaI6tVVe1SSiUY/aCCEWrwf9aTv+SpRljKAhJJpwgMq 2CyJ0fRnYcP/YjR3MjgvNeXxPrUQPW9aSI/RKqBPGU4gVpIgBX0Ams/WMAN7Gjsbaea0 y+bjIe6Ig589b181++Z+ou//e2kDcMWZefyZ4jTFwpe4cNU+wUwy+bRyd8FUV4QDe55o 8Cfu+s/Q+omfawqio7O+3cSUSoDGYQtBVzF8rSgsIgxlX1Pl1jYPtUtdoNvP4oxXBilu j7P/Nkv4gUXFDeU+We8HvB+877RGSeDJLAYpnsF+uGph0F5P2tsGjDkPgTyzEZeR8xuv i7eA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=1moA0W05PylifNGSGgP7swOlMur++LuiYCmOnC+yWk0=; b=k6UtArYZjXC0ktlWL7S1b50NJ5LJtZniIZXetlZDfzT/KWj+h6vOmdPGXb7LpDdhwv kw2v1WH6DdRkiN7YlFsTVllYtZ5nV2r1ZbC+lMCT9OS1WpNSx3PvO5R3TlLWxYl4JKrx 1i0HG0bmjG8QiRJYJXgPcXBQaKHSs3DPGhRiVLZqHABu0boZf+LG3lEg7YMxaW08Bt/Z 3WgU0wzNGURSBSlIDrm2URWxtsiEk8xZsbqXPS9CIPo9q+yPKoIRckt4wKVKd03bdLAN +H1gsdUpbcpRo8V8taKNN4QpfL9H2GKOJccJPRSNt+rqMmCYlzJz4LF6IQT1DIOvLHl0 emMw== X-Gm-Message-State: AOAM5322C8ZREIaLeWBX2SWkQI3/O1qOeqByJKI+UQFs5WeEgWEZCvPa 6Q1Wvno8Bt7oHIYvWobPGnsD9s9VW9nBeQ== X-Google-Smtp-Source: ABdhPJyFY70JOXtgl4SHre5fBHcuCZ4oG+iFIJqQPOlWLF1cNKDRV4jZKQKoG+JWdYBs0RRNQa4lXg== X-Received: by 2002:a17:906:1901:: with SMTP id a1mr14135244eje.129.1627887926987; Mon, 02 Aug 2021 00:05:26 -0700 (PDT) Received: from pek-vx-bsp2.wrs.com (ec2-44-242-66-180.us-west-2.compute.amazonaws.com. [44.242.66.180]) by smtp.gmail.com with ESMTPSA id r11sm4077456ejy.71.2021.08.02.00.05.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Aug 2021 00:05:26 -0700 (PDT) From: Bin Meng To: u-boot@lists.denx.de, Simon Glass Subject: [PATCH v2 1/2] x86: queensbay: Return directly if IGD / SDVO were already disabled Date: Mon, 2 Aug 2021 15:05:15 +0800 Message-Id: <20210802070516.758415-1-bmeng.cn@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean Initialize 'igd' and 'sdvo' to NULL so that we just need to test them against NULL later, to be compatible with that case that IGD and SDVO devices were already in disabled state. Signed-off-by: Bin Meng --- Changes in v2: - Reword the commit message and add a comment in the codes arch/x86/cpu/queensbay/tnc.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/arch/x86/cpu/queensbay/tnc.c b/arch/x86/cpu/queensbay/tnc.c index 782ed863fe..4a008622d1 100644 --- a/arch/x86/cpu/queensbay/tnc.c +++ b/arch/x86/cpu/queensbay/tnc.c @@ -18,19 +18,17 @@ static int __maybe_unused disable_igd(void) { - struct udevice *igd, *sdvo; + struct udevice *igd = NULL; + struct udevice *sdvo = NULL; int ret; - ret = dm_pci_bus_find_bdf(TNC_IGD, &igd); - if (ret) - return ret; - if (!igd) - return 0; - - ret = dm_pci_bus_find_bdf(TNC_SDVO, &sdvo); - if (ret) - return ret; - if (!sdvo) + /* + * In case the IGD and SDVO devices were already in disabled state, + * we should return and not proceed any further. + */ + dm_pci_bus_find_bdf(TNC_IGD, &igd); + dm_pci_bus_find_bdf(TNC_SDVO, &sdvo); + if (!igd || !sdvo) return 0; /* -- 2.25.1