From 2a3b20fe38f37359b4d29ccfc2b979bae4fc0620 Mon Sep 17 00:00:00 2001
From: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Date: Thu, 26 Jun 2008 20:06:24 +0900
Subject: [PATCH] --- yaml --- r: 102271 b: refs/heads/master c:
 b97089400d44b9e90ce5029a2e458cd087473c74 h: refs/heads/master i:   102269:
 cd35d06cf8b5e9f4f433a362462366af8673a410   102267:
 87a40b5af2fcb77d858f9f09771d010d5fd2db22   102263:
 c68ed791424b852d254adb121bf3a33f29e787da   102255:
 1094857f63462b08649aaec61749fc9ae8880ad0   102239:
 2a96de74649acfa91c111ec4d6fa2a8803ae6c90   102207:
 388455551041bdf8d79e9db7076fc39cb9acdfdc   102143:
 3327e60d011cd0cc051c483398851504a04a5366 v: v3

---
 [refs]                                  | 2 +-
 trunk/drivers/pci/hotplug/pciehp_core.c | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 991de20097d4..c60b3425a24b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3aa50c44628629a6d58f93e0a1244e95a874884e
+refs/heads/master: b97089400d44b9e90ce5029a2e458cd087473c74
diff --git a/trunk/drivers/pci/hotplug/pciehp_core.c b/trunk/drivers/pci/hotplug/pciehp_core.c
index d0fb56936911..3677495c4f91 100644
--- a/trunk/drivers/pci/hotplug/pciehp_core.c
+++ b/trunk/drivers/pci/hotplug/pciehp_core.c
@@ -405,7 +405,7 @@ static int pciehp_probe(struct pcie_device *dev, const struct pcie_port_service_
 		dbg("%s: controller initialization failed\n", PCIE_MODULE_NAME);
 		goto err_out_none;
 	}
-	pci_set_drvdata(pdev, ctrl);
+	set_service_data(dev, ctrl);
 
 	/* Setup the slot information structures */
 	rc = init_slots(ctrl);
@@ -445,8 +445,7 @@ static int pciehp_probe(struct pcie_device *dev, const struct pcie_port_service_
 
 static void pciehp_remove (struct pcie_device *dev)
 {
-	struct pci_dev *pdev = dev->port;
-	struct controller *ctrl = pci_get_drvdata(pdev);
+	struct controller *ctrl = get_service_data(dev);
 
 	cleanup_slots(ctrl);
 	ctrl->hpc_ops->release_ctlr(ctrl);
@@ -463,8 +462,7 @@ static int pciehp_resume (struct pcie_device *dev)
 {
 	printk("%s ENTRY\n", __func__);
 	if (pciehp_force) {
-		struct pci_dev *pdev = dev->port;
-		struct controller *ctrl = pci_get_drvdata(pdev);
+		struct controller *ctrl = get_service_data(dev);
 		struct slot *t_slot;
 		u8 status;