mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-21 16:29:59 +00:00
e7d613d1db
Both the PM_RUNTIME and PM_SLEEP callbacks call into the common
msm_otg_{suspend,resume} routines, however these routines are only being
built when CONFIG_PM_SLEEP. In addition, msm_otg_{suspend,resume} also
depends on msm_hsusb_config_vddcx(), which is only built when
CONFIG_PM_SLEEP.
Fix the CONFIG_PM_RUNTIME, !CONFIG_PM_SLEEP case by changing the
preprocessor conditional, and moving msm_hsusb_config_vddcx().
While we're here, eliminate the CONFIG_PM conditional for setting
up the dev_pm_ops.
This address the following errors Russell King has hit doing randconfig
builds:
drivers/usb/phy/phy-msm-usb.c: In function 'msm_otg_runtime_suspend':
drivers/usb/phy/phy-msm-usb.c:1691:2: error: implicit declaration of function 'msm_otg_suspend'
drivers/usb/phy/phy-msm-usb.c: In function 'msm_otg_runtime_resume':
drivers/usb/phy/phy-msm-usb.c:1699:2: error: implicit declaration of function 'msm_otg_resume'
Cc: Ivan T. Ivanov <iivanov@mm-sol.com>
Reported-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Josh Cartwright <joshc@codeaurora.org>
Signed-off-by: Felipe Balbi <balbi@ti.com>
|
||
|---|---|---|
| .. | ||
| am35x-phy-control.h | ||
| Kconfig | ||
| Makefile | ||
| of.c | ||
| phy-ab8500-usb.c | ||
| phy-am335x-control.c | ||
| phy-am335x.c | ||
| phy-fsl-usb.c | ||
| phy-fsl-usb.h | ||
| phy-fsm-usb.c | ||
| phy-generic.c | ||
| phy-generic.h | ||
| phy-gpio-vbus-usb.c | ||
| phy-isp1301-omap.c | ||
| phy-isp1301.c | ||
| phy-keystone.c | ||
| phy-msm-usb.c | ||
| phy-mv-u3d-usb.c | ||
| phy-mv-u3d-usb.h | ||
| phy-mv-usb.c | ||
| phy-mv-usb.h | ||
| phy-mxs-usb.c | ||
| phy-omap-control.c | ||
| phy-omap-otg.c | ||
| phy-omap-usb3.c | ||
| phy-rcar-gen2-usb.c | ||
| phy-rcar-usb.c | ||
| phy-samsung-usb.c | ||
| phy-samsung-usb.h | ||
| phy-samsung-usb2.c | ||
| phy-samsung-usb3.c | ||
| phy-tahvo.c | ||
| phy-tegra-usb.c | ||
| phy-twl6030-usb.c | ||
| phy-ulpi-viewport.c | ||
| phy-ulpi.c | ||
| phy.c | ||