aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/cpuidle/cpuidle.c
diff options
context:
space:
mode:
authorXunlei Pang <pang.xunlei@linaro.org>2015-08-04 01:48:56 -0400
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-08-28 09:14:54 -0400
commit4c1ed5a6079078699128064664913ae7b079648f (patch)
tree76c41b8fe9f3347195afbc345de623b0167d0ec8 /drivers/cpuidle/cpuidle.c
parentba6a860d41ed3a377d61d59d7c7b08dd7455c686 (diff)
cpuidle/coupled: Remove redundant 'dev' argument of cpuidle_state_is_coupled()
For cpuidle_state_is_coupled(), 'dev' is not used, so remove it. Signed-off-by: Xunlei Pang <pang.xunlei@linaro.org> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/cpuidle/cpuidle.c')
-rw-r--r--drivers/cpuidle/cpuidle.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/cpuidle/cpuidle.c b/drivers/cpuidle/cpuidle.c
index 48b7228563ad..fe79cafb0f14 100644
--- a/drivers/cpuidle/cpuidle.c
+++ b/drivers/cpuidle/cpuidle.c
@@ -210,7 +210,7 @@ int cpuidle_enter_state(struct cpuidle_device *dev, struct cpuidle_driver *drv,
210 tick_broadcast_exit(); 210 tick_broadcast_exit();
211 } 211 }
212 212
213 if (!cpuidle_state_is_coupled(dev, drv, entered_state)) 213 if (!cpuidle_state_is_coupled(drv, entered_state))
214 local_irq_enable(); 214 local_irq_enable();
215 215
216 diff = ktime_to_us(ktime_sub(time_end, time_start)); 216 diff = ktime_to_us(ktime_sub(time_end, time_start));
@@ -259,7 +259,7 @@ int cpuidle_select(struct cpuidle_driver *drv, struct cpuidle_device *dev)
259int cpuidle_enter(struct cpuidle_driver *drv, struct cpuidle_device *dev, 259int cpuidle_enter(struct cpuidle_driver *drv, struct cpuidle_device *dev,
260 int index) 260 int index)
261{ 261{
262 if (cpuidle_state_is_coupled(dev, drv, index)) 262 if (cpuidle_state_is_coupled(drv, index))
263 return cpuidle_enter_state_coupled(dev, drv, index); 263 return cpuidle_enter_state_coupled(dev, drv, index);
264 return cpuidle_enter_state(dev, drv, index); 264 return cpuidle_enter_state(dev, drv, index);
265} 265}