Message ID | 20210802005446.2267075-11-sjg@chromium.org |
---|---|
State | Accepted |
Commit | debf660312a60ff35afb62961e3352a0b22abc0a |
Delegated to: | Tom Rini |
Headers | show
Return-Path: <u-boot-bounces@lists.denx.de> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=DHPSaSR1; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4GdKXx2hFwz9sX5 for <incoming@patchwork.ozlabs.org>; Mon, 2 Aug 2021 11:04:49 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 0053983315; Mon, 2 Aug 2021 03:04:42 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="DHPSaSR1"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id ED9F383394; Mon, 2 Aug 2021 02:55:59 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mail-ot1-x332.google.com (mail-ot1-x332.google.com [IPv6:2607:f8b0:4864:20::332]) (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 5DAD2832E2 for <u-boot@lists.denx.de>; Mon, 2 Aug 2021 02:55:00 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-ot1-x332.google.com with SMTP id 61-20020a9d0d430000b02903eabfc221a9so16093491oti.0 for <u-boot@lists.denx.de>; Sun, 01 Aug 2021 17:55:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=7G/H6dyD7KWf+Tj+zvUP4d3MqIPmSDCrKlye3TmR7Mw=; b=DHPSaSR1vd33tEc2yPdUyCk96cufxrZbHeDyPom5W1ED/uVaA3D1cKj7R4arcnzOl/ 8z8Ml7m4oq/+7W9bSTgDfsNcqy9s6eo8KmutAhQQCUJbKSIQktAKd0oyqluI9PCrxgnT rkJRly9YRU5rnxVM8KrP4gXAk6wALtXoMIuLQ= 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=7G/H6dyD7KWf+Tj+zvUP4d3MqIPmSDCrKlye3TmR7Mw=; b=B7h//1exVvgcWFiTCZ1PzLRGYvOYu2VTeI3+ZKMd6b6F49dkWUm3h0KOjR71gusmoh Vll/DBUj0Vnem+nW10/KE2OMd92DjPfpTXwOUX5R1ZB5KGRPUnMMgy7I4oDKBZglPKWz PO24bPlsBypztDqpp478lWuVcZiorICddcbXrMUxHTnXLxVc8EiBJTLlEAUJB3qky/aT IKHl6KBH3wY/7pPJp9gD4Fainpb3imW7W6wqJ736AMiOudPP7VW35ZrHoB7e+e2ephi1 qO1YO0u+x+yU5AhGhRx0ksuf+xcfnvQGcpYGhnwFPQiEXkr9/y6XxxJTjp7HsQlQbkcb 7Jiw== X-Gm-Message-State: AOAM533wxcfrHR/wXn0UnUPQyo70lekJVETWEBYbfA7L8isHiNLbbgBW nIXygG2PtL+ygTFLqxNzn3xY5798er+fDnLc X-Google-Smtp-Source: ABdhPJw1xPjtPEVYSOjr7asvlbx8wPg/HGeAmMjQqtZgLLZrMtF/TkPSuWK8Er9uMy0Ib9sg3KFIfg== X-Received: by 2002:a05:6830:91b:: with SMTP id v27mr9841771ott.337.1627865698616; Sun, 01 Aug 2021 17:54:58 -0700 (PDT) Received: from kiwi.bld.corp.google.com (c-67-190-101-114.hsd1.co.comcast.net. [67.190.101.114]) by smtp.gmail.com with ESMTPSA id s2sm1452616ooc.15.2021.08.01.17.54.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 01 Aug 2021 17:54:58 -0700 (PDT) From: Simon Glass <sjg@chromium.org> To: U-Boot Mailing List <u-boot@lists.denx.de> Cc: Tom Rini <trini@konsulko.com>, Simon Glass <sjg@chromium.org>, Marek Vasut <marex@denx.de>, Pavel Herrmann <morpheus.ibis@gmail.com> Subject: [PATCH v2 10/32] pci: dm: core: Drop DM_PCI check from devfdt_get_addr_pci() Date: Sun, 1 Aug 2021 18:54:23 -0600 Message-Id: <20210802005446.2267075-11-sjg@chromium.org> X-Mailer: git-send-email 2.32.0.554.ge1b32706d8-goog In-Reply-To: <20210802005446.2267075-1-sjg@chromium.org> References: <20210802005446.2267075-1-sjg@chromium.org> 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 <u-boot.lists.denx.de> List-Unsubscribe: <https://lists.denx.de/options/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=unsubscribe> List-Archive: <https://lists.denx.de/pipermail/u-boot/> List-Post: <mailto:u-boot@lists.denx.de> List-Help: <mailto:u-boot-request@lists.denx.de?subject=help> List-Subscribe: <https://lists.denx.de/listinfo/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=subscribe> Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de> X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean |
Series |
pci: Drop all pre-driver model code
|
expand
|
On Sun, Aug 01, 2021 at 06:54:23PM -0600, Simon Glass wrote: > We don't need this check anymore since when PCI is enabled, driver model > is always used. > > Signed-off-by: Simon Glass <sjg@chromium.org> Applied to u-boot/master, thanks!
diff --git a/drivers/core/fdtaddr.c b/drivers/core/fdtaddr.c index b9874c743d1..4ffbd6b2ebc 100644 --- a/drivers/core/fdtaddr.c +++ b/drivers/core/fdtaddr.c @@ -200,8 +200,7 @@ fdt_addr_t devfdt_get_addr_pci(const struct udevice *dev) ulong addr; addr = devfdt_get_addr(dev); - if (CONFIG_IS_ENABLED(PCI) && IS_ENABLED(CONFIG_DM_PCI) && - addr == FDT_ADDR_T_NONE) { + if (CONFIG_IS_ENABLED(PCI) && addr == FDT_ADDR_T_NONE) { struct fdt_pci_addr pci_addr; u32 bar; int ret;
We don't need this check anymore since when PCI is enabled, driver model is always used. Signed-off-by: Simon Glass <sjg@chromium.org> --- (no changes since v1) drivers/core/fdtaddr.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)