diff options
| author | Kelvin Cheung <keguang.zhang@gmail.com> | 2016-04-12 18:40:16 +0800 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2016-05-13 14:02:08 +0200 |
| commit | 379e38a763dd63838411cc2fa765515e7535570b (patch) | |
| tree | 731013b01e8a5f0b871dd4cbeaacc93b1a2cebef /drivers | |
| parent | 6a1d55ccd8bcb304f060987e265d71068724f0d2 (diff) | |
| download | linux-379e38a763dd63838411cc2fa765515e7535570b.tar.gz | |
CPUFREQ: Loongson1: Replace kzalloc() with kcalloc()
This patch replaces kzalloc() with kcalloc() when allocating frequency table, and remove unnecessary 'out of memory' message. Signed-off-by: Kelvin Cheung <keguang.zhang@gmail.com> Acked-by: Viresh Kumar <viresh.kumar@linaro.org> Cc: Rafael J. Wysocki <rjw@rjwysocki.net> Cc: linux-pm@vger.kernel.org Cc: linux-mips@linux-mips.org Cc: linux-kernel@vger.kernel.org Patchwork: https://patchwork.linux-mips.org/patch/13053/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/cpufreq/loongson1-cpufreq.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/cpufreq/loongson1-cpufreq.c b/drivers/cpufreq/loongson1-cpufreq.c index 57fae9b585cf..4c3087f9f668 100644 --- a/drivers/cpufreq/loongson1-cpufreq.c +++ b/drivers/cpufreq/loongson1-cpufreq.c @@ -81,13 +81,9 @@ static int ls1x_cpufreq_init(struct cpufreq_policy *policy) pll_freq = clk_get_rate(ls1x_cpufreq.pll_clk) / 1000; steps = 1 << DIV_CPU_WIDTH; - freq_tbl = kzalloc(sizeof(*freq_tbl) * steps, GFP_KERNEL); - if (!freq_tbl) { - dev_err(ls1x_cpufreq.dev, - "failed to alloc cpufreq_frequency_table\n"); - ret = -ENOMEM; - goto out; - } + freq_tbl = kcalloc(steps, sizeof(*freq_tbl), GFP_KERNEL); + if (!freq_tbl) + return -ENOMEM; for (i = 0; i < (steps - 1); i++) { freq = pll_freq / (i + 1); @@ -106,7 +102,7 @@ static int ls1x_cpufreq_init(struct cpufreq_policy *policy) ret = cpufreq_generic_init(policy, freq_tbl, 0); if (ret) kfree(freq_tbl); -out: + return ret; } |