From patchwork Tue Aug 30 16:56:41 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Myron Stowe X-Patchwork-Id: 1113542 X-Patchwork-Delegate: bhelgaas@google.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p7UGubjF013240 for ; Tue, 30 Aug 2011 16:56:51 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753996Ab1H3Q4v (ORCPT ); Tue, 30 Aug 2011 12:56:51 -0400 Received: from mx1.redhat.com ([209.132.183.28]:16011 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752296Ab1H3Q4v (ORCPT ); Tue, 30 Aug 2011 12:56:51 -0400 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p7UGuhLM013211 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 30 Aug 2011 12:56:43 -0400 Received: from amt.stowe (ovpn-113-21.phx2.redhat.com [10.3.113.21]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p7UGugUI030773; Tue, 30 Aug 2011 12:56:42 -0400 From: Myron Stowe Subject: [PATCH 5/7] PCI: sh: use generic pcibios_set_master() To: jbarnes@virtuousgeek.org Cc: linux-pci@vger.kernel.org, dhowells@redhat.com, ralf@linux-mips.org, yasutake.koichi@jp.panasonic.com, lethal@linux-sh.org, tglx@linutronix.de, mingo@redhat.com, hpa@zytor.com Date: Tue, 30 Aug 2011 10:56:41 -0600 Message-ID: <20110830165641.337.27318.stgit@amt.stowe> In-Reply-To: <20110830165609.337.22206.stgit@amt.stowe> References: <20110830165609.337.22206.stgit@amt.stowe> User-Agent: StGIT/0.14.3 MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Tue, 30 Aug 2011 16:56:52 +0000 (UTC) From: Myron Stowe This patch removes sh's architecture-specific 'pcibios_set_master()' routine and lets the default PCI core based implementation handle PCI device 'latency timer' setup. No functional change. Signed-off-by: Myron Stowe --- arch/sh/drivers/pci/pci.c | 15 --------------- 1 files changed, 0 insertions(+), 15 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/sh/drivers/pci/pci.c b/arch/sh/drivers/pci/pci.c index a0c92fd..280e2a1 100644 --- a/arch/sh/drivers/pci/pci.c +++ b/arch/sh/drivers/pci/pci.c @@ -242,21 +242,6 @@ int pcibios_enable_device(struct pci_dev *dev, int mask) return pci_enable_resources(dev, mask); } -void pcibios_set_master(struct pci_dev *dev) -{ - u8 lat; - pci_read_config_byte(dev, PCI_LATENCY_TIMER, &lat); - if (lat < 16) - lat = (64 <= pcibios_max_latency) ? 64 : pcibios_max_latency; - else if (lat > pcibios_max_latency) - lat = pcibios_max_latency; - else - return; - printk(KERN_INFO "PCI: Setting latency timer of device %s to %d\n", - pci_name(dev), lat); - pci_write_config_byte(dev, PCI_LATENCY_TIMER, lat); -} - void __init pcibios_update_irq(struct pci_dev *dev, int irq) { pci_write_config_byte(dev, PCI_INTERRUPT_LINE, irq);