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=-19.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,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 0E885C4338F for ; Mon, 2 Aug 2021 00:56:48 +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 7C3C7601FE for ; Mon, 2 Aug 2021 00:56:47 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 7C3C7601FE Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=chromium.org 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 5733C83395; Mon, 2 Aug 2021 02:56:04 +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="Nsfr1KAo"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id E223083387; Mon, 2 Aug 2021 02:55:47 +0200 (CEST) Received: from mail-ot1-x335.google.com (mail-ot1-x335.google.com [IPv6:2607:f8b0:4864:20::335]) (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 B8E4783304 for ; Mon, 2 Aug 2021 02:54:56 +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-x335.google.com with SMTP id f20-20020a9d6c140000b02904bb9756274cso4132091otq.6 for ; Sun, 01 Aug 2021 17:54:56 -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=M6LqoYdpYWS04/2AkvO2i17Yv6+Fzpx0WBYXoQ70Trs=; b=Nsfr1KAozNDfuMk4jzqx4FHxS9tvsFfCmAbhhEDu96kNNZ3XPgG/FCUAcbryLgr7c5 SDGQw2UELR8DqjLmN39LMoEdiVVRFM21PTWQmR4iVPRZph/3OBmSF9EXarj5XuK7wJSY BEJaZbZFgM0i5AgRghXportmjBiK1oiIY0uAo= 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=M6LqoYdpYWS04/2AkvO2i17Yv6+Fzpx0WBYXoQ70Trs=; b=faH0qMjebpFooEJtEW4BoQ384IS52amLQExamJPaDO3/CWzuRx1sVoZ740yHpu9hjD 5oXHV2IDCDYnVZ2nG/oF6PhqWJDVdmIQY0NgV+paxzxkpVBJNIxWsornudyCv/EWS2cm +kflGBDbURr9mmazuPSGiuPM/2wz2D/5i8CzVSS9/Qh0rh+ImCLZsBAmV1t9O9Kka9oK qd1KnCFK2HAZz6HcCFxCZrGdefR+Ox/QpUolrtfk7NsHrz6eJ3HzYIus2kkWjez8EbrP BfaXy1YRs4ePfUAfmywDvjqjm+LH7Opk6ItUAeocviTjg4qOFmhILIAJRRmwVTQmghbx B6LA== X-Gm-Message-State: AOAM5312jk9fDO0fO2sMAqxd2ckMRJxK578QOXd0yyW2sG88NcCmwfiv E1TQcuirPwhOUwTRMvqa65xYh7VhlQXRoFmZ X-Google-Smtp-Source: ABdhPJx4JEfxhX+lVj8poMjji8qCoWmBiJZdUrSzKwt6J7cYFHBP0Nagi45g8lsx4Je4MCZQCOEV0A== X-Received: by 2002:a05:6830:1b6b:: with SMTP id d11mr9579251ote.234.1627865694702; Sun, 01 Aug 2021 17:54:54 -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.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 01 Aug 2021 17:54:54 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 06/32] pci: Drop DM_PCI check from pci_common Date: Sun, 1 Aug 2021 18:54:19 -0600 Message-Id: <20210802005446.2267075-7-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 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 We don't need this check anymore since when PCI is enabled, driver model is always used. Signed-off-by: Simon Glass --- (no changes since v1) drivers/pci/pci_common.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/pci/pci_common.c b/drivers/pci/pci_common.c index 5231b69dc9a..02a71da30fa 100644 --- a/drivers/pci/pci_common.c +++ b/drivers/pci/pci_common.c @@ -99,7 +99,7 @@ __weak int pci_skip_dev(struct pci_controller *hose, pci_dev_t dev) return 0; } -#if !defined(CONFIG_DM_PCI) || defined(CONFIG_DM_PCI_COMPAT) +#if defined(CONFIG_DM_PCI_COMPAT) /* Get a virtual address associated with a BAR region */ void *pci_map_bar(pci_dev_t pdev, int bar, int flags) { @@ -361,4 +361,4 @@ pci_dev_t pci_find_class(uint find_class, int index) return -ENODEV; } -#endif /* !CONFIG_DM_PCI || CONFIG_DM_PCI_COMPAT */ +#endif /* CONFIG_DM_PCI_COMPAT */ -- 2.32.0.554.ge1b32706d8-goog