diff options
author | Josh Cartwright <joshc@codeaurora.org> | 2014-02-18 17:36:29 +0100 |
---|---|---|
committer | Felipe Balbi <balbi@ti.com> | 2014-02-20 16:17:24 +0100 |
commit | e7d613d1db6f968514ccd7f0cbebba031e6394d2 (patch) | |
tree | 7b9901884722361456ce6b2833fa998d24e5894d /crypto/authenc.c | |
parent | usb: gadget: fix NULL pointer dereference (diff) | |
download | linux-e7d613d1db6f968514ccd7f0cbebba031e6394d2.tar.xz linux-e7d613d1db6f968514ccd7f0cbebba031e6394d2.zip |
usb: phy: msm: fix compilation errors when !CONFIG_PM_SLEEP
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>
Diffstat (limited to 'crypto/authenc.c')
0 files changed, 0 insertions, 0 deletions