From patchwork Wed Dec 5 20:57:30 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 203947 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 8A7472C0123 for ; Thu, 6 Dec 2012 07:57:34 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754467Ab2LEU5d (ORCPT ); Wed, 5 Dec 2012 15:57:33 -0500 Received: from mail-we0-f202.google.com ([74.125.82.202]:42074 "EHLO mail-we0-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754260Ab2LEU5c (ORCPT ); Wed, 5 Dec 2012 15:57:32 -0500 Received: by mail-we0-f202.google.com with SMTP id t57so395504wey.1 for ; Wed, 05 Dec 2012 12:57:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=subject:to:from:date:message-id:in-reply-to:references:user-agent :mime-version:content-type:content-transfer-encoding; bh=98PuBquxt538v6osDKFS9gO9/BtJ9QuhX5GKZWcensE=; b=eMaR3CR5xD3S2BRLhwHO813iYZ/3TGZj+thlXLMEtDPvGYe8owhoZYDeKD+kfClSDv qGSJyZC/DU6MHfBvg10K0yQZcqv1k0e2Bel2J64zcIRowm0iudV1VkG6y/OJZzu6Tw+v ToUuLhSy07Exo+1PP7tMvymdKJi/gL20bYVl+oFNtYgGp+6/eiZ+D341GBgZK+CxuR+r /tEZyhsX9uy3ZzdJtArlOIpg07K1dNPG+Qz0JzYnCByVAO72yAKGTF97z7hucSMBAAiB LJAsQL2BMRG08FDinWUKGw5q7ZCfmIItfeQ5OniIoQJsnrzGVQo0dOQad5FKByj46w9p cAqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=subject:to:from:date:message-id:in-reply-to:references:user-agent :mime-version:content-type:content-transfer-encoding :x-gm-message-state; bh=98PuBquxt538v6osDKFS9gO9/BtJ9QuhX5GKZWcensE=; b=fOn17NL9Cpok7tQ9yjmjs1sCcJe9ywNbIRTrS2PFAj+6mNmz205UdLNen4Tsx6G42K OObdOrLERzoODmILtTekJ+rpN6TgryShXSz/18DRMrmfEd+Vsip9GwRu4db6tb24vQ1s aEFiV1d2FB6/ZJptThiyDfFhRa3ulPA13GfR3nB75B7AelC34TqhMljw64S9LDpSzcXN 6qFRpDF8Mk9S8Q05KFTox6beRK4zvLbWYf7DitJVC6csIPqI62GeF7N5upi8vvE7hFAa p4JBMnRbf5uMxY7TBdANkqXUgq3tfQtUAyEZcGddqsCvaHoj5N22I5I8su1MjxmLOQIm uUKA== Received: by 10.14.180.2 with SMTP id i2mr19278677eem.1.1354741051288; Wed, 05 Dec 2012 12:57:31 -0800 (PST) Received: from hpza10.eem.corp.google.com ([74.125.121.33]) by gmr-mx.google.com with ESMTPS id g9si764747eeo.1.2012.12.05.12.57.31 (version=TLSv1/SSLv3 cipher=AES128-SHA); Wed, 05 Dec 2012 12:57:31 -0800 (PST) Received: from bhelgaas.mtv.corp.google.com (bhelgaas.mtv.corp.google.com [172.17.131.112]) by hpza10.eem.corp.google.com (Postfix) with ESMTP id E689B20004E for ; Wed, 5 Dec 2012 12:57:30 -0800 (PST) Received: from bhelgaas.mtv.corp.google.com (unknown [IPv6:::1]) by bhelgaas.mtv.corp.google.com (Postfix) with ESMTP id 4CF75180280 for ; Wed, 5 Dec 2012 12:57:30 -0800 (PST) Subject: [PATCH 02/12] PCI: Use standard PCIe Capability Link register field names To: linux-pci@vger.kernel.org From: Bjorn Helgaas Date: Wed, 05 Dec 2012 13:57:30 -0700 Message-ID: <20121205205730.13851.16303.stgit@bhelgaas.mtv.corp.google.com> In-Reply-To: <20121205205724.13851.50508.stgit@bhelgaas.mtv.corp.google.com> References: <20121205205724.13851.50508.stgit@bhelgaas.mtv.corp.google.com> User-Agent: StGit/0.15 MIME-Version: 1.0 X-Gm-Message-State: ALoCoQnyzxIberERJNhh/bHy79XESCZYfT18GnBA0BmEkeuKkhjmkMP3nGD40HUklvZOd6AgoBKRzDoDBYv9Kw0aGlAyXkpn8+ks6rlFQKzBQvuy/ysNBmnNDlPbpqk621t+CRkk9VmFxMMHx21z30GMto2zV2AMZAeA4fspJm88qZ549zksXllF0IctOOswnl0kLtKNFh9u6ULkPzxDgBxN3YVmPj6ohZ/pdZ+z3Xdp9kD2ehE1rfk= Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Use the standard #defines for PCIe Link Status and Capability registers rather than bare numbers. Signed-off-by: Bjorn Helgaas --- drivers/pci/probe.c | 4 ++-- 1 files changed, 2 insertions(+), 2 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/drivers/pci/probe.c b/drivers/pci/probe.c index 81d0667..7ec6973 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -521,7 +521,7 @@ static unsigned char pcie_link_speed[] = { void pcie_update_link_speed(struct pci_bus *bus, u16 linksta) { - bus->cur_bus_speed = pcie_link_speed[linksta & 0xf]; + bus->cur_bus_speed = pcie_link_speed[linksta & PCI_EXP_LNKSTA_CLS]; } EXPORT_SYMBOL_GPL(pcie_update_link_speed); @@ -610,7 +610,7 @@ static void pci_set_bus_speed(struct pci_bus *bus) u16 linksta; pcie_capability_read_dword(bridge, PCI_EXP_LNKCAP, &linkcap); - bus->max_bus_speed = pcie_link_speed[linkcap & 0xf]; + bus->max_bus_speed = pcie_link_speed[linkcap & PCI_EXP_LNKCAP_SLS]; pcie_capability_read_word(bridge, PCI_EXP_LNKSTA, &linksta); pcie_update_link_speed(bus, linksta);