Merge branch 'fixes-merge-window-pt2' into fixes

[linux.git] / drivers / cpufreq / davinci-cpufreq.c

diff --git a/drivers/cpufreq/davinci-cpufreq.c b/drivers/cpufreq/davinci-cpufreq.c
index 940fe85db97a58df7d3eac9732f51fb865d4f6d8..297d23cad8b5f0110f2a43b1ade1e9174d454616 100644 (file)
--- a/drivers/cpufreq/davinci-cpufreq.c
+++ b/drivers/cpufreq/davinci-cpufreq.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * CPU frequency scaling for DaVinci
  *
@@ -13,10 +14,6 @@
  * Copyright (C) 2007-2008 Texas Instruments, Inc.
  * Updated to support OMAP3
  * Rajendra Nayak <rnayak@ti.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
  */
 #include <linux/types.h>
 #include <linux/cpufreq.h>
@@ -93,7 +90,8 @@ static int davinci_cpu_init(struct cpufreq_policy *policy)
         * Setting the latency to 2000 us to accommodate addition of drivers
         * to pre/post change notification list.
         */
-       return cpufreq_generic_init(policy, freq_table, 2000 * 1000);
+       cpufreq_generic_init(policy, freq_table, 2000 * 1000);
+       return 0;
 }
 
 static struct cpufreq_driver davinci_driver = {