Merge branch 'pci/oliver-pciehp-resume' into next

* pci/oliver-pciehp-resume:
  PCI: pciehp: Always implement resume, regardless of pciehp_force param

drivers/pci/hotplug/pciehp_core.c

@@ -300,24 +300,24 @@ static int pciehp_suspend (struct pcie_device *dev)
 
 static int pciehp_resume (struct pcie_device *dev)
 {
+	struct controller *ctrl;
+	struct slot *slot;
+	u8 status;
+
 	dev_info(&dev->device, "%s ENTRY\n", __func__);
-	if (pciehp_force) {
+	ctrl = get_service_data(dev);
-		struct controller *ctrl = get_service_data(dev);
-		struct slot *slot;
-		u8 status;
 
-		/* reinitialize the chipset's event detection logic */
+	/* reinitialize the chipset's event detection logic */
-		pcie_enable_notification(ctrl);
+	pcie_enable_notification(ctrl);
 
-		slot = ctrl->slot;
+	slot = ctrl->slot;
 
-		/* Check if slot is occupied */
+	/* Check if slot is occupied */
-		pciehp_get_adapter_status(slot, &status);
+	pciehp_get_adapter_status(slot, &status);
-		if (status)
+	if (status)
-			pciehp_enable_slot(slot);
+		pciehp_enable_slot(slot);
-		else
+	else
-			pciehp_disable_slot(slot);
+		pciehp_disable_slot(slot);
-	}
 	return 0;
 }
 #endif /* PM */