From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Sun, 27 Jul 2014 21:55:35 +0000 (+0200)
Subject: Merge branches 'acpi-pnp' and 'acpi-pci'
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=91af125c33af02340355b96a6ed0761e5132cde0;p=deliverable%2Flinux.git

Merge branches 'acpi-pnp' and 'acpi-pci'

* acpi-pnp:
  ACPI / PNP: Use ACPI_COMPANION() instead of ACPI_HANDLE()
  ACPI / PNP: do ACPI binding directly

* acpi-pci:
  ACPI / PCI: Use ACPI_COMPANION() instead of ACPI_HANDLE()
---

91af125c33af02340355b96a6ed0761e5132cde0
diff --cc drivers/pci/pci-acpi.c
index 7b8b2298840a,ca4927ba8433,740efa8be969..37263b0ebfe3
--- a/drivers/pci/pci-acpi.c
+++ b/drivers/pci/pci-acpi.c
@@@@ -65,12 -65,23 -65,23 +65,12 @@@@ static void pci_acpi_wake_dev(struct wo
   }
   
   /**
 -- * pci_acpi_add_bus_pm_notifier - Register PM notifier for given PCI bus.
 -- * @dev: ACPI device to add the notifier for.
 -- * @pci_bus: PCI bus to walk checking for PME status if an event is signaled.
 -  */
 - acpi_status pci_acpi_add_bus_pm_notifier(struct acpi_device *dev,
 - 					 struct pci_bus *pci_bus)
 - {
 - 	return acpi_add_pm_notifier(dev, pci_acpi_wake_bus, pci_bus);
 - }
 - 
 - /**
 -  * pci_acpi_remove_bus_pm_notifier - Unregister PCI bus PM notifier.
 -  * @dev: ACPI device to remove the notifier from.
 ++ * pci_acpi_add_bus_pm_notifier - Register PM notifier for root PCI bus.
 ++ * @dev: PCI root bridge ACPI device.
    */
 - acpi_status pci_acpi_remove_bus_pm_notifier(struct acpi_device *dev)
  -acpi_status pci_acpi_add_bus_pm_notifier(struct acpi_device *dev,
  -					 struct pci_bus *pci_bus)
 ++acpi_status pci_acpi_add_bus_pm_notifier(struct acpi_device *dev)
   {
  -	return acpi_add_pm_notifier(dev, pci_acpi_wake_bus, pci_bus);
  -}
  -
  -/**
  - * pci_acpi_remove_bus_pm_notifier - Unregister PCI bus PM notifier.
  - * @dev: ACPI device to remove the notifier from.
  - */
  -acpi_status pci_acpi_remove_bus_pm_notifier(struct acpi_device *dev)
  -{
 --	return acpi_remove_pm_notifier(dev, pci_acpi_wake_bus);
 ++	return acpi_add_pm_notifier(dev, NULL, pci_acpi_wake_bus);
   }
   
   /**