From patchwork Mon Jul 29 12:52:04 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kirsher, Jeffrey T" X-Patchwork-Id: 2834936 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 4C166C0319 for ; Mon, 29 Jul 2013 12:53:01 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 854D6201E4 for ; Mon, 29 Jul 2013 12:52:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 54406201DD for ; Mon, 29 Jul 2013 12:52:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753744Ab3G2Mwd (ORCPT ); Mon, 29 Jul 2013 08:52:33 -0400 Received: from mga03.intel.com ([143.182.124.21]:64394 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753804Ab3G2Mwb (ORCPT ); Mon, 29 Jul 2013 08:52:31 -0400 Received: from azsmga001.ch.intel.com ([10.2.17.19]) by azsmga101.ch.intel.com with ESMTP; 29 Jul 2013 05:52:31 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.89,769,1367996400"; d="scan'208";a="338440757" Received: from unknown (HELO jtkirshe-mobl.amr.corp.intel.com) ([10.255.14.40]) by azsmga001.ch.intel.com with ESMTP; 29 Jul 2013 05:52:23 -0700 From: Jeff Kirsher To: davem@davemloft.net, bhelgaas@google.com Cc: Jacob Keller , netdev@vger.kernel.org, gospo@redhat.com, sassmann@redhat.com, linux-pci@vger.kernel.org, Jeff Kirsher Subject: [net-next 08/15] pci: expose pcie_link_speed and pcix_bus_speed arrays Date: Mon, 29 Jul 2013 05:52:04 -0700 Message-Id: <1375102331-23905-9-git-send-email-jeffrey.t.kirsher@intel.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1375102331-23905-1-git-send-email-jeffrey.t.kirsher@intel.com> References: <1375102331-23905-1-git-send-email-jeffrey.t.kirsher@intel.com> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Spam-Status: No, score=-8.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Jacob Keller pcie_link_speed and pcix_bus_speed are arrays used by probe.c to correctly convert lnksta register values into the pci_bus_speed enum. These static arrays are useful outside probe for this purpose. This patch makes these defines into const arrays and exposes them with an extern header in linux/include/pci.h Signed-off-by: Jacob Keller Tested-by: Phil Schmitt Signed-off-by: Jeff Kirsher --- drivers/pci/probe.c | 4 ++-- include/linux/pci.h | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 46ada5c..496c5b0 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -513,7 +513,7 @@ static struct pci_host_bridge *pci_alloc_host_bridge(struct pci_bus *b) return bridge; } -static unsigned char pcix_bus_speed[] = { +const unsigned char pcix_bus_speed[] = { PCI_SPEED_UNKNOWN, /* 0 */ PCI_SPEED_66MHz_PCIX, /* 1 */ PCI_SPEED_100MHz_PCIX, /* 2 */ @@ -532,7 +532,7 @@ static unsigned char pcix_bus_speed[] = { PCI_SPEED_133MHz_PCIX_533 /* F */ }; -static unsigned char pcie_link_speed[] = { +const unsigned char pcie_link_speed[] = { PCI_SPEED_UNKNOWN, /* 0 */ PCIE_SPEED_2_5GT, /* 1 */ PCIE_SPEED_5_0GT, /* 2 */ diff --git a/include/linux/pci.h b/include/linux/pci.h index 0fd1f15..95ff993 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -120,6 +120,9 @@ typedef int __bitwise pci_power_t; /* Remember to update this when the list above changes! */ extern const char *pci_power_names[]; +extern const unsigned char pcix_bus_speed[]; +extern const unsigned char pcie_link_speed[]; + static inline const char *pci_power_name(pci_power_t state) { return pci_power_names[1 + (int) state];