* [PATCH] clk: socfpga: remove set but not used variable 'rc'
@ 2021-05-14 6:22 Yu Kuai
2021-05-14 15:11 ` Dinh Nguyen
2021-06-02 7:48 ` Stephen Boyd
0 siblings, 2 replies; 8+ messages in thread
From: Yu Kuai @ 2021-05-14 6:22 UTC (permalink / raw)
To: dinguyen, mturquette, sboyd, s.trumtrar
Cc: linux-clk, linux-kernel, yukuai3, yi.zhang
Fixes gcc '-Wunused-but-set-variable' warning:
drivers/clk/socfpga/clk-pll.c:83:6: warning: variable ‘rc’ set but
not used [-Wunused-but-set-variable]
The returned value of of_clk_add_provider() is never used, and so
can be removed.
Fixes: 97259e99bdc9 ("clk: socfpga: split clk code")
Signed-off-by: Yu Kuai <yukuai3@huawei.com>
---
drivers/clk/socfpga/clk-pll.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/clk/socfpga/clk-pll.c b/drivers/clk/socfpga/clk-pll.c
index dcb573d44034..127cc849c5ee 100644
--- a/drivers/clk/socfpga/clk-pll.c
+++ b/drivers/clk/socfpga/clk-pll.c
@@ -80,7 +80,6 @@ static __init struct clk_hw *__socfpga_pll_init(struct device_node *node,
const char *parent_name[SOCFPGA_MAX_PARENTS];
struct clk_init_data init;
struct device_node *clkmgr_np;
- int rc;
int err;
of_property_read_u32(node, "reg", ®);
@@ -114,7 +113,7 @@ static __init struct clk_hw *__socfpga_pll_init(struct device_node *node,
kfree(pll_clk);
return ERR_PTR(err);
}
- rc = of_clk_add_provider(node, of_clk_src_simple_get, hw_clk);
+ of_clk_add_provider(node, of_clk_src_simple_get, hw_clk);
return hw_clk;
}
--
2.25.4
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH] clk: socfpga: remove set but not used variable 'rc'
2021-05-14 6:22 [PATCH] clk: socfpga: remove set but not used variable 'rc' Yu Kuai
@ 2021-05-14 15:11 ` Dinh Nguyen
2021-05-29 9:06 ` yukuai (C)
2021-06-02 7:48 ` Stephen Boyd
1 sibling, 1 reply; 8+ messages in thread
From: Dinh Nguyen @ 2021-05-14 15:11 UTC (permalink / raw)
To: Yu Kuai, mturquette, sboyd, s.trumtrar; +Cc: linux-clk, linux-kernel, yi.zhang
On 5/14/21 1:22 AM, Yu Kuai wrote:
> Fixes gcc '-Wunused-but-set-variable' warning:
>
> drivers/clk/socfpga/clk-pll.c:83:6: warning: variable ‘rc’ set but
> not used [-Wunused-but-set-variable]
>
> The returned value of of_clk_add_provider() is never used, and so
> can be removed.
>
> Fixes: 97259e99bdc9 ("clk: socfpga: split clk code")
> Signed-off-by: Yu Kuai <yukuai3@huawei.com>
> ---
> drivers/clk/socfpga/clk-pll.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/clk/socfpga/clk-pll.c b/drivers/clk/socfpga/clk-pll.c
> index dcb573d44034..127cc849c5ee 100644
> --- a/drivers/clk/socfpga/clk-pll.c
> +++ b/drivers/clk/socfpga/clk-pll.c
> @@ -80,7 +80,6 @@ static __init struct clk_hw *__socfpga_pll_init(struct device_node *node,
> const char *parent_name[SOCFPGA_MAX_PARENTS];
> struct clk_init_data init;
> struct device_node *clkmgr_np;
> - int rc;
> int err;
>
> of_property_read_u32(node, "reg", ®);
> @@ -114,7 +113,7 @@ static __init struct clk_hw *__socfpga_pll_init(struct device_node *node,
> kfree(pll_clk);
> return ERR_PTR(err);
> }
> - rc = of_clk_add_provider(node, of_clk_src_simple_get, hw_clk);
> + of_clk_add_provider(node, of_clk_src_simple_get, hw_clk);
> return hw_clk;
> }
>
>
Acked-by: Dinh Nguyen <dinguyen@kernel.org>
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] clk: socfpga: remove set but not used variable 'rc'
2021-05-14 15:11 ` Dinh Nguyen
@ 2021-05-29 9:06 ` yukuai (C)
0 siblings, 0 replies; 8+ messages in thread
From: yukuai (C) @ 2021-05-29 9:06 UTC (permalink / raw)
To: Dinh Nguyen, mturquette, sboyd, s.trumtrar
Cc: linux-clk, linux-kernel, yi.zhang
ping ...
On 2021/05/14 23:11, Dinh Nguyen wrote:
>
>
> On 5/14/21 1:22 AM, Yu Kuai wrote:
>> Fixes gcc '-Wunused-but-set-variable' warning:
>>
>> drivers/clk/socfpga/clk-pll.c:83:6: warning: variable ‘rc’ set but
>> not used [-Wunused-but-set-variable]
>>
>> The returned value of of_clk_add_provider() is never used, and so
>> can be removed.
>>
>> Fixes: 97259e99bdc9 ("clk: socfpga: split clk code")
>> Signed-off-by: Yu Kuai <yukuai3@huawei.com>
>> ---
>> drivers/clk/socfpga/clk-pll.c | 3 +--
>> 1 file changed, 1 insertion(+), 2 deletions(-)
>>
>> diff --git a/drivers/clk/socfpga/clk-pll.c
>> b/drivers/clk/socfpga/clk-pll.c
>> index dcb573d44034..127cc849c5ee 100644
>> --- a/drivers/clk/socfpga/clk-pll.c
>> +++ b/drivers/clk/socfpga/clk-pll.c
>> @@ -80,7 +80,6 @@ static __init struct clk_hw
>> *__socfpga_pll_init(struct device_node *node,
>> const char *parent_name[SOCFPGA_MAX_PARENTS];
>> struct clk_init_data init;
>> struct device_node *clkmgr_np;
>> - int rc;
>> int err;
>> of_property_read_u32(node, "reg", ®);
>> @@ -114,7 +113,7 @@ static __init struct clk_hw
>> *__socfpga_pll_init(struct device_node *node,
>> kfree(pll_clk);
>> return ERR_PTR(err);
>> }
>> - rc = of_clk_add_provider(node, of_clk_src_simple_get, hw_clk);
>> + of_clk_add_provider(node, of_clk_src_simple_get, hw_clk);
>> return hw_clk;
>> }
>>
>
> Acked-by: Dinh Nguyen <dinguyen@kernel.org>
> .
>
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] clk: socfpga: remove set but not used variable 'rc'
2021-05-14 6:22 [PATCH] clk: socfpga: remove set but not used variable 'rc' Yu Kuai
2021-05-14 15:11 ` Dinh Nguyen
@ 2021-06-02 7:48 ` Stephen Boyd
2021-06-02 8:11 ` yukuai (C)
2021-06-02 8:42 ` [PATCH V2] clk: socfpga: err out if of_clk_add_provider() failed in __socfpga_pll_init() Yu Kuai
1 sibling, 2 replies; 8+ messages in thread
From: Stephen Boyd @ 2021-06-02 7:48 UTC (permalink / raw)
To: Yu Kuai, dinguyen, mturquette, s.trumtrar
Cc: linux-clk, linux-kernel, yukuai3, yi.zhang
Quoting Yu Kuai (2021-05-13 23:22:34)
> Fixes gcc '-Wunused-but-set-variable' warning:
>
> drivers/clk/socfpga/clk-pll.c:83:6: warning: variable ‘rc’ set but
> not used [-Wunused-but-set-variable]
>
> The returned value of of_clk_add_provider() is never used, and so
> can be removed.
>
> Fixes: 97259e99bdc9 ("clk: socfpga: split clk code")
> Signed-off-by: Yu Kuai <yukuai3@huawei.com>
> ---
> drivers/clk/socfpga/clk-pll.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/clk/socfpga/clk-pll.c b/drivers/clk/socfpga/clk-pll.c
> index dcb573d44034..127cc849c5ee 100644
> --- a/drivers/clk/socfpga/clk-pll.c
> +++ b/drivers/clk/socfpga/clk-pll.c
> @@ -80,7 +80,6 @@ static __init struct clk_hw *__socfpga_pll_init(struct device_node *node,
> const char *parent_name[SOCFPGA_MAX_PARENTS];
> struct clk_init_data init;
> struct device_node *clkmgr_np;
> - int rc;
> int err;
>
> of_property_read_u32(node, "reg", ®);
> @@ -114,7 +113,7 @@ static __init struct clk_hw *__socfpga_pll_init(struct device_node *node,
> kfree(pll_clk);
> return ERR_PTR(err);
> }
> - rc = of_clk_add_provider(node, of_clk_src_simple_get, hw_clk);
> + of_clk_add_provider(node, of_clk_src_simple_get, hw_clk);
Shouldn't we fail if of_clk_add_provider() fails? So return some sort of
error pointer and unwind allocations, etc.
> return hw_clk;
> }
>
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] clk: socfpga: remove set but not used variable 'rc'
2021-06-02 7:48 ` Stephen Boyd
@ 2021-06-02 8:11 ` yukuai (C)
2021-06-02 8:42 ` [PATCH V2] clk: socfpga: err out if of_clk_add_provider() failed in __socfpga_pll_init() Yu Kuai
1 sibling, 0 replies; 8+ messages in thread
From: yukuai (C) @ 2021-06-02 8:11 UTC (permalink / raw)
To: Stephen Boyd, dinguyen, mturquette, s.trumtrar
Cc: linux-clk, linux-kernel, yi.zhang
On 2021/06/02 15:48, Stephen Boyd wrote:
> Quoting Yu Kuai (2021-05-13 23:22:34)
>> Fixes gcc '-Wunused-but-set-variable' warning:
>>
>> drivers/clk/socfpga/clk-pll.c:83:6: warning: variable ‘rc’ set but
>> not used [-Wunused-but-set-variable]
>>
>> The returned value of of_clk_add_provider() is never used, and so
>> can be removed.
>>
>> Fixes: 97259e99bdc9 ("clk: socfpga: split clk code")
>> Signed-off-by: Yu Kuai <yukuai3@huawei.com>
>> ---
>> drivers/clk/socfpga/clk-pll.c | 3 +--
>> 1 file changed, 1 insertion(+), 2 deletions(-)
>>
>> diff --git a/drivers/clk/socfpga/clk-pll.c b/drivers/clk/socfpga/clk-pll.c
>> index dcb573d44034..127cc849c5ee 100644
>> --- a/drivers/clk/socfpga/clk-pll.c
>> +++ b/drivers/clk/socfpga/clk-pll.c
>> @@ -80,7 +80,6 @@ static __init struct clk_hw *__socfpga_pll_init(struct device_node *node,
>> const char *parent_name[SOCFPGA_MAX_PARENTS];
>> struct clk_init_data init;
>> struct device_node *clkmgr_np;
>> - int rc;
>> int err;
>>
>> of_property_read_u32(node, "reg", ®);
>> @@ -114,7 +113,7 @@ static __init struct clk_hw *__socfpga_pll_init(struct device_node *node,
>> kfree(pll_clk);
>> return ERR_PTR(err);
>> }
>> - rc = of_clk_add_provider(node, of_clk_src_simple_get, hw_clk);
>> + of_clk_add_provider(node, of_clk_src_simple_get, hw_clk);
>
> Shouldn't we fail if of_clk_add_provider() fails? So return some sort of
> error pointer and unwind allocations, etc.
Will send a v2 patch. By the way, do you think it's better to
return error pointer instead of NULL pointer when kzalloc() failed?
Thanks
Yu Kuai
>
>> return hw_clk;
>> }
>>
> .
>
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH V2] clk: socfpga: err out if of_clk_add_provider() failed in __socfpga_pll_init()
2021-06-02 7:48 ` Stephen Boyd
2021-06-02 8:11 ` yukuai (C)
@ 2021-06-02 8:42 ` Yu Kuai
2021-06-07 9:08 ` yukuai (C)
2021-06-09 21:57 ` Stephen Boyd
1 sibling, 2 replies; 8+ messages in thread
From: Yu Kuai @ 2021-06-02 8:42 UTC (permalink / raw)
To: dinguyen, mturquette, sboyd; +Cc: linux-clk, linux-kernel, yukuai3, yi.zhang
__socfpga_pll_init() should fail if of_clk_add_provider() failed.
remove 'rc' in the meantime to avoid gcc
'-Wunused-but-set-variable' warning.
Signed-off-by: Yu Kuai <yukuai3@huawei.com>
---
changes in V2:
- remove 'rc' and use err' instead of 'rc'
- err out if of_clk_add_provider() failed
drivers/clk/socfpga/clk-pll.c | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/drivers/clk/socfpga/clk-pll.c b/drivers/clk/socfpga/clk-pll.c
index dcb573d44034..5a9eec2eca80 100644
--- a/drivers/clk/socfpga/clk-pll.c
+++ b/drivers/clk/socfpga/clk-pll.c
@@ -80,7 +80,6 @@ static __init struct clk_hw *__socfpga_pll_init(struct device_node *node,
const char *parent_name[SOCFPGA_MAX_PARENTS];
struct clk_init_data init;
struct device_node *clkmgr_np;
- int rc;
int err;
of_property_read_u32(node, "reg", ®);
@@ -110,12 +109,16 @@ static __init struct clk_hw *__socfpga_pll_init(struct device_node *node,
hw_clk = &pll_clk->hw.hw;
err = clk_hw_register(NULL, hw_clk);
- if (err) {
- kfree(pll_clk);
- return ERR_PTR(err);
- }
- rc = of_clk_add_provider(node, of_clk_src_simple_get, hw_clk);
+ if (err)
+ goto err_out;
+ err = of_clk_add_provider(node, of_clk_src_simple_get, hw_clk);
+ if (err)
+ goto err_out;
return hw_clk;
+
+err_out:
+ kfree(pll_clk);
+ return ERR_PTR(err);
}
void __init socfpga_pll_init(struct device_node *node)
--
2.31.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH V2] clk: socfpga: err out if of_clk_add_provider() failed in __socfpga_pll_init()
2021-06-02 8:42 ` [PATCH V2] clk: socfpga: err out if of_clk_add_provider() failed in __socfpga_pll_init() Yu Kuai
@ 2021-06-07 9:08 ` yukuai (C)
2021-06-09 21:57 ` Stephen Boyd
1 sibling, 0 replies; 8+ messages in thread
From: yukuai (C) @ 2021-06-07 9:08 UTC (permalink / raw)
To: dinguyen, mturquette, sboyd; +Cc: linux-clk, linux-kernel, yi.zhang
ping ...
On 2021/06/02 16:42, Yu Kuai wrote:
> __socfpga_pll_init() should fail if of_clk_add_provider() failed.
> remove 'rc' in the meantime to avoid gcc
> '-Wunused-but-set-variable' warning.
>
> Signed-off-by: Yu Kuai <yukuai3@huawei.com>
> ---
> changes in V2:
> - remove 'rc' and use err' instead of 'rc'
> - err out if of_clk_add_provider() failed
>
> drivers/clk/socfpga/clk-pll.c | 15 +++++++++------
> 1 file changed, 9 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/clk/socfpga/clk-pll.c b/drivers/clk/socfpga/clk-pll.c
> index dcb573d44034..5a9eec2eca80 100644
> --- a/drivers/clk/socfpga/clk-pll.c
> +++ b/drivers/clk/socfpga/clk-pll.c
> @@ -80,7 +80,6 @@ static __init struct clk_hw *__socfpga_pll_init(struct device_node *node,
> const char *parent_name[SOCFPGA_MAX_PARENTS];
> struct clk_init_data init;
> struct device_node *clkmgr_np;
> - int rc;
> int err;
>
> of_property_read_u32(node, "reg", ®);
> @@ -110,12 +109,16 @@ static __init struct clk_hw *__socfpga_pll_init(struct device_node *node,
> hw_clk = &pll_clk->hw.hw;
>
> err = clk_hw_register(NULL, hw_clk);
> - if (err) {
> - kfree(pll_clk);
> - return ERR_PTR(err);
> - }
> - rc = of_clk_add_provider(node, of_clk_src_simple_get, hw_clk);
> + if (err)
> + goto err_out;
> + err = of_clk_add_provider(node, of_clk_src_simple_get, hw_clk);
> + if (err)
> + goto err_out;
> return hw_clk;
> +
> +err_out:
> + kfree(pll_clk);
> + return ERR_PTR(err);
> }
>
> void __init socfpga_pll_init(struct device_node *node)
>
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH V2] clk: socfpga: err out if of_clk_add_provider() failed in __socfpga_pll_init()
2021-06-02 8:42 ` [PATCH V2] clk: socfpga: err out if of_clk_add_provider() failed in __socfpga_pll_init() Yu Kuai
2021-06-07 9:08 ` yukuai (C)
@ 2021-06-09 21:57 ` Stephen Boyd
1 sibling, 0 replies; 8+ messages in thread
From: Stephen Boyd @ 2021-06-09 21:57 UTC (permalink / raw)
To: Yu Kuai, dinguyen, mturquette; +Cc: linux-clk, linux-kernel, yukuai3, yi.zhang
Quoting Yu Kuai (2021-06-02 01:42:59)
> __socfpga_pll_init() should fail if of_clk_add_provider() failed.
> remove 'rc' in the meantime to avoid gcc
> '-Wunused-but-set-variable' warning.
>
> Signed-off-by: Yu Kuai <yukuai3@huawei.com>
> ---
Please don't send as in-reply-to previous patches. Makes it hard for me
to find them on the list.
> changes in V2:
> - remove 'rc' and use err' instead of 'rc'
> - err out if of_clk_add_provider() failed
>
> drivers/clk/socfpga/clk-pll.c | 15 +++++++++------
> 1 file changed, 9 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/clk/socfpga/clk-pll.c b/drivers/clk/socfpga/clk-pll.c
> index dcb573d44034..5a9eec2eca80 100644
> --- a/drivers/clk/socfpga/clk-pll.c
> +++ b/drivers/clk/socfpga/clk-pll.c
> @@ -80,7 +80,6 @@ static __init struct clk_hw *__socfpga_pll_init(struct device_node *node,
> const char *parent_name[SOCFPGA_MAX_PARENTS];
> struct clk_init_data init;
> struct device_node *clkmgr_np;
> - int rc;
> int err;
>
> of_property_read_u32(node, "reg", ®);
> @@ -110,12 +109,16 @@ static __init struct clk_hw *__socfpga_pll_init(struct device_node *node,
> hw_clk = &pll_clk->hw.hw;
>
> err = clk_hw_register(NULL, hw_clk);
> - if (err) {
> - kfree(pll_clk);
> - return ERR_PTR(err);
> - }
> - rc = of_clk_add_provider(node, of_clk_src_simple_get, hw_clk);
> + if (err)
> + goto err_out;
> + err = of_clk_add_provider(node, of_clk_src_simple_get, hw_clk);
> + if (err)
Now we don't unregister the clk on failure? Can you use
of_clk_add_hw_provider() as well? That would make this more modern. It
can be done as a followup patch to this one.
> + goto err_out;
> return hw_clk;
> +
> +err_out:
> + kfree(pll_clk);
> + return ERR_PTR(err);
> }
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2021-06-09 21:57 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-14 6:22 [PATCH] clk: socfpga: remove set but not used variable 'rc' Yu Kuai
2021-05-14 15:11 ` Dinh Nguyen
2021-05-29 9:06 ` yukuai (C)
2021-06-02 7:48 ` Stephen Boyd
2021-06-02 8:11 ` yukuai (C)
2021-06-02 8:42 ` [PATCH V2] clk: socfpga: err out if of_clk_add_provider() failed in __socfpga_pll_init() Yu Kuai
2021-06-07 9:08 ` yukuai (C)
2021-06-09 21:57 ` Stephen Boyd
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).