diff options
author | Jacob Keller <jacob.e.keller@intel.com> | 2013-07-31 02:53:16 -0400 |
---|---|---|
committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2013-07-30 21:16:36 -0400 |
commit | 343e51ae6e3f64ed26d96f5560f4962529794c9f (patch) | |
tree | 76286fac3175401ebc777c341ed56c169b3f8920 /drivers/pci | |
parent | a4b6fc6bc61e6aeb24af73c5b195a6aec27d88ff (diff) |
PCI: expose pcie_link_speed and pcix_bus_speed arrays
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
conist arrays and exposes them with an extern header in drivers/pci/pci.h
-v2-
* move extern declarations to drivers/pci/pci.h
CC: Bjorn Helgaas <bhelgaas@google.com>
Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/pci')
-rw-r--r-- | drivers/pci/pci.h | 3 | ||||
-rw-r--r-- | drivers/pci/probe.c | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h index d1182c4a754e..948d1a033a22 100644 --- a/drivers/pci/pci.h +++ b/drivers/pci/pci.h | |||
@@ -6,6 +6,9 @@ | |||
6 | #define PCI_CFG_SPACE_SIZE 256 | 6 | #define PCI_CFG_SPACE_SIZE 256 |
7 | #define PCI_CFG_SPACE_EXP_SIZE 4096 | 7 | #define PCI_CFG_SPACE_EXP_SIZE 4096 |
8 | 8 | ||
9 | extern const unsigned char pcix_bus_speed[]; | ||
10 | extern const unsigned char pcie_link_speed[]; | ||
11 | |||
9 | /* Functions internal to the PCI core code */ | 12 | /* Functions internal to the PCI core code */ |
10 | 13 | ||
11 | int pci_create_sysfs_dev_files(struct pci_dev *pdev); | 14 | int pci_create_sysfs_dev_files(struct pci_dev *pdev); |
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 46ada5c098eb..496c5b082d42 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) | |||
513 | return bridge; | 513 | return bridge; |
514 | } | 514 | } |
515 | 515 | ||
516 | static unsigned char pcix_bus_speed[] = { | 516 | const unsigned char pcix_bus_speed[] = { |
517 | PCI_SPEED_UNKNOWN, /* 0 */ | 517 | PCI_SPEED_UNKNOWN, /* 0 */ |
518 | PCI_SPEED_66MHz_PCIX, /* 1 */ | 518 | PCI_SPEED_66MHz_PCIX, /* 1 */ |
519 | PCI_SPEED_100MHz_PCIX, /* 2 */ | 519 | PCI_SPEED_100MHz_PCIX, /* 2 */ |
@@ -532,7 +532,7 @@ static unsigned char pcix_bus_speed[] = { | |||
532 | PCI_SPEED_133MHz_PCIX_533 /* F */ | 532 | PCI_SPEED_133MHz_PCIX_533 /* F */ |
533 | }; | 533 | }; |
534 | 534 | ||
535 | static unsigned char pcie_link_speed[] = { | 535 | const unsigned char pcie_link_speed[] = { |
536 | PCI_SPEED_UNKNOWN, /* 0 */ | 536 | PCI_SPEED_UNKNOWN, /* 0 */ |
537 | PCIE_SPEED_2_5GT, /* 1 */ | 537 | PCIE_SPEED_2_5GT, /* 1 */ |
538 | PCIE_SPEED_5_0GT, /* 2 */ | 538 | PCIE_SPEED_5_0GT, /* 2 */ |