xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PCI: Unify pcie_link_speed and pci_bus_speed

Browse Source 
These enums must not overlap anyway, since we only have a single
pci_bus_speed_strings array.  Use a single enum, and move it to
pci.h.  Add 'SPEED' to the pcie names to make it clear what they are.

Signed-off-by: Matthew Wilcox <willy@linux.intel.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
This commit is contained in:
Matthew Wilcox
2009-12-13 08:11:31 -05:00
committed by Jesse Barnes
parent f07852d644
commit 536c8cb49e
3 changed files with 29 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/pci/hotplug/pciehp_hpc.c
View File

@@ -613,7 +613,7 @@ static irqreturn_t pcie_isr(int irq, void *dev_id)
int pciehp_get_max_link_speed(struct slot *slot, enum pci_bus_speed *value)
{
struct controller *ctrl = slot->ctrl;
enum pcie_link_speed lnk_speed;
enum pci_bus_speed lnk_speed;
u32 lnk_cap;
int retval = 0;
@@ -625,13 +625,13 @@ int pciehp_get_max_link_speed(struct slot *slot, enum pci_bus_speed *value)
switch (lnk_cap & 0x000F) {
case 1:
lnk_speed = PCIE_2_5GB;
lnk_speed = PCIE_SPEED_2_5GT;
break;
case 2:
lnk_speed = PCIE_5_0GB;
lnk_speed = PCIE_SPEED_5_0GT;
break;
default:
lnk_speed = PCIE_LNK_SPEED_UNKNOWN;
lnk_speed = PCI_SPEED_UNKNOWN;
break;
}
@@ -694,7 +694,7 @@ int pciehp_get_max_lnk_width(struct slot *slot,
int pciehp_get_cur_link_speed(struct slot *slot, enum pci_bus_speed *value)
{
struct controller *ctrl = slot->ctrl;
enum pcie_link_speed lnk_speed = PCI_SPEED_UNKNOWN;
enum pci_bus_speed lnk_speed = PCI_SPEED_UNKNOWN;
int retval = 0;
u16 lnk_status;
@@ -707,13 +707,13 @@ int pciehp_get_cur_link_speed(struct slot *slot, enum pci_bus_speed *value)
switch (lnk_status & PCI_EXP_LNKSTA_CLS) {
case 1:
lnk_speed = PCIE_2_5GB;
lnk_speed = PCIE_SPEED_2_5GT;
break;
case 2:
lnk_speed = PCIE_5_0GB;
lnk_speed = PCIE_SPEED_5_0GT;
break;
default:
lnk_speed = PCIE_LNK_SPEED_UNKNOWN;
lnk_speed = PCI_SPEED_UNKNOWN;
break;
}