From patchwork Sun Nov 29 20:17:59 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 549804 X-Patchwork-Delegate: sjg@chromium.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 7ABB61402A3 for ; Mon, 30 Nov 2015 07:20:47 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b=PdVUd3/U; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 21DA14B802; Sun, 29 Nov 2015 21:19:39 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id yUqV5BnlIdrh; Sun, 29 Nov 2015 21:19:39 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id B0F794B808; Sun, 29 Nov 2015 21:18:56 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id CFE364B712 for ; Sun, 29 Nov 2015 21:18:37 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Y7RnUHVMBObb for ; Sun, 29 Nov 2015 21:18:37 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-oi0-f42.google.com (mail-oi0-f42.google.com [209.85.218.42]) by theia.denx.de (Postfix) with ESMTPS id 33C3E4B786 for ; Sun, 29 Nov 2015 21:18:29 +0100 (CET) Received: by oige206 with SMTP id e206so84415037oig.2 for ; Sun, 29 Nov 2015 12:18:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=+cPMnaFKvPDludIeZrbXnUCe+19WwwluXzF3VwCYUMI=; b=PdVUd3/UjVBriN1LXTDFxHd0OeX7r+N+RwoJ+cRhv5YBUGw4KjJ3nKSvOrPpOtehVe jE7JxtI01e2S16tAV7TvOMkIh6tL/HPLSydIMe2zd+pkfTmR5M+NPD03kb8d8g1QnHZc 9PQkcftDWVY8rZfE3ykxYDbfR0UlKNVFyTwHXMTQNT3BKvKJHtpdFBYLEvR/Ss1wj/nr cx39jRbwJyFih5UTgbeFoH/vszshV6wSoUWL1mZhxJYsDekRqwiadX/N0XK5UQpTaVks IWHfdCKItfh+Wo9JAxQzGJIQfpWuM9SpAJrZWgOxXn5iYCtqij3cOPNPP0yf/pmmtV8x /J6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=+cPMnaFKvPDludIeZrbXnUCe+19WwwluXzF3VwCYUMI=; b=hn6nrnBJ3edmKrooq3lkcZApUHXh7wAHLeTCJxiVf2Ynx1XPkGbdaqGY8kWhyrF0Zh hh5YbT1o8C8dpMJN0pHLzkLDaqqK2WkOKGcf5kz+opzfstmyilP2MYgg0t1jAiz4fBRe l+OLld9mZflYtV0savMcNbrQVd+aMp4g8lnTrDdNhUcohpSw+fJjrrY2FoTCLP+MrQEx fa0YLKjMshWJVvGy0/wiE4z4v4jcNP0M3SSZGD3ID0YcE1YlT2K123tYJKKd7sfEyur0 pkYMVdHybsFJWWV2J+xVpbbRIYbZj0aGQZmx+RQ7bDp76qsgvUlBQ4bNrSKOftfUG3k6 lDhg== X-Gm-Message-State: ALoCoQnT0rndohkt3RJ12ZRGMDW1NQ6BjCc6H4xMcEJW5VUui9HRb/kYFUhGykr2vSAcUGyFaw46 X-Received: by 10.202.85.193 with SMTP id j184mr41322958oib.4.1448828308344; Sun, 29 Nov 2015 12:18:28 -0800 (PST) Received: from kaki.bld.corp.google.com ([2620:0:1005:1100:db0:6c41:dcb6:f2ad]) by smtp.gmail.com with ESMTPSA id y75sm19757466oie.6.2015.11.29.12.18.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 29 Nov 2015 12:18:27 -0800 (PST) Received: by kaki.bld.corp.google.com (Postfix, from userid 121222) id E55D922250E; Sun, 29 Nov 2015 13:18:21 -0700 (MST) From: Simon Glass To: U-Boot Mailing List Date: Sun, 29 Nov 2015 13:17:59 -0700 Message-Id: <1448828291-12660-15-git-send-email-sjg@chromium.org> X-Mailer: git-send-email 2.6.0.rc2.230.g3dd15c0 In-Reply-To: <1448828291-12660-1-git-send-email-sjg@chromium.org> References: <1448828291-12660-1-git-send-email-sjg@chromium.org> Subject: [U-Boot] [PATCH v2 14/26] dm: pci: Drop the old version of pci_find_device/s() X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Move these functions into the compatibility file so that they are not available by default. Signed-off-by: Simon Glass Reviewed-by: Bin Meng --- Changes in v2: - Move the functions into pci_common.c so they can be used by old code - Reword the commit message for clarity drivers/pci/pci_common.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/pci/pci_common.c b/drivers/pci/pci_common.c index 2a14902..a4573b0 100644 --- a/drivers/pci/pci_common.c +++ b/drivers/pci/pci_common.c @@ -313,6 +313,7 @@ pci_addr_t pci_hose_phys_to_bus(struct pci_controller *hose, return bus_addr; } +#if !defined(CONFIG_DM_PCI) || defined(CONFIG_DM_PCI_COMPAT) pci_dev_t pci_find_device(unsigned int vendor, unsigned int device, int index) { struct pci_device_id ids[2] = { {}, {0, 0} }; @@ -363,3 +364,4 @@ pci_dev_t pci_hose_find_devices(struct pci_controller *hose, int busnum, return -1; } +#endif /* !CONFIG_DM_PCI || CONFIG_DM_PCI_COMPAT */