---

yaml
---
r: 102271
b: refs/heads/master
c: b970894
h: refs/heads/master
i:
  102269: cd35d06
  102267: 87a40b5
  102263: c68ed79
  102255: 1094857
  102239: 2a96de7
  102207: 3884555
  102143: 3327e60
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3aa50c44628629a6d58f93e0a1244e95a874884e
+refs/heads/master: b97089400d44b9e90ce5029a2e458cd087473c74

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;