aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2018-05-30 07:41:09 -0400
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2018-05-30 17:13:00 -0400
commitcf7eeea947efaf2348dd87542508b1d426b948cd (patch)
tree95dfe354c7b8d4467f8c9dc6a722e23bcbca76c0
parentb04e217704b7f879c6b91222b066983a44a7a09f (diff)
cpuidle: governors: Drop redundant checks related to PM QoS
PM_QOS_RESUME_LATENCY_NO_CONSTRAINT is defined as the 32-bit integer maximum, so it is not necessary to test the return value of dev_pm_qos_raw_read_value() against it directly in the menu and ladder cpuidle governors. Drop these redundant checks. Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
-rw-r--r--drivers/cpuidle/governors/ladder.c3
-rw-r--r--drivers/cpuidle/governors/menu.c3
2 files changed, 2 insertions, 4 deletions
diff --git a/drivers/cpuidle/governors/ladder.c b/drivers/cpuidle/governors/ladder.c
index b24883f85c99..060db5182bdb 100644
--- a/drivers/cpuidle/governors/ladder.c
+++ b/drivers/cpuidle/governors/ladder.c
@@ -76,8 +76,7 @@ static int ladder_select_state(struct cpuidle_driver *drv,
76 int latency_req = pm_qos_request(PM_QOS_CPU_DMA_LATENCY); 76 int latency_req = pm_qos_request(PM_QOS_CPU_DMA_LATENCY);
77 int resume_latency = dev_pm_qos_raw_read_value(device); 77 int resume_latency = dev_pm_qos_raw_read_value(device);
78 78
79 if (resume_latency < latency_req && 79 if (resume_latency < latency_req)
80 resume_latency != PM_QOS_RESUME_LATENCY_NO_CONSTRAINT)
81 latency_req = resume_latency; 80 latency_req = resume_latency;
82 81
83 /* Special case when user has set very strict latency requirement */ 82 /* Special case when user has set very strict latency requirement */
diff --git a/drivers/cpuidle/governors/menu.c b/drivers/cpuidle/governors/menu.c
index 1bfe03ceb236..5d15bc0ba2e0 100644
--- a/drivers/cpuidle/governors/menu.c
+++ b/drivers/cpuidle/governors/menu.c
@@ -302,8 +302,7 @@ static int menu_select(struct cpuidle_driver *drv, struct cpuidle_device *dev,
302 data->needs_update = 0; 302 data->needs_update = 0;
303 } 303 }
304 304
305 if (resume_latency < latency_req && 305 if (resume_latency < latency_req)
306 resume_latency != PM_QOS_RESUME_LATENCY_NO_CONSTRAINT)
307 latency_req = resume_latency; 306 latency_req = resume_latency;
308 307
309 /* Special case when user has set very strict latency requirement */ 308 /* Special case when user has set very strict latency requirement */