summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/gk20a/gk20a_sysfs.c
diff options
context:
space:
mode:
authorSumit Singh <sumsingh@nvidia.com>2016-03-15 04:52:04 -0400
committerSumit Singh <sumsingh@nvidia.com>2016-03-15 06:47:42 -0400
commit383c769995dd8df1c5fd83b5778d37bf347618ca (patch)
treedc6922a72aeb87d2ecee9eb555ecd92767e60d92 /drivers/gpu/nvgpu/gk20a/gk20a_sysfs.c
parentd2e5eaf359d4446dd731ab39bc851e7709571042 (diff)
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 <sumsingh@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/gk20a_sysfs.c')
-rw-r--r--drivers/gpu/nvgpu/gk20a/gk20a_sysfs.c8
1 files changed, 4 insertions, 4 deletions
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,
232 ptimer_scale_factor_show, 232 ptimer_scale_factor_show,
233 NULL); 233 NULL);
234 234
235#if defined(CONFIG_PM_RUNTIME) && defined(CONFIG_PM_GENERIC_DOMAINS) 235#if defined(CONFIG_PM) && defined(CONFIG_PM_GENERIC_DOMAINS)
236static ssize_t railgate_enable_store(struct device *dev, 236static ssize_t railgate_enable_store(struct device *dev,
237 struct device_attribute *attr, const char *buf, size_t count) 237 struct device_attribute *attr, const char *buf, size_t count)
238{ 238{
@@ -649,7 +649,7 @@ static ssize_t fmax_at_vmin_safe_read(struct device *device,
649 649
650static DEVICE_ATTR(fmax_at_vmin_safe, S_IRUGO, fmax_at_vmin_safe_read, NULL); 650static DEVICE_ATTR(fmax_at_vmin_safe, S_IRUGO, fmax_at_vmin_safe_read, NULL);
651 651
652#ifdef CONFIG_PM_RUNTIME 652#ifdef CONFIG_PM
653static ssize_t force_idle_store(struct device *device, 653static ssize_t force_idle_store(struct device *device,
654 struct device_attribute *attr, const char *buf, size_t count) 654 struct device_attribute *attr, const char *buf, size_t count)
655{ 655{
@@ -773,7 +773,7 @@ void gk20a_remove_sysfs(struct device *dev)
773 device_remove_file(dev, &dev_attr_railgate_delay); 773 device_remove_file(dev, &dev_attr_railgate_delay);
774 device_remove_file(dev, &dev_attr_is_railgated); 774 device_remove_file(dev, &dev_attr_is_railgated);
775 device_remove_file(dev, &dev_attr_clockgate_delay); 775 device_remove_file(dev, &dev_attr_clockgate_delay);
776#ifdef CONFIG_PM_RUNTIME 776#ifdef CONFIG_PM
777 device_remove_file(dev, &dev_attr_force_idle); 777 device_remove_file(dev, &dev_attr_force_idle);
778#if defined(CONFIG_PM_GENERIC_DOMAINS) 778#if defined(CONFIG_PM_GENERIC_DOMAINS)
779 device_remove_file(dev, &dev_attr_railgate_enable); 779 device_remove_file(dev, &dev_attr_railgate_enable);
@@ -806,7 +806,7 @@ void gk20a_create_sysfs(struct platform_device *dev)
806 error |= device_create_file(&dev->dev, &dev_attr_railgate_delay); 806 error |= device_create_file(&dev->dev, &dev_attr_railgate_delay);
807 error |= device_create_file(&dev->dev, &dev_attr_is_railgated); 807 error |= device_create_file(&dev->dev, &dev_attr_is_railgated);
808 error |= device_create_file(&dev->dev, &dev_attr_clockgate_delay); 808 error |= device_create_file(&dev->dev, &dev_attr_clockgate_delay);
809#ifdef CONFIG_PM_RUNTIME 809#ifdef CONFIG_PM
810 error |= device_create_file(&dev->dev, &dev_attr_force_idle); 810 error |= device_create_file(&dev->dev, &dev_attr_force_idle);
811#if defined(CONFIG_PM_GENERIC_DOMAINS) 811#if defined(CONFIG_PM_GENERIC_DOMAINS)
812 error |= device_create_file(&dev->dev, &dev_attr_railgate_enable); 812 error |= device_create_file(&dev->dev, &dev_attr_railgate_enable);