From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Mon, 8 Dec 2014 19:00:44 +0000 (+0100)
Subject: Merge branch 'pm-runtime'
X-Git-Tag: firefly_0821_release~176^2~2728^2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=e3d857e1ae787a5e268bc89425aadae09c8e95a4;p=firefly-linux-kernel-4.4.55.git

Merge branch 'pm-runtime'

* pm-runtime: (25 commits)
  i2c-omap / PM: Drop CONFIG_PM_RUNTIME from i2c-omap.c
  dmaengine / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
  drivers: sh / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
  e1000e / igb / PM: Eliminate CONFIG_PM_RUNTIME
  MMC / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
  MFD / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
  misc / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
  media / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
  input / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
  iio / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
  hsi / OMAP / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
  i2c-hid / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
  drm / exynos / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
  gpio / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
  hwrandom / exynos / PM: Use CONFIG_PM in #ifdef
  block / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
  USB / PM: Drop CONFIG_PM_RUNTIME from the USB core
  PM: Merge the SET*_RUNTIME_PM_OPS() macros
  PM / Kconfig: Do not select PM directly from Kconfig files
  PCI / PM: Drop CONFIG_PM_RUNTIME from the PCI core
  ...
---

e3d857e1ae787a5e268bc89425aadae09c8e95a4
diff --cc drivers/usb/host/xhci-hub.c
index 388cfd83b6b6,f674abd76865..a7865c4b0498
--- a/drivers/usb/host/xhci-hub.c
+++ b/drivers/usb/host/xhci-hub.c
@@@ -1145,10 -1146,12 +1145,10 @@@ int xhci_bus_suspend(struct usb_hcd *hc
  			set_bit(port_index, &bus_state->bus_suspended);
  		}
  		/* USB core sets remote wake mask for USB 3.0 hubs,
- 		 * including the USB 3.0 roothub, but only if CONFIG_PM_RUNTIME
+ 		 * including the USB 3.0 roothub, but only if CONFIG_PM
  		 * is enabled, so also enable remote wake here.
  		 */
 -		if (hcd->self.root_hub->do_remote_wakeup
 -				&& device_may_wakeup(hcd->self.controller)) {
 -
 +		if (hcd->self.root_hub->do_remote_wakeup) {
  			if (t1 & PORT_CONNECT) {
  				t2 |= PORT_WKOC_E | PORT_WKDISC_E;
  				t2 &= ~PORT_WKCONN_E;