From patchwork Sat Jan 21 23:13:19 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 6340 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 6F5C723F02 for ; Sat, 21 Jan 2012 23:13:26 +0000 (UTC) Received: from mail-bk0-f52.google.com (mail-bk0-f52.google.com [209.85.214.52]) by fiordland.canonical.com (Postfix) with ESMTP id 553F0A18100 for ; Sat, 21 Jan 2012 23:13:26 +0000 (UTC) Received: by bkar19 with SMTP id r19so1678025bka.11 for ; Sat, 21 Jan 2012 15:13:26 -0800 (PST) MIME-Version: 1.0 Received: by 10.205.130.12 with SMTP id hk12mr1120253bkc.56.1327187605974; Sat, 21 Jan 2012 15:13:25 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.204.130.220 with SMTP id u28cs38271bks; Sat, 21 Jan 2012 15:13:25 -0800 (PST) Received: by 10.112.25.99 with SMTP id b3mr781932lbg.8.1327187604290; Sat, 21 Jan 2012 15:13:24 -0800 (PST) Received: from mail.df.lth.se (mail.df.lth.se. [194.47.250.12]) by mx.google.com with ESMTPS id c6si2405192lbn.37.2012.01.21.15.13.23 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 21 Jan 2012 15:13:24 -0800 (PST) Received-SPF: pass (google.com: domain of triad@df.lth.se designates 194.47.250.12 as permitted sender) client-ip=194.47.250.12; Authentication-Results: mx.google.com; spf=pass (google.com: domain of triad@df.lth.se designates 194.47.250.12 as permitted sender) smtp.mail=triad@df.lth.se Received: from mer.df.lth.se (mer.df.lth.se [194.47.250.37]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.df.lth.se (Postfix) with ESMTPS id 19DBD65D85; Sun, 22 Jan 2012 00:13:23 +0100 (CET) Received: from mer.df.lth.se (triad@localhost.localdomain [127.0.0.1]) by mer.df.lth.se (8.14.3/8.14.3/Debian-9.4) with ESMTP id q0LNDMCZ026104; Sun, 22 Jan 2012 00:13:22 +0100 Received: (from triad@localhost) by mer.df.lth.se (8.14.3/8.14.3/Submit) id q0LNDM7l026103; Sun, 22 Jan 2012 00:13:22 +0100 From: Linus Walleij To: Albert ARIBAUD , u-boot@lists.denx.de Cc: Linus Walleij Subject: [PATCH] integrator: stop calling pci_init() twice Date: Sun, 22 Jan 2012 00:13:19 +0100 Message-Id: <1327187599-26076-1-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 1.7.2.5 X-Gm-Message-State: ALoCoQkBbH0dBeOb8oC6HE+5/FZ1RiGSKdc1q5IJ3DudQMZ6MYvr3PL6eHafoewolf8tY8EBxYQQ The U-Boot startup infrastructure already makes sure pci_init() is called at a proper time, calling it again from within the board setup code will not make things better. Signed-off-by: Linus Walleij --- board/armltd/integrator/integrator.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/board/armltd/integrator/integrator.c b/board/armltd/integrator/integrator.c index a507c09..4658ac1 100644 --- a/board/armltd/integrator/integrator.c +++ b/board/armltd/integrator/integrator.c @@ -115,9 +115,6 @@ extern void cm_remap(void); int misc_init_r (void) { -#ifdef CONFIG_PCI - pci_init(); -#endif setenv("verify", "n"); return (0); }