From 383c769995dd8df1c5fd83b5778d37bf347618ca Mon Sep 17 00:00:00 2001 From: Sumit Singh Date: Tue, 15 Mar 2016 14:22:04 +0530 Subject: gpu: nvgpu: Replace CONFIG_PM_RUNTIME with CONFIG_PM After commit b2b49ccbdd54 (PM: Kconfig: Set PM_RUNTIME if PM_SLEEP is selected) PM_RUNTIME is always set if PM is set, so #ifdef blocks depending on CONFIG_PM_RUNTIME may now be changed to depend on CONFIG_PM. Replace CONFIG_PM_RUNTIME with CONFIG_PM everywhere under drivers/gpu/nvgpu/. JIRA TPM-704 Change-Id: I23965838ff6ec77829076cd834e87641fb68e268 Signed-off-by: Sumit Singh --- drivers/gpu/nvgpu/gk20a/gk20a_sysfs.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'drivers/gpu/nvgpu/gk20a/gk20a_sysfs.c') diff --git a/drivers/gpu/nvgpu/gk20a/gk20a_sysfs.c b/drivers/gpu/nvgpu/gk20a/gk20a_sysfs.c index 2d803d0e..0e6b576b 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a_sysfs.c +++ b/drivers/gpu/nvgpu/gk20a/gk20a_sysfs.c @@ -232,7 +232,7 @@ static DEVICE_ATTR(ptimer_scale_factor, ptimer_scale_factor_show, NULL); -#if defined(CONFIG_PM_RUNTIME) && defined(CONFIG_PM_GENERIC_DOMAINS) +#if defined(CONFIG_PM) && defined(CONFIG_PM_GENERIC_DOMAINS) static ssize_t railgate_enable_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) { @@ -649,7 +649,7 @@ static ssize_t fmax_at_vmin_safe_read(struct device *device, static DEVICE_ATTR(fmax_at_vmin_safe, S_IRUGO, fmax_at_vmin_safe_read, NULL); -#ifdef CONFIG_PM_RUNTIME +#ifdef CONFIG_PM static ssize_t force_idle_store(struct device *device, struct device_attribute *attr, const char *buf, size_t count) { @@ -773,7 +773,7 @@ void gk20a_remove_sysfs(struct device *dev) device_remove_file(dev, &dev_attr_railgate_delay); device_remove_file(dev, &dev_attr_is_railgated); device_remove_file(dev, &dev_attr_clockgate_delay); -#ifdef CONFIG_PM_RUNTIME +#ifdef CONFIG_PM device_remove_file(dev, &dev_attr_force_idle); #if defined(CONFIG_PM_GENERIC_DOMAINS) device_remove_file(dev, &dev_attr_railgate_enable); @@ -806,7 +806,7 @@ void gk20a_create_sysfs(struct platform_device *dev) error |= device_create_file(&dev->dev, &dev_attr_railgate_delay); error |= device_create_file(&dev->dev, &dev_attr_is_railgated); error |= device_create_file(&dev->dev, &dev_attr_clockgate_delay); -#ifdef CONFIG_PM_RUNTIME +#ifdef CONFIG_PM error |= device_create_file(&dev->dev, &dev_attr_force_idle); #if defined(CONFIG_PM_GENERIC_DOMAINS) error |= device_create_file(&dev->dev, &dev_attr_railgate_enable); -- cgit v1.2.2