From 3dae886c11d07f3eed8838f6a0b803cdc8c3b35e Mon Sep 17 00:00:00 2001 From: Girish Mahadevan Date: Fri, 19 Feb 2016 10:16:58 -0700 Subject: [PATCH] slimbus: Remove use of PM_RUNTIME feature flag 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 --- drivers/slimbus/slim-msm-ctrl.c | 2 +- drivers/slimbus/slim-msm-ngd.c | 2 +- drivers/slimbus/slim-msm.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/slimbus/slim-msm-ctrl.c b/drivers/slimbus/slim-msm-ctrl.c index 8f7185a5157c..f41756c11edf 100644 --- a/drivers/slimbus/slim-msm-ctrl.c +++ b/drivers/slimbus/slim-msm-ctrl.c @@ -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); diff --git a/drivers/slimbus/slim-msm-ngd.c b/drivers/slimbus/slim-msm-ngd.c index 2ca4d6a64653..efc6b7ac9981 100644 --- a/drivers/slimbus/slim-msm-ngd.c +++ b/drivers/slimbus/slim-msm-ngd.c @@ -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); diff --git a/drivers/slimbus/slim-msm.c b/drivers/slimbus/slim-msm.c index 3de00f56a44e..932fc0bb20e3 100644 --- a/drivers/slimbus/slim-msm.c +++ b/drivers/slimbus/slim-msm.c @@ -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);