From patchwork Tue Jun 26 03:32:19 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Myron Stowe X-Patchwork-Id: 167302 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 89977B6F5A for ; Tue, 26 Jun 2012 13:34:40 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757655Ab2FZDdZ (ORCPT ); Mon, 25 Jun 2012 23:33:25 -0400 Received: from mx1.redhat.com ([209.132.183.28]:7912 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758058Ab2FZDdY (ORCPT ); Mon, 25 Jun 2012 23:33:24 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q5Q3WKnk030924 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 25 Jun 2012 23:32:21 -0400 Received: from amt.stowe (ovpn-113-62.phx2.redhat.com [10.3.113.62]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q5Q3WJms004521; Mon, 25 Jun 2012 23:32:19 -0400 From: Myron Stowe Subject: [PATCH 12/16] tile/PCI: Factor 'pcibios_setup()' out of tile To: bhelgaas@google.com Cc: linux-pci@vger.kernel.org, rth@twiddle.net, ink@jurassic.park.msu.ru, mattst88@gmail.com, linux@arm.linux.org.uk, starvik@axis.com, jesper.nilsson@axis.com, tony.luck@intel.com, fenghua.yu@intel.com, monstr@monstr.eu, ralf@linux-mips.org, yasutake.koichi@jp.panasonic.com, jejb@parisc-linux.org, deller@gmx.de, benh@kernel.crashing.org, paulus@samba.org, lethal@linux-sh.org, davem@davemloft.net, cmetcalf@tilera.com, gxt@mprc.pku.edu.cn, tglx@linutronix.de, mingo@redhat.com, hpa@zytor.com, x86@kernel.org, chris@zankel.net, linux-kernel@vger.kernel.org Date: Mon, 25 Jun 2012 21:32:19 -0600 Message-ID: <20120626033218.16434.50584.stgit@amt.stowe> In-Reply-To: <20120626033045.16434.17412.stgit@amt.stowe> References: <20120626033045.16434.17412.stgit@amt.stowe> User-Agent: StGIT/0.14.3 MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org The PCI core provides a generic (__weak) 'pcibios_setup()' routine that can be used by all architectures as a default. Drop tile's architecture specific version in favor of that as it does not need to be over-ridden. Signed-off-by: Myron Stowe Acked-by: Chris Metcalf --- arch/tile/kernel/pci.c | 10 ---------- 1 files changed, 0 insertions(+), 10 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/arch/tile/kernel/pci.c b/arch/tile/kernel/pci.c index b56d12b..e257226 100644 --- a/arch/tile/kernel/pci.c +++ b/arch/tile/kernel/pci.c @@ -401,16 +401,6 @@ void pcibios_set_master(struct pci_dev *dev) } /* - * This can be called from the generic PCI layer, but doesn't need to - * do anything. - */ -char __devinit *pcibios_setup(char *str) -{ - /* Nothing needs to be done. */ - return str; -} - -/* * This is called from the generic Linux layer. */ void __devinit pcibios_update_irq(struct pci_dev *dev, int irq)