aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pci
diff options
context:
space:
mode:
authorKenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>2009-09-15 04:25:17 -0400
committerJesse Barnes <jbarnes@virtuousgeek.org>2009-09-17 13:05:36 -0400
commite23727da77109ef856f7a76c1a7d2e2282f600f5 (patch)
tree83d600080ea3cbb8bd064ddad040604e06f077ce /drivers/pci
parent8720d27dabf580278a7719fa8b5783d9878e2d42 (diff)
PCI: pciehp: remove num_slots field
Since PCIe downstream port has only one slot at most, we don't need num_slots field in struct controller. Note that struct controller itself doesn't exist if PCIe downstream port has no slot. Acked-by: Alex Chiang <achiang@hp.com> Signed-off-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com> Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Diffstat (limited to 'drivers/pci')
-rw-r--r--drivers/pci/hotplug/pciehp.h1
-rw-r--r--drivers/pci/hotplug/pciehp_hpc.c1
2 files changed, 0 insertions, 2 deletions
diff --git a/drivers/pci/hotplug/pciehp.h b/drivers/pci/hotplug/pciehp.h
index af397b1291ea..0282bae81eb1 100644
--- a/drivers/pci/hotplug/pciehp.h
+++ b/drivers/pci/hotplug/pciehp.h
@@ -93,7 +93,6 @@ struct event_info {
93struct controller { 93struct controller {
94 struct mutex crit_sect; /* critical section mutex */ 94 struct mutex crit_sect; /* critical section mutex */
95 struct mutex ctrl_lock; /* controller lock */ 95 struct mutex ctrl_lock; /* controller lock */
96 int num_slots; /* Number of slots on ctlr */
97 int slot_num_inc; /* 1 or -1 */ 96 int slot_num_inc; /* 1 or -1 */
98 struct pci_dev *pci_dev; 97 struct pci_dev *pci_dev;
99 struct pcie_device *pcie; /* PCI Express port service */ 98 struct pcie_device *pcie; /* PCI Express port service */
diff --git a/drivers/pci/hotplug/pciehp_hpc.c b/drivers/pci/hotplug/pciehp_hpc.c
index cb0cf2cae7b7..d573338af1a4 100644
--- a/drivers/pci/hotplug/pciehp_hpc.c
+++ b/drivers/pci/hotplug/pciehp_hpc.c
@@ -1025,7 +1025,6 @@ struct controller *pcie_init(struct pcie_device *dev)
1025 ctrl->slot_cap = slot_cap; 1025 ctrl->slot_cap = slot_cap;
1026 ctrl->first_slot = slot_cap >> 19; 1026 ctrl->first_slot = slot_cap >> 19;
1027 ctrl->slot_device_offset = 0; 1027 ctrl->slot_device_offset = 0;
1028 ctrl->num_slots = 1;
1029 ctrl->hpc_ops = &pciehp_hpc_ops; 1028 ctrl->hpc_ops = &pciehp_hpc_ops;
1030 mutex_init(&ctrl->crit_sect); 1029 mutex_init(&ctrl->crit_sect);
1031 mutex_init(&ctrl->ctrl_lock); 1030 mutex_init(&ctrl->ctrl_lock);