* [PATCH 2/5] cpufreq: Loongson1: Replace kzalloc() with kcalloc()
2016-04-11 11:55 [PATCH 1/5] cpufreq: Loongson1: Rename the file to loongson1-cpufreq.c Keguang Zhang
@ 2016-04-11 11:55 ` Keguang Zhang
2016-04-12 5:18 ` Viresh Kumar
2016-04-11 11:55 ` [PATCH 3/5] cpufreq: Loongson1: Use dev_get_platdata() to get platform_data Keguang Zhang
` (3 subsequent siblings)
4 siblings, 1 reply; 10+ messages in thread
From: Keguang Zhang @ 2016-04-11 11:55 UTC (permalink / raw)
To: linux-pm, linux-mips, linux-kernel
Cc: Rafael J. Wysocki, Viresh Kumar, Kelvin Cheung
From: Kelvin Cheung <keguang.zhang@gmail.com>
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>
---
drivers/cpufreq/loongson1-cpufreq.c | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/drivers/cpufreq/loongson1-cpufreq.c b/drivers/cpufreq/loongson1-cpufreq.c
index 262581b..2d83744 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;
}
--
1.9.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 3/5] cpufreq: Loongson1: Use dev_get_platdata() to get platform_data
2016-04-11 11:55 [PATCH 1/5] cpufreq: Loongson1: Rename the file to loongson1-cpufreq.c Keguang Zhang
2016-04-11 11:55 ` [PATCH 2/5] cpufreq: Loongson1: Replace kzalloc() with kcalloc() Keguang Zhang
@ 2016-04-11 11:55 ` Keguang Zhang
2016-04-12 5:18 ` Viresh Kumar
2016-04-11 11:55 ` [PATCH 4/5] cpufreq: Loongson1: Use devm_kzalloc() instead of global structure Keguang Zhang
` (2 subsequent siblings)
4 siblings, 1 reply; 10+ messages in thread
From: Keguang Zhang @ 2016-04-11 11:55 UTC (permalink / raw)
To: linux-pm, linux-mips, linux-kernel
Cc: Rafael J. Wysocki, Viresh Kumar, Kelvin Cheung
From: Kelvin Cheung <keguang.zhang@gmail.com>
This patch uses dev_get_platdata() to get the platform_data
instead of referencing it directly.
Signed-off-by: Kelvin Cheung <keguang.zhang@gmail.com>
---
drivers/cpufreq/loongson1-cpufreq.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/cpufreq/loongson1-cpufreq.c b/drivers/cpufreq/loongson1-cpufreq.c
index 2d83744..f0d40fd 100644
--- a/drivers/cpufreq/loongson1-cpufreq.c
+++ b/drivers/cpufreq/loongson1-cpufreq.c
@@ -134,7 +134,7 @@ static int ls1x_cpufreq_remove(struct platform_device *pdev)
static int ls1x_cpufreq_probe(struct platform_device *pdev)
{
- struct plat_ls1x_cpufreq *pdata = pdev->dev.platform_data;
+ struct plat_ls1x_cpufreq *pdata = dev_get_platdata(&pdev->dev);
struct clk *clk;
int ret;
--
1.9.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [PATCH 3/5] cpufreq: Loongson1: Use dev_get_platdata() to get platform_data
2016-04-11 11:55 ` [PATCH 3/5] cpufreq: Loongson1: Use dev_get_platdata() to get platform_data Keguang Zhang
@ 2016-04-12 5:18 ` Viresh Kumar
0 siblings, 0 replies; 10+ messages in thread
From: Viresh Kumar @ 2016-04-12 5:18 UTC (permalink / raw)
To: Keguang Zhang; +Cc: linux-pm, linux-mips, linux-kernel, Rafael J. Wysocki
On 11-04-16, 19:55, Keguang Zhang wrote:
> From: Kelvin Cheung <keguang.zhang@gmail.com>
>
> This patch uses dev_get_platdata() to get the platform_data
> instead of referencing it directly.
>
> Signed-off-by: Kelvin Cheung <keguang.zhang@gmail.com>
> ---
> drivers/cpufreq/loongson1-cpufreq.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/cpufreq/loongson1-cpufreq.c b/drivers/cpufreq/loongson1-cpufreq.c
> index 2d83744..f0d40fd 100644
> --- a/drivers/cpufreq/loongson1-cpufreq.c
> +++ b/drivers/cpufreq/loongson1-cpufreq.c
> @@ -134,7 +134,7 @@ static int ls1x_cpufreq_remove(struct platform_device *pdev)
>
> static int ls1x_cpufreq_probe(struct platform_device *pdev)
> {
> - struct plat_ls1x_cpufreq *pdata = pdev->dev.platform_data;
> + struct plat_ls1x_cpufreq *pdata = dev_get_platdata(&pdev->dev);
> struct clk *clk;
> int ret;
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
--
viresh
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH 4/5] cpufreq: Loongson1: Use devm_kzalloc() instead of global structure
2016-04-11 11:55 [PATCH 1/5] cpufreq: Loongson1: Rename the file to loongson1-cpufreq.c Keguang Zhang
2016-04-11 11:55 ` [PATCH 2/5] cpufreq: Loongson1: Replace kzalloc() with kcalloc() Keguang Zhang
2016-04-11 11:55 ` [PATCH 3/5] cpufreq: Loongson1: Use dev_get_platdata() to get platform_data Keguang Zhang
@ 2016-04-11 11:55 ` Keguang Zhang
2016-04-12 5:20 ` Viresh Kumar
2016-04-11 11:55 ` [PATCH 5/5] cpufreq: Loongson1: Replace goto out with return in ls1x_cpufreq_probe() Keguang Zhang
2016-04-12 5:17 ` [PATCH 1/5] cpufreq: Loongson1: Rename the file to loongson1-cpufreq.c Viresh Kumar
4 siblings, 1 reply; 10+ messages in thread
From: Keguang Zhang @ 2016-04-11 11:55 UTC (permalink / raw)
To: linux-pm, linux-mips, linux-kernel
Cc: Rafael J. Wysocki, Viresh Kumar, Kelvin Cheung
From: Kelvin Cheung <keguang.zhang@gmail.com>
This patch uses devm_kzalloc() instead of global structure.
Signed-off-by: Kelvin Cheung <keguang.zhang@gmail.com>
---
drivers/cpufreq/loongson1-cpufreq.c | 63 ++++++++++++++++++++-----------------
1 file changed, 35 insertions(+), 28 deletions(-)
diff --git a/drivers/cpufreq/loongson1-cpufreq.c b/drivers/cpufreq/loongson1-cpufreq.c
index f0d40fd..5074f5e 100644
--- a/drivers/cpufreq/loongson1-cpufreq.c
+++ b/drivers/cpufreq/loongson1-cpufreq.c
@@ -20,7 +20,7 @@
#include <cpufreq.h>
#include <loongson1.h>
-static struct {
+struct ls1x_cpufreq {
struct device *dev;
struct clk *clk; /* CPU clk */
struct clk *mux_clk; /* MUX of CPU clk */
@@ -28,7 +28,9 @@ static struct {
struct clk *osc_clk; /* OSC clk */
unsigned int max_freq;
unsigned int min_freq;
-} ls1x_cpufreq;
+};
+
+static struct ls1x_cpufreq *cpufreq;
static int ls1x_cpufreq_notifier(struct notifier_block *nb,
unsigned long val, void *data)
@@ -46,6 +48,7 @@ static struct notifier_block ls1x_cpufreq_notifier_block = {
static int ls1x_cpufreq_target(struct cpufreq_policy *policy,
unsigned int index)
{
+ struct device *cpu_dev = get_cpu_device(policy->cpu);
unsigned int old_freq, new_freq;
old_freq = policy->cur;
@@ -60,25 +63,26 @@ static int ls1x_cpufreq_target(struct cpufreq_policy *policy,
* - Reparent CPU clk back to CPU DIV clk
*/
- dev_dbg(ls1x_cpufreq.dev, "%u KHz --> %u KHz\n", old_freq, new_freq);
- clk_set_parent(policy->clk, ls1x_cpufreq.osc_clk);
+ clk_set_parent(policy->clk, cpufreq->osc_clk);
__raw_writel(__raw_readl(LS1X_CLK_PLL_DIV) | RST_CPU_EN | RST_CPU,
LS1X_CLK_PLL_DIV);
__raw_writel(__raw_readl(LS1X_CLK_PLL_DIV) & ~(RST_CPU_EN | RST_CPU),
LS1X_CLK_PLL_DIV);
- clk_set_rate(ls1x_cpufreq.mux_clk, new_freq * 1000);
- clk_set_parent(policy->clk, ls1x_cpufreq.mux_clk);
+ clk_set_rate(cpufreq->mux_clk, new_freq * 1000);
+ clk_set_parent(policy->clk, cpufreq->mux_clk);
+ dev_dbg(cpu_dev, "%u KHz --> %u KHz\n", old_freq, new_freq);
return 0;
}
static int ls1x_cpufreq_init(struct cpufreq_policy *policy)
{
+ struct device *cpu_dev = get_cpu_device(policy->cpu);
struct cpufreq_frequency_table *freq_tbl;
unsigned int pll_freq, freq;
int steps, i, ret;
- pll_freq = clk_get_rate(ls1x_cpufreq.pll_clk) / 1000;
+ pll_freq = clk_get_rate(cpufreq->pll_clk) / 1000;
steps = 1 << DIV_CPU_WIDTH;
freq_tbl = kcalloc(steps, sizeof(*freq_tbl), GFP_KERNEL);
@@ -87,18 +91,17 @@ static int ls1x_cpufreq_init(struct cpufreq_policy *policy)
for (i = 0; i < (steps - 1); i++) {
freq = pll_freq / (i + 1);
- if ((freq < ls1x_cpufreq.min_freq) ||
- (freq > ls1x_cpufreq.max_freq))
+ if ((freq < cpufreq->min_freq) || (freq > cpufreq->max_freq))
freq_tbl[i].frequency = CPUFREQ_ENTRY_INVALID;
else
freq_tbl[i].frequency = freq;
- dev_dbg(ls1x_cpufreq.dev,
+ dev_dbg(cpu_dev,
"cpufreq table: index %d: frequency %d\n", i,
freq_tbl[i].frequency);
}
freq_tbl[i].frequency = CPUFREQ_TABLE_END;
- policy->clk = ls1x_cpufreq.clk;
+ policy->clk = cpufreq->clk;
ret = cpufreq_generic_init(policy, freq_tbl, 0);
if (ret)
kfree(freq_tbl);
@@ -141,51 +144,56 @@ static int ls1x_cpufreq_probe(struct platform_device *pdev)
if (!pdata || !pdata->clk_name || !pdata->osc_clk_name)
return -EINVAL;
- ls1x_cpufreq.dev = &pdev->dev;
+ cpufreq =
+ devm_kzalloc(&pdev->dev, sizeof(struct ls1x_cpufreq), GFP_KERNEL);
+ if (!cpufreq)
+ return -ENOMEM;
+
+ cpufreq->dev = &pdev->dev;
clk = devm_clk_get(&pdev->dev, pdata->clk_name);
if (IS_ERR(clk)) {
- dev_err(ls1x_cpufreq.dev, "unable to get %s clock\n",
+ dev_err(&pdev->dev, "unable to get %s clock\n",
pdata->clk_name);
ret = PTR_ERR(clk);
goto out;
}
- ls1x_cpufreq.clk = clk;
+ cpufreq->clk = clk;
clk = clk_get_parent(clk);
if (IS_ERR(clk)) {
- dev_err(ls1x_cpufreq.dev, "unable to get parent of %s clock\n",
- __clk_get_name(ls1x_cpufreq.clk));
+ dev_err(&pdev->dev, "unable to get parent of %s clock\n",
+ __clk_get_name(cpufreq->clk));
ret = PTR_ERR(clk);
goto out;
}
- ls1x_cpufreq.mux_clk = clk;
+ cpufreq->mux_clk = clk;
clk = clk_get_parent(clk);
if (IS_ERR(clk)) {
- dev_err(ls1x_cpufreq.dev, "unable to get parent of %s clock\n",
- __clk_get_name(ls1x_cpufreq.mux_clk));
+ dev_err(&pdev->dev, "unable to get parent of %s clock\n",
+ __clk_get_name(cpufreq->mux_clk));
ret = PTR_ERR(clk);
goto out;
}
- ls1x_cpufreq.pll_clk = clk;
+ cpufreq->pll_clk = clk;
clk = devm_clk_get(&pdev->dev, pdata->osc_clk_name);
if (IS_ERR(clk)) {
- dev_err(ls1x_cpufreq.dev, "unable to get %s clock\n",
+ dev_err(&pdev->dev, "unable to get %s clock\n",
pdata->osc_clk_name);
ret = PTR_ERR(clk);
goto out;
}
- ls1x_cpufreq.osc_clk = clk;
+ cpufreq->osc_clk = clk;
- ls1x_cpufreq.max_freq = pdata->max_freq;
- ls1x_cpufreq.min_freq = pdata->min_freq;
+ cpufreq->max_freq = pdata->max_freq;
+ cpufreq->min_freq = pdata->min_freq;
ret = cpufreq_register_driver(&ls1x_cpufreq_driver);
if (ret) {
- dev_err(ls1x_cpufreq.dev,
- "failed to register cpufreq driver: %d\n", ret);
+ dev_err(&pdev->dev,
+ "failed to register CPUFreq driver: %d\n", ret);
goto out;
}
@@ -195,8 +203,7 @@ static int ls1x_cpufreq_probe(struct platform_device *pdev)
if (!ret)
goto out;
- dev_err(ls1x_cpufreq.dev, "failed to register cpufreq notifier: %d\n",
- ret);
+ dev_err(&pdev->dev, "failed to register cpufreq notifier: %d\n", ret);
cpufreq_unregister_driver(&ls1x_cpufreq_driver);
out:
--
1.9.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 5/5] cpufreq: Loongson1: Replace goto out with return in ls1x_cpufreq_probe()
2016-04-11 11:55 [PATCH 1/5] cpufreq: Loongson1: Rename the file to loongson1-cpufreq.c Keguang Zhang
` (2 preceding siblings ...)
2016-04-11 11:55 ` [PATCH 4/5] cpufreq: Loongson1: Use devm_kzalloc() instead of global structure Keguang Zhang
@ 2016-04-11 11:55 ` Keguang Zhang
2016-04-12 5:24 ` Viresh Kumar
2016-04-12 5:17 ` [PATCH 1/5] cpufreq: Loongson1: Rename the file to loongson1-cpufreq.c Viresh Kumar
4 siblings, 1 reply; 10+ messages in thread
From: Keguang Zhang @ 2016-04-11 11:55 UTC (permalink / raw)
To: linux-pm, linux-mips, linux-kernel
Cc: Rafael J. Wysocki, Viresh Kumar, Kelvin Cheung
From: Kelvin Cheung <keguang.zhang@gmail.com>
This patch replaces goto out with return in ls1x_cpufreq_probe(),
and also includes some minor fixes.
Signed-off-by: Kelvin Cheung <keguang.zhang@gmail.com>
---
drivers/cpufreq/loongson1-cpufreq.c | 37 ++++++++++++++++---------------------
1 file changed, 16 insertions(+), 21 deletions(-)
diff --git a/drivers/cpufreq/loongson1-cpufreq.c b/drivers/cpufreq/loongson1-cpufreq.c
index 5074f5e..1bc90af 100644
--- a/drivers/cpufreq/loongson1-cpufreq.c
+++ b/drivers/cpufreq/loongson1-cpufreq.c
@@ -1,7 +1,7 @@
/*
* CPU Frequency Scaling for Loongson 1 SoC
*
- * Copyright (C) 2014 Zhang, Keguang <keguang.zhang@gmail.com>
+ * Copyright (C) 2014-2016 Zhang, Keguang <keguang.zhang@gmail.com>
*
* This file is licensed under the terms of the GNU General Public
* License version 2. This program is licensed "as is" without any
@@ -141,7 +141,8 @@ static int ls1x_cpufreq_probe(struct platform_device *pdev)
struct clk *clk;
int ret;
- if (!pdata || !pdata->clk_name || !pdata->osc_clk_name)
+ if (!pdata || !pdata->clk_name || !pdata->osc_clk_name) {
+ dev_err(&pdev->dev, "platform data missing\n");
return -EINVAL;
cpufreq =
@@ -155,8 +156,7 @@ static int ls1x_cpufreq_probe(struct platform_device *pdev)
if (IS_ERR(clk)) {
dev_err(&pdev->dev, "unable to get %s clock\n",
pdata->clk_name);
- ret = PTR_ERR(clk);
- goto out;
+ return PTR_ERR(clk);
}
cpufreq->clk = clk;
@@ -164,8 +164,7 @@ static int ls1x_cpufreq_probe(struct platform_device *pdev)
if (IS_ERR(clk)) {
dev_err(&pdev->dev, "unable to get parent of %s clock\n",
__clk_get_name(cpufreq->clk));
- ret = PTR_ERR(clk);
- goto out;
+ return PTR_ERR(clk);
}
cpufreq->mux_clk = clk;
@@ -173,8 +172,7 @@ static int ls1x_cpufreq_probe(struct platform_device *pdev)
if (IS_ERR(clk)) {
dev_err(&pdev->dev, "unable to get parent of %s clock\n",
__clk_get_name(cpufreq->mux_clk));
- ret = PTR_ERR(clk);
- goto out;
+ return PTR_ERR(clk);
}
cpufreq->pll_clk = clk;
@@ -182,8 +180,7 @@ static int ls1x_cpufreq_probe(struct platform_device *pdev)
if (IS_ERR(clk)) {
dev_err(&pdev->dev, "unable to get %s clock\n",
pdata->osc_clk_name);
- ret = PTR_ERR(clk);
- goto out;
+ return PTR_ERR(clk);
}
cpufreq->osc_clk = clk;
@@ -194,32 +191,30 @@ static int ls1x_cpufreq_probe(struct platform_device *pdev)
if (ret) {
dev_err(&pdev->dev,
"failed to register CPUFreq driver: %d\n", ret);
- goto out;
+ return ret;
}
ret = cpufreq_register_notifier(&ls1x_cpufreq_notifier_block,
CPUFREQ_TRANSITION_NOTIFIER);
- if (!ret)
- goto out;
-
- dev_err(&pdev->dev, "failed to register cpufreq notifier: %d\n", ret);
+ if (ret) {
+ dev_err(&pdev->dev, "failed to register CPUFreq notifier: %d\n", ret);
+ cpufreq_unregister_driver(&ls1x_cpufreq_driver);
+ }
- cpufreq_unregister_driver(&ls1x_cpufreq_driver);
-out:
return ret;
}
static struct platform_driver ls1x_cpufreq_platdrv = {
- .driver = {
+ .probe = ls1x_cpufreq_probe,
+ .remove = ls1x_cpufreq_remove,
+ .driver = {
.name = "ls1x-cpufreq",
},
- .probe = ls1x_cpufreq_probe,
- .remove = ls1x_cpufreq_remove,
};
module_platform_driver(ls1x_cpufreq_platdrv);
MODULE_AUTHOR("Kelvin Cheung <keguang.zhang@gmail.com>");
-MODULE_DESCRIPTION("Loongson 1 CPUFreq driver");
+MODULE_DESCRIPTION("Loongson1 CPUFreq driver");
MODULE_LICENSE("GPL");
--
1.9.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [PATCH 5/5] cpufreq: Loongson1: Replace goto out with return in ls1x_cpufreq_probe()
2016-04-11 11:55 ` [PATCH 5/5] cpufreq: Loongson1: Replace goto out with return in ls1x_cpufreq_probe() Keguang Zhang
@ 2016-04-12 5:24 ` Viresh Kumar
0 siblings, 0 replies; 10+ messages in thread
From: Viresh Kumar @ 2016-04-12 5:24 UTC (permalink / raw)
To: Keguang Zhang; +Cc: linux-pm, linux-mips, linux-kernel, Rafael J. Wysocki
On 11-04-16, 19:55, Keguang Zhang wrote:
> From: Kelvin Cheung <keguang.zhang@gmail.com>
>
> This patch replaces goto out with return in ls1x_cpufreq_probe(),
> and also includes some minor fixes.
>
> Signed-off-by: Kelvin Cheung <keguang.zhang@gmail.com>
> ---
> drivers/cpufreq/loongson1-cpufreq.c | 37 ++++++++++++++++---------------------
> 1 file changed, 16 insertions(+), 21 deletions(-)
>
> diff --git a/drivers/cpufreq/loongson1-cpufreq.c b/drivers/cpufreq/loongson1-cpufreq.c
> index 5074f5e..1bc90af 100644
> --- a/drivers/cpufreq/loongson1-cpufreq.c
> +++ b/drivers/cpufreq/loongson1-cpufreq.c
> @@ -1,7 +1,7 @@
> /*
> * CPU Frequency Scaling for Loongson 1 SoC
> *
> - * Copyright (C) 2014 Zhang, Keguang <keguang.zhang@gmail.com>
> + * Copyright (C) 2014-2016 Zhang, Keguang <keguang.zhang@gmail.com>
Actually you should fold above into the first patch of the series,
that renames this file. It makes much sense that way.
> *
> * This file is licensed under the terms of the GNU General Public
> * License version 2. This program is licensed "as is" without any
> @@ -141,7 +141,8 @@ static int ls1x_cpufreq_probe(struct platform_device *pdev)
> struct clk *clk;
> int ret;
>
> - if (!pdata || !pdata->clk_name || !pdata->osc_clk_name)
> + if (!pdata || !pdata->clk_name || !pdata->osc_clk_name) {
You added a '{' here, but the closing '}' is added way down..
Something is wrong here I feel..
> + dev_err(&pdev->dev, "platform data missing\n");
> return -EINVAL;
>
> cpufreq =
> @@ -155,8 +156,7 @@ static int ls1x_cpufreq_probe(struct platform_device *pdev)
> if (IS_ERR(clk)) {
> dev_err(&pdev->dev, "unable to get %s clock\n",
> pdata->clk_name);
> - ret = PTR_ERR(clk);
> - goto out;
> + return PTR_ERR(clk);
> }
> static struct platform_driver ls1x_cpufreq_platdrv = {
> - .driver = {
> + .probe = ls1x_cpufreq_probe,
> + .remove = ls1x_cpufreq_remove,
> + .driver = {
> .name = "ls1x-cpufreq",
> },
> - .probe = ls1x_cpufreq_probe,
> - .remove = ls1x_cpufreq_remove,
Why do this change at all? Do it in the first patch if you really want
to.
> };
>
> module_platform_driver(ls1x_cpufreq_platdrv);
>
> MODULE_AUTHOR("Kelvin Cheung <keguang.zhang@gmail.com>");
> -MODULE_DESCRIPTION("Loongson 1 CPUFreq driver");
> +MODULE_DESCRIPTION("Loongson1 CPUFreq driver");
This one as well, move it to the first patch.
> MODULE_LICENSE("GPL");
> --
> 1.9.1
--
viresh
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 1/5] cpufreq: Loongson1: Rename the file to loongson1-cpufreq.c
2016-04-11 11:55 [PATCH 1/5] cpufreq: Loongson1: Rename the file to loongson1-cpufreq.c Keguang Zhang
` (3 preceding siblings ...)
2016-04-11 11:55 ` [PATCH 5/5] cpufreq: Loongson1: Replace goto out with return in ls1x_cpufreq_probe() Keguang Zhang
@ 2016-04-12 5:17 ` Viresh Kumar
4 siblings, 0 replies; 10+ messages in thread
From: Viresh Kumar @ 2016-04-12 5:17 UTC (permalink / raw)
To: Keguang Zhang; +Cc: linux-pm, linux-mips, linux-kernel, Rafael J. Wysocki
On 11-04-16, 19:55, Keguang Zhang wrote:
> From: Kelvin Cheung <keguang.zhang@gmail.com>
>
> This patch renames the file to loongson1-cpufreq.c
>
> Signed-off-by: Kelvin Cheung <keguang.zhang@gmail.com>
> ---
> drivers/cpufreq/Makefile | 2 +-
> drivers/cpufreq/{ls1x-cpufreq.c => loongson1-cpufreq.c} | 0
> 2 files changed, 1 insertion(+), 1 deletion(-)
> rename drivers/cpufreq/{ls1x-cpufreq.c => loongson1-cpufreq.c} (100%)
>
> diff --git a/drivers/cpufreq/Makefile b/drivers/cpufreq/Makefile
> index 9e63fb1..bebe9c8 100644
> --- a/drivers/cpufreq/Makefile
> +++ b/drivers/cpufreq/Makefile
> @@ -100,7 +100,7 @@ obj-$(CONFIG_CRIS_MACH_ARTPEC3) += cris-artpec3-cpufreq.o
> obj-$(CONFIG_ETRAXFS) += cris-etraxfs-cpufreq.o
> obj-$(CONFIG_IA64_ACPI_CPUFREQ) += ia64-acpi-cpufreq.o
> obj-$(CONFIG_LOONGSON2_CPUFREQ) += loongson2_cpufreq.o
> -obj-$(CONFIG_LOONGSON1_CPUFREQ) += ls1x-cpufreq.o
> +obj-$(CONFIG_LOONGSON1_CPUFREQ) += loongson1-cpufreq.o
> obj-$(CONFIG_SH_CPU_FREQ) += sh-cpufreq.o
> obj-$(CONFIG_SPARC_US2E_CPUFREQ) += sparc-us2e-cpufreq.o
> obj-$(CONFIG_SPARC_US3_CPUFREQ) += sparc-us3-cpufreq.o
> diff --git a/drivers/cpufreq/ls1x-cpufreq.c b/drivers/cpufreq/loongson1-cpufreq.c
> similarity index 100%
> rename from drivers/cpufreq/ls1x-cpufreq.c
> rename to drivers/cpufreq/loongson1-cpufreq.c
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
--
viresh
^ permalink raw reply [flat|nested] 10+ messages in thread