| From d62dbf77f7dfaa6fb455b4b9828069a11965929c Mon Sep 17 00:00:00 2001 |
| From: Arnd Bergmann <arnd@arndb.de> |
| Date: Fri, 26 Sep 2014 22:19:12 +0200 |
| Subject: cpufreq: integrator: fix integrator_cpufreq_remove return type |
| |
| 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: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/cpufreq/integrator-cpufreq.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| --- a/drivers/cpufreq/integrator-cpufreq.c |
| +++ b/drivers/cpufreq/integrator-cpufreq.c |
| @@ -213,9 +213,9 @@ static int __init integrator_cpufreq_pro |
| 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[] = { |
