lkml.org 
[lkml]   [2014]   [Oct]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.13 150/163] cpufreq: integrator: fix integrator_cpufreq_remove return type
    Date
    3.13.11.9 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Arnd Bergmann <arnd@arndb.de>

    commit d62dbf77f7dfaa6fb455b4b9828069a11965929c upstream.

    When building this driver as a module, we get a helpful warning
    about the return type:

    drivers/cpufreq/integrator-cpufreq.c:232:2: warning: initialization from incompatible pointer type
    .remove = __exit_p(integrator_cpufreq_remove),

    If the remove callback returns void, the caller gets an undefined
    value as it expects an integer to be returned. This fixes the
    problem by passing down the value from cpufreq_unregister_driver.

    Signed-off-by: Arnd Bergmann <arnd@arndb.de>
    Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
    Signed-off-by: Kamal Mostafa <kamal@canonical.com>
    ---
    drivers/cpufreq/integrator-cpufreq.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/drivers/cpufreq/integrator-cpufreq.c b/drivers/cpufreq/integrator-cpufreq.c
    index 7d8ab000d..572955f 100644
    --- a/drivers/cpufreq/integrator-cpufreq.c
    +++ b/drivers/cpufreq/integrator-cpufreq.c
    @@ -212,9 +212,9 @@ static int __init integrator_cpufreq_probe(struct platform_device *pdev)
    return cpufreq_register_driver(&integrator_driver);
    }

    -static void __exit integrator_cpufreq_remove(struct platform_device *pdev)
    +static int __exit integrator_cpufreq_remove(struct platform_device *pdev)
    {
    - cpufreq_unregister_driver(&integrator_driver);
    + return cpufreq_unregister_driver(&integrator_driver);
    }

    static const struct of_device_id integrator_cpufreq_match[] = {
    --
    1.9.1


    \
     
     \ /
      Last update: 2014-10-09 23:42    [W:4.848 / U:0.048 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site