lkml.org 
[lkml]   [2012]   [Mar]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 49/76] cpuidle: use the driver's state_count as default
    Date
    From: Daniel Lezcano <daniel.lezcano@linaro.org>

    If the state_count is not initialized for the device use
    the driver's state count as the default. That will prevent
    to add it manually in the cpuidle driver initialization
    routine and will save us from duplicate line of code.

    Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
    Signed-off-by: Len Brown <len.brown@intel.com>
    ---
    drivers/cpuidle/cpuidle.c | 2 +-
    drivers/cpuidle/driver.c | 2 +-
    2 files changed, 2 insertions(+), 2 deletions(-)

    diff --git a/drivers/cpuidle/cpuidle.c b/drivers/cpuidle/cpuidle.c
    index 77304b6..f7cab5e 100644
    --- a/drivers/cpuidle/cpuidle.c
    +++ b/drivers/cpuidle/cpuidle.c
    @@ -268,7 +268,7 @@ int cpuidle_enable_device(struct cpuidle_device *dev)
    if (!drv || !cpuidle_curr_governor)
    return -EIO;
    if (!dev->state_count)
    - return -EINVAL;
    + dev->state_count = drv->state_count;

    if (dev->registered == 0) {
    ret = __cpuidle_register_device(dev);
    diff --git a/drivers/cpuidle/driver.c b/drivers/cpuidle/driver.c
    index 284d7af..40cd3f3 100644
    --- a/drivers/cpuidle/driver.c
    +++ b/drivers/cpuidle/driver.c
    @@ -47,7 +47,7 @@ static void __cpuidle_register_driver(struct cpuidle_driver *drv)
    */
    int cpuidle_register_driver(struct cpuidle_driver *drv)
    {
    - if (!drv)
    + if (!drv || !drv->state_count)
    return -EINVAL;

    if (cpuidle_disabled())
    --
    1.7.10.rc2.19.gfae9d


    \
     
     \ /
      Last update: 2012-03-30 12:21    [W:0.026 / U:0.108 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site