---

yaml --- r: 165974 b: refs/heads/master c: 07a0969 h: refs/heads/master v: v3
git-mirror · Sep 17, 2009 · 8b9ec93 · 8b9ec93
1 parent de4cff6
commit 8b9ec93
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 82a9e79ef132cbf77de58aae35c1a14237f2fcde
+refs/heads/master: 07a09694de556f307b1c5035cdf0f17c6243d1cd
diff --git a/trunk/drivers/pci/hotplug/pciehp.h b/trunk/drivers/pci/hotplug/pciehp.h
@@ -73,7 +73,6 @@ do {									\
 #define SLOT_NAME_SIZE 10
 struct slot {
 	u8 state;
-	u32 number;
 	struct controller *ctrl;
 	struct hotplug_slot *hotplug_slot;
 	struct delayed_work work;	/* work for button event */

diff --git a/trunk/drivers/pci/hotplug/pciehp_core.c b/trunk/drivers/pci/hotplug/pciehp_core.c
@@ -121,11 +121,11 @@ static int init_slot(struct controller *ctrl)
 	hotplug->release = &release_slot;
 	hotplug->ops = &pciehp_hotplug_slot_ops;
 	slot->hotplug_slot = hotplug;
-	snprintf(name, SLOT_NAME_SIZE, "%u", slot->number);
+	snprintf(name, SLOT_NAME_SIZE, "%u", PSN(ctrl));
 
 	ctrl_dbg(ctrl, "Registering domain:bus:dev=%04x:%02x:00 sun=%x\n",
 		 pci_domain_nr(ctrl->pcie->port->subordinate),
-		 ctrl->pcie->port->subordinate->number, slot->number);
+		 ctrl->pcie->port->subordinate->number, PSN(ctrl));
 	retval = pci_hp_register(hotplug,
 				 ctrl->pcie->port->subordinate, 0, name);
 	if (retval) {

diff --git a/trunk/drivers/pci/hotplug/pciehp_hpc.c b/trunk/drivers/pci/hotplug/pciehp_hpc.c
@@ -901,7 +901,6 @@ static int pcie_init_slot(struct controller *ctrl)
 		return -ENOMEM;
 
 	slot->ctrl = ctrl;
-	slot->number = PSN(ctrl);
 	mutex_init(&slot->lock);
 	INIT_DELAYED_WORK(&slot->work, pciehp_queue_pushbutton_work);
 	ctrl->slot = slot;