diff options
author | Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com> | 2009-05-12 23:17:04 -0400 |
---|---|---|
committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2009-06-18 16:57:26 -0400 |
commit | 5cde89d80172a393e49077d2450545b97ac8d972 (patch) | |
tree | 86d5810ca54f0be2079c294e90ad3b3c9504bd69 /drivers | |
parent | 4d246e458918d469ad645fd5f937ac22982e0466 (diff) |
PCI ASPM: cleanup misc in struct pcie_link_state
Cleanup for some fields in pcie_link_state.
- Add comments.
- make "downstream_has_switch" field 1-bit.
Acked-by: Shaohua Li <shaohua.li@intel.com>
Signed-off-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/pci/pcie/aspm.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c index 2d7e695b7589..a1ae9b6f3995 100644 --- a/drivers/pci/pcie/aspm.c +++ b/drivers/pci/pcie/aspm.c | |||
@@ -32,13 +32,11 @@ struct aspm_latency { | |||
32 | }; | 32 | }; |
33 | 33 | ||
34 | struct pcie_link_state { | 34 | struct pcie_link_state { |
35 | struct list_head sibling; | 35 | struct pci_dev *pdev; /* Upstream component of the Link */ |
36 | struct pci_dev *pdev; | 36 | struct pcie_link_state *parent; /* pointer to the parent Link state */ |
37 | bool downstream_has_switch; | 37 | struct list_head sibling; /* node in link_list */ |
38 | 38 | struct list_head children; /* list of child link states */ | |
39 | struct pcie_link_state *parent; | 39 | struct list_head link; /* node in parent's children list */ |
40 | struct list_head children; | ||
41 | struct list_head link; | ||
42 | 40 | ||
43 | /* ASPM state */ | 41 | /* ASPM state */ |
44 | u32 aspm_support:2; /* Supported ASPM state */ | 42 | u32 aspm_support:2; /* Supported ASPM state */ |
@@ -50,6 +48,8 @@ struct pcie_link_state { | |||
50 | u32 clkpm_enabled:1; /* Current Clock PM state */ | 48 | u32 clkpm_enabled:1; /* Current Clock PM state */ |
51 | u32 clkpm_default:1; /* Default Clock PM state by BIOS */ | 49 | u32 clkpm_default:1; /* Default Clock PM state by BIOS */ |
52 | 50 | ||
51 | u32 has_switch:1; /* Downstream has switches? */ | ||
52 | |||
53 | /* Latencies */ | 53 | /* Latencies */ |
54 | struct aspm_latency latency; /* Exit latency */ | 54 | struct aspm_latency latency; /* Exit latency */ |
55 | /* | 55 | /* |
@@ -648,7 +648,7 @@ void pcie_aspm_init_link_state(struct pci_dev *pdev) | |||
648 | if (!link_state) | 648 | if (!link_state) |
649 | goto unlock_out; | 649 | goto unlock_out; |
650 | 650 | ||
651 | link_state->downstream_has_switch = pcie_aspm_downstream_has_switch(pdev); | 651 | link_state->has_switch = pcie_aspm_downstream_has_switch(pdev); |
652 | INIT_LIST_HEAD(&link_state->children); | 652 | INIT_LIST_HEAD(&link_state->children); |
653 | INIT_LIST_HEAD(&link_state->link); | 653 | INIT_LIST_HEAD(&link_state->link); |
654 | if (pdev->bus->self) {/* this is a switch */ | 654 | if (pdev->bus->self) {/* this is a switch */ |
@@ -679,7 +679,7 @@ void pcie_aspm_init_link_state(struct pci_dev *pdev) | |||
679 | link_state->pdev = pdev; | 679 | link_state->pdev = pdev; |
680 | list_add(&link_state->sibling, &link_list); | 680 | list_add(&link_state->sibling, &link_list); |
681 | 681 | ||
682 | if (link_state->downstream_has_switch) { | 682 | if (link_state->has_switch) { |
683 | /* | 683 | /* |
684 | * If link has switch, delay the link config. The leaf link | 684 | * If link has switch, delay the link config. The leaf link |
685 | * initialization will config the whole hierarchy. but we must | 685 | * initialization will config the whole hierarchy. but we must |