From 11b0361e43209ff8dcdb69dff4808f1f0bfe8762 Mon Sep 17 00:00:00 2001
From: Alex Chiang <achiang@hp.com>
Date: Mon, 20 Oct 2008 17:40:52 -0600
Subject: [PATCH] --- yaml --- r: 117211 b: refs/heads/master c:
 828f37683e6d3ab5912989df0d04201db7ad798e h: refs/heads/master i:   117209:
 2d491b81832e3485e341ea98059aaae69f42b1f6   117207:
 531bd32d20f0a5e60a84e7becaa126a3dbb1f03a v: v3

---
 [refs]                                       | 2 +-
 trunk/drivers/acpi/pci_slot.c                | 2 +-
 trunk/drivers/pci/hotplug/pci_hotplug_core.c | 2 +-
 trunk/drivers/pci/slot.c                     | 4 +++-
 trunk/include/linux/pci.h                    | 3 ++-
 5 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index d4bdfa9a7496..5813c97a002b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d25b7c8d6ba2735602003d75a28894772fe8ad6a
+refs/heads/master: 828f37683e6d3ab5912989df0d04201db7ad798e
diff --git a/trunk/drivers/acpi/pci_slot.c b/trunk/drivers/acpi/pci_slot.c
index d5b4ef898879..8d4a568be1cc 100644
--- a/trunk/drivers/acpi/pci_slot.c
+++ b/trunk/drivers/acpi/pci_slot.c
@@ -150,7 +150,7 @@ register_slot(acpi_handle handle, u32 lvl, void *context, void **rv)
 	}
 
 	snprintf(name, sizeof(name), "%u", (u32)sun);
-	pci_slot = pci_create_slot(pci_bus, device, name);
+	pci_slot = pci_create_slot(pci_bus, device, name, NULL);
 	if (IS_ERR(pci_slot)) {
 		err("pci_create_slot returned %ld\n", PTR_ERR(pci_slot));
 		kfree(slot);
diff --git a/trunk/drivers/pci/hotplug/pci_hotplug_core.c b/trunk/drivers/pci/hotplug/pci_hotplug_core.c
index 02b1ae12a2e6..1cdeb642fdcf 100644
--- a/trunk/drivers/pci/hotplug/pci_hotplug_core.c
+++ b/trunk/drivers/pci/hotplug/pci_hotplug_core.c
@@ -579,7 +579,7 @@ int pci_hp_register(struct hotplug_slot *slot, struct pci_bus *bus, int slot_nr,
 	 * driver and call it here again. If we've already created the
 	 * pci_slot, the interface will simply bump the refcount.
 	 */
-	pci_slot = pci_create_slot(bus, slot_nr, name);
+	pci_slot = pci_create_slot(bus, slot_nr, name, slot);
 	if (IS_ERR(pci_slot))
 		return PTR_ERR(pci_slot);
 
diff --git a/trunk/drivers/pci/slot.c b/trunk/drivers/pci/slot.c
index b9b90ab6b861..0e009c3ba5fd 100644
--- a/trunk/drivers/pci/slot.c
+++ b/trunk/drivers/pci/slot.c
@@ -83,6 +83,7 @@ static struct kobj_type pci_slot_ktype = {
  * @parent: struct pci_bus of parent bridge
  * @slot_nr: PCI_SLOT(pci_dev->devfn) or -1 for placeholder
  * @name: user visible string presented in /sys/bus/pci/slots/<name>
+ * @hotplug: set if caller is hotplug driver, NULL otherwise
  *
  * PCI slots have first class attributes such as address, speed, width,
  * and a &struct pci_slot is used to manage them. This interface will
@@ -111,7 +112,8 @@ static struct kobj_type pci_slot_ktype = {
  */
 
 struct pci_slot *pci_create_slot(struct pci_bus *parent, int slot_nr,
-				 const char *name)
+				 const char *name,
+				 struct hotplug_slot *hotplug)
 {
 	struct pci_dev *dev;
 	struct pci_slot *slot;
diff --git a/trunk/include/linux/pci.h b/trunk/include/linux/pci.h
index 41717ae9807e..9a8cee623301 100644
--- a/trunk/include/linux/pci.h
+++ b/trunk/include/linux/pci.h
@@ -510,7 +510,8 @@ struct pci_bus *pci_create_bus(struct device *parent, int bus,
 struct pci_bus *pci_add_new_bus(struct pci_bus *parent, struct pci_dev *dev,
 				int busnr);
 struct pci_slot *pci_create_slot(struct pci_bus *parent, int slot_nr,
-				 const char *name);
+				 const char *name,
+				 struct hotplug_slot *hotplug);
 void pci_destroy_slot(struct pci_slot *slot);
 void pci_renumber_slot(struct pci_slot *slot, int slot_nr);
 int pci_scan_slot(struct pci_bus *bus, int devfn);