aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pci/hotplug/pciehp_ctrl.c
diff options
context:
space:
mode:
authorKenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>2009-09-15 04:27:24 -0400
committerJesse Barnes <jbarnes@virtuousgeek.org>2009-09-17 13:05:58 -0400
commit0e3631593c38e8a09bf58a46c6f6a3426d3ad0f0 (patch)
treee5b47555b2f4611c9c478367fe9000d3812c62b1 /drivers/pci/hotplug/pciehp_ctrl.c
parentd689f7eb364a51ccd857605dede0d6c22a1aad91 (diff)
PCI: pciehp: remove hp_slot field
The hp_slot field is to identify the slot under the same controller. But, since PCIe downstream port has only one slot at most, it is meaningless and we don't need it. 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/hotplug/pciehp_ctrl.c')
-rw-r--r--drivers/pci/hotplug/pciehp_ctrl.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/pci/hotplug/pciehp_ctrl.c b/drivers/pci/hotplug/pciehp_ctrl.c
index 7e31728d8ca4..1b5e476a48b9 100644
--- a/drivers/pci/hotplug/pciehp_ctrl.c
+++ b/drivers/pci/hotplug/pciehp_ctrl.c
@@ -210,8 +210,8 @@ static int board_added(struct slot *p_slot)
210 struct controller *ctrl = p_slot->ctrl; 210 struct controller *ctrl = p_slot->ctrl;
211 struct pci_bus *parent = ctrl->pci_dev->subordinate; 211 struct pci_bus *parent = ctrl->pci_dev->subordinate;
212 212
213 ctrl_dbg(ctrl, "%s: slot device, slot offset, hp slot = 0, %d, %d\n", 213 ctrl_dbg(ctrl, "%s: slot device, slot offset = 0, %d\n",
214 __func__, ctrl->slot_device_offset, p_slot->hp_slot); 214 __func__, ctrl->slot_device_offset);
215 215
216 if (POWER_CTRL(ctrl)) { 216 if (POWER_CTRL(ctrl)) {
217 /* Power on slot */ 217 /* Power on slot */
@@ -268,8 +268,6 @@ static int remove_board(struct slot *p_slot)
268 if (retval) 268 if (retval)
269 return retval; 269 return retval;
270 270
271 ctrl_dbg(ctrl, "%s: hp_slot = %d\n", __func__, p_slot->hp_slot);
272
273 if (POWER_CTRL(ctrl)) { 271 if (POWER_CTRL(ctrl)) {
274 /* power off slot */ 272 /* power off slot */
275 retval = p_slot->hpc_ops->power_off_slot(p_slot); 273 retval = p_slot->hpc_ops->power_off_slot(p_slot);