Skip to main content

Browse the archive

https://github.com/torvalds/linux
17 May 2024, 11:00:25 UTC
Revision e7d613d1db6f968514ccd7f0cbebba031e6394d2 authored by Josh Cartwright on 18 February 2014, 16:36:29 UTC, committed by Felipe Balbi on 20 February 2014, 15:17:24 UTC 
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>
1 parent f0f4220
History
Tip revision: e7d613d1db6f968514ccd7f0cbebba031e6394d2 authored by Josh Cartwright on 18 February 2014, 16:36:29 UTC
usb: phy: msm: fix compilation errors when !CONFIG_PM_SLEEP
Tip revision: e7d613d
File Mode Size
Makefile -rw-r--r-- 394 bytes
compat.c -rw-r--r-- 19.2 KB
compat_mq.c -rw-r--r-- 4.1 KB
ipc_sysctl.c -rw-r--r-- 7.0 KB
ipcns_notifier.c -rw-r--r-- 2.2 KB
mq_sysctl.c -rw-r--r-- 2.7 KB
mqueue.c -rw-r--r-- 35.4 KB
msg.c -rw-r--r-- 24.0 KB
msgutil.c -rw-r--r-- 3.6 KB
namespace.c -rw-r--r-- 4.7 KB
sem.c -rw-r--r-- 54.8 KB
shm.c -rw-r--r-- 31.9 KB
syscall.c -rw-r--r-- 2.3 KB
util.c -rw-r--r-- 22.3 KB
util.h -rw-r--r-- 6.4 KB
back to top