evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

slimbus: Remove use of PM_RUNTIME feature flag

Browse source 
Remove the use of PM_RUNTIME feature flag which is obsoleted on newer
kernel versions. Instead use PM feature flag to condiitionally compile
RPM callbacks.

Change-Id: I775c89f79b698bf3f20fdb655216027e58e7059d
Signed-off-by: Girish Mahadevan <girishm@codeaurora.org>
This commit is contained in:
Girish Mahadevan 2016-02-19 10:16:58 -07:00 • committed by David Keitel
parent 1f6c29a46f
commit 3dae886c11
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/slimbus/slim-msm-ctrl.c
View file

@ -1462,7 +1462,7 @@ static int msm_slim_remove(struct platform_device *pdev)
return 0;
}
#ifdef CONFIG_PM_RUNTIME
#ifdef CONFIG_PM
static int msm_slim_runtime_idle(struct device *device)
{
struct platform_device *pdev = to_platform_device(device);

2
drivers/slimbus/slim-msm-ngd.c
View file

@ -1748,7 +1748,7 @@ static int ngd_slim_remove(struct platform_device *pdev)
return 0;
}
#ifdef CONFIG_PM_RUNTIME
#ifdef CONFIG_PM
static int ngd_slim_runtime_idle(struct device *device)
{
struct platform_device *pdev = to_platform_device(device);

4
drivers/slimbus/slim-msm.c
View file

@ -48,7 +48,7 @@ int msm_slim_rx_dequeue(struct msm_slim_ctrl *dev, u8 *buf)
int msm_slim_get_ctrl(struct msm_slim_ctrl *dev)
{
#ifdef CONFIG_PM_RUNTIME
#ifdef CONFIG_PM
int ref = 0;
int ret = pm_runtime_get_sync(dev->dev);
if (ret >= 0) {
@ -65,7 +65,7 @@ int msm_slim_get_ctrl(struct msm_slim_ctrl *dev)
}
void msm_slim_put_ctrl(struct msm_slim_ctrl *dev)
{
#ifdef CONFIG_PM_RUNTIME
#ifdef CONFIG_PM
int ref;
pm_runtime_mark_last_busy(dev->dev);
ref = atomic_read(&dev->dev->power.usage_count);