| Message ID | 1357712988-22317-1-git-send-email-rajagopal.venkat@linaro.org |
|---|---|
| State | New |
| Headers | show |
On 01/09/2013 11:59 AM, Rajagopal Venkat wrote: > while reparenting a clock, NULL check is done for clock in > consideration and its new parent. So re-check is not required. > If done, else part becomes unreachable. > > Signed-off-by: Rajagopal Venkat <rajagopal.venkat@linaro.org> > --- It is good to have revision history of the patches (version number and changelog). > drivers/clk/clk.c | 13 ++----------- > 1 file changed, 2 insertions(+), 11 deletions(-) > > diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c > index 251e45d..1c4097c 100644 > --- a/drivers/clk/clk.c > +++ b/drivers/clk/clk.c > @@ -1040,7 +1040,6 @@ void __clk_reparent(struct clk *clk, struct clk *new_parent) > { > #ifdef CONFIG_COMMON_CLK_DEBUG > struct dentry *d; > - struct dentry *new_parent_d; > #endif > > if (!clk || !new_parent) > @@ -1048,22 +1047,14 @@ void __clk_reparent(struct clk *clk, struct clk *new_parent) > > hlist_del(&clk->child_node); > > - if (new_parent) > - hlist_add_head(&clk->child_node, &new_parent->children); > - else > - hlist_add_head(&clk->child_node, &clk_orphan_list); > + hlist_add_head(&clk->child_node, &new_parent->children); > > #ifdef CONFIG_COMMON_CLK_DEBUG > if (!inited) > goto out; > > - if (new_parent) > - new_parent_d = new_parent->dentry; > - else > - new_parent_d = orphandir; > - > d = debugfs_rename(clk->dentry->d_parent, clk->dentry, > - new_parent_d, clk->name); > + new_parent->dentry, clk->name); > if (d) > clk->dentry = d; > else >
diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c index 251e45d..1c4097c 100644 --- a/drivers/clk/clk.c +++ b/drivers/clk/clk.c @@ -1040,7 +1040,6 @@ void __clk_reparent(struct clk *clk, struct clk *new_parent) { #ifdef CONFIG_COMMON_CLK_DEBUG struct dentry *d; - struct dentry *new_parent_d; #endif if (!clk || !new_parent) @@ -1048,22 +1047,14 @@ void __clk_reparent(struct clk *clk, struct clk *new_parent) hlist_del(&clk->child_node); - if (new_parent) - hlist_add_head(&clk->child_node, &new_parent->children); - else - hlist_add_head(&clk->child_node, &clk_orphan_list); + hlist_add_head(&clk->child_node, &new_parent->children); #ifdef CONFIG_COMMON_CLK_DEBUG if (!inited) goto out; - if (new_parent) - new_parent_d = new_parent->dentry; - else - new_parent_d = orphandir; - d = debugfs_rename(clk->dentry->d_parent, clk->dentry, - new_parent_d, clk->name); + new_parent->dentry, clk->name); if (d) clk->dentry = d; else
while reparenting a clock, NULL check is done for clock in consideration and its new parent. So re-check is not required. If done, else part becomes unreachable. Signed-off-by: Rajagopal Venkat <rajagopal.venkat@linaro.org> --- drivers/clk/clk.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-)