From aa412ca5de3c5ca23586d6f342966f73deca30f1 Mon Sep 17 00:00:00 2001 From: Kenji Kaneshige Date: Tue, 15 Sep 2009 17:25:17 +0900 Subject: [PATCH] --- yaml --- r: 165963 b: refs/heads/master c: e23727da77109ef856f7a76c1a7d2e2282f600f5 h: refs/heads/master i: 165961: 922e4677f8918ffd75b6514574c5b5e30c8f52db 165959: 27969b25d014ee0229e147519bbabbb02e556b06 v: v3 --- [refs] | 2 +- trunk/drivers/pci/hotplug/pciehp.h | 1 - trunk/drivers/pci/hotplug/pciehp_hpc.c | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 584029341748..30753f6c07a2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8720d27dabf580278a7719fa8b5783d9878e2d42 +refs/heads/master: e23727da77109ef856f7a76c1a7d2e2282f600f5 diff --git a/trunk/drivers/pci/hotplug/pciehp.h b/trunk/drivers/pci/hotplug/pciehp.h index af397b1291ea..0282bae81eb1 100644 --- a/trunk/drivers/pci/hotplug/pciehp.h +++ b/trunk/drivers/pci/hotplug/pciehp.h @@ -93,7 +93,6 @@ struct event_info { struct controller { struct mutex crit_sect; /* critical section mutex */ struct mutex ctrl_lock; /* controller lock */ - int num_slots; /* Number of slots on ctlr */ int slot_num_inc; /* 1 or -1 */ struct pci_dev *pci_dev; struct pcie_device *pcie; /* PCI Express port service */ diff --git a/trunk/drivers/pci/hotplug/pciehp_hpc.c b/trunk/drivers/pci/hotplug/pciehp_hpc.c index cb0cf2cae7b7..d573338af1a4 100644 --- a/trunk/drivers/pci/hotplug/pciehp_hpc.c +++ b/trunk/drivers/pci/hotplug/pciehp_hpc.c @@ -1025,7 +1025,6 @@ struct controller *pcie_init(struct pcie_device *dev) ctrl->slot_cap = slot_cap; ctrl->first_slot = slot_cap >> 19; ctrl->slot_device_offset = 0; - ctrl->num_slots = 1; ctrl->hpc_ops = &pciehp_hpc_ops; mutex_init(&ctrl->crit_sect); mutex_init(&ctrl->ctrl_lock);