* Re: [PATCH] clk: ti: Remove unused function ti_clk_build_component_gate
2019-05-12 10:03 [PATCH] clk: ti: Remove unused function ti_clk_build_component_gate YueHaibing
@ 2019-05-13 7:22 ` Tero Kristo
2019-05-13 8:04 ` YueHaibing
2019-05-13 8:32 ` [PATCH v2] clk: ti: Remove unused functions YueHaibing
2019-05-29 9:39 ` [PATCH v3] " YueHaibing
2 siblings, 1 reply; 6+ messages in thread
From: Tero Kristo @ 2019-05-13 7:22 UTC (permalink / raw)
To: YueHaibing, mturquette, sboyd; +Cc: linux-kernel, linux-omap, linux-clk
On 12/05/2019 13:03, YueHaibing wrote:
> There is no callers in tree, so can be removed.
Looks ok to me, basically legacy code that we forgot to remove while doing:
commit 7558562a70fbd6b3fa746fa33c76c9333aa0bb32
Author: Tony Lindgren <tony@atomide.com>
Date: Thu Dec 14 08:32:06 2017 -0800
clk: ti: Drop legacy clk-3xxx-legacy code
Could drop the same code for mux/div also though.
-Tero
>
> Reported-by: Hulk Robot <hulkci@huawei.com>
> Signed-off-by: YueHaibing <yuehaibing@huawei.com>
> ---
> drivers/clk/ti/gate.c | 30 ------------------------------
> 1 file changed, 30 deletions(-)
>
> diff --git a/drivers/clk/ti/gate.c b/drivers/clk/ti/gate.c
> index 504c0e9..4238955 100644
> --- a/drivers/clk/ti/gate.c
> +++ b/drivers/clk/ti/gate.c
> @@ -131,36 +131,6 @@ static struct clk *_register_gate(struct device *dev, const char *name,
> return clk;
> }
>
> -struct clk_hw *ti_clk_build_component_gate(struct ti_clk_gate *setup)
> -{
> - struct clk_hw_omap *gate;
> - struct clk_omap_reg *reg;
> - const struct clk_hw_omap_ops *ops = &clkhwops_wait;
> -
> - if (!setup)
> - return NULL;
> -
> - gate = kzalloc(sizeof(*gate), GFP_KERNEL);
> - if (!gate)
> - return ERR_PTR(-ENOMEM);
> -
> - reg = (struct clk_omap_reg *)&gate->enable_reg;
> - reg->index = setup->module;
> - reg->offset = setup->reg;
> -
> - gate->enable_bit = setup->bit_shift;
> -
> - if (setup->flags & CLKF_NO_WAIT)
> - ops = NULL;
> -
> - if (setup->flags & CLKF_INTERFACE)
> - ops = &clkhwops_iclk_wait;
> -
> - gate->ops = ops;
> -
> - return &gate->hw;
> -}
> -
> static void __init _of_ti_gate_clk_setup(struct device_node *node,
> const struct clk_ops *ops,
> const struct clk_hw_omap_ops *hw_ops)
>
--
Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] clk: ti: Remove unused function ti_clk_build_component_gate
2019-05-13 7:22 ` Tero Kristo
@ 2019-05-13 8:04 ` YueHaibing
0 siblings, 0 replies; 6+ messages in thread
From: YueHaibing @ 2019-05-13 8:04 UTC (permalink / raw)
To: Tero Kristo, mturquette, sboyd; +Cc: linux-kernel, linux-omap, linux-clk
On 2019/5/13 15:22, Tero Kristo wrote:
> On 12/05/2019 13:03, YueHaibing wrote:
>> There is no callers in tree, so can be removed.
>
> Looks ok to me, basically legacy code that we forgot to remove while doing:
>
> commit 7558562a70fbd6b3fa746fa33c76c9333aa0bb32
> Author: Tony Lindgren <tony@atomide.com>
> Date: Thu Dec 14 08:32:06 2017 -0800
>
> clk: ti: Drop legacy clk-3xxx-legacy code
>
> Could drop the same code for mux/div also though.
Yes, I can send v2 also to remove this two, thanks!
>
> -Tero
>
>>
>> Reported-by: Hulk Robot <hulkci@huawei.com>
>> Signed-off-by: YueHaibing <yuehaibing@huawei.com>
>> ---
>> drivers/clk/ti/gate.c | 30 ------------------------------
>> 1 file changed, 30 deletions(-)
>>
>> diff --git a/drivers/clk/ti/gate.c b/drivers/clk/ti/gate.c
>> index 504c0e9..4238955 100644
>> --- a/drivers/clk/ti/gate.c
>> +++ b/drivers/clk/ti/gate.c
>> @@ -131,36 +131,6 @@ static struct clk *_register_gate(struct device *dev, const char *name,
>> return clk;
>> }
>> -struct clk_hw *ti_clk_build_component_gate(struct ti_clk_gate *setup)
>> -{
>> - struct clk_hw_omap *gate;
>> - struct clk_omap_reg *reg;
>> - const struct clk_hw_omap_ops *ops = &clkhwops_wait;
>> -
>> - if (!setup)
>> - return NULL;
>> -
>> - gate = kzalloc(sizeof(*gate), GFP_KERNEL);
>> - if (!gate)
>> - return ERR_PTR(-ENOMEM);
>> -
>> - reg = (struct clk_omap_reg *)&gate->enable_reg;
>> - reg->index = setup->module;
>> - reg->offset = setup->reg;
>> -
>> - gate->enable_bit = setup->bit_shift;
>> -
>> - if (setup->flags & CLKF_NO_WAIT)
>> - ops = NULL;
>> -
>> - if (setup->flags & CLKF_INTERFACE)
>> - ops = &clkhwops_iclk_wait;
>> -
>> - gate->ops = ops;
>> -
>> - return &gate->hw;
>> -}
>> -
>> static void __init _of_ti_gate_clk_setup(struct device_node *node,
>> const struct clk_ops *ops,
>> const struct clk_hw_omap_ops *hw_ops)
>>
>
> --
> Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki
>
> .
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v2] clk: ti: Remove unused functions
2019-05-12 10:03 [PATCH] clk: ti: Remove unused function ti_clk_build_component_gate YueHaibing
2019-05-13 7:22 ` Tero Kristo
@ 2019-05-13 8:32 ` YueHaibing
2019-05-29 9:39 ` [PATCH v3] " YueHaibing
2 siblings, 0 replies; 6+ messages in thread
From: YueHaibing @ 2019-05-13 8:32 UTC (permalink / raw)
To: t-kristo, mturquette, sboyd
Cc: linux-kernel, linux-omap, linux-clk, YueHaibing
They are not used any more since
commit 7558562a70fb ("clk: ti: Drop legacy clk-3xxx-legacy code")
Reported-by: Hulk Robot <hulkci@huawei.com>
Suggested-by: Tero Kristo <t-kristo@ti.com>
Signed-off-by: YueHaibing <yuehaibing@huawei.com>
---
v2: also remove mux/div unused functions
---
drivers/clk/ti/divider.c | 36 ------------------------------------
drivers/clk/ti/gate.c | 30 ------------------------------
drivers/clk/ti/mux.c | 31 -------------------------------
3 files changed, 97 deletions(-)
diff --git a/drivers/clk/ti/divider.c b/drivers/clk/ti/divider.c
index 4786e0e..c2ff4ce 100644
--- a/drivers/clk/ti/divider.c
+++ b/drivers/clk/ti/divider.c
@@ -474,42 +474,6 @@ struct clk_hw *ti_clk_build_component_div(struct ti_clk_divider *setup)
return &div->hw;
}
-struct clk *ti_clk_register_divider(struct ti_clk *setup)
-{
- struct ti_clk_divider *div = setup->data;
- struct clk_omap_reg reg = {
- .index = div->module,
- .offset = div->reg,
- };
- u8 width;
- u32 flags = 0;
- u8 div_flags = 0;
- const struct clk_div_table *table;
- struct clk *clk;
-
- if (div->flags & CLKF_INDEX_STARTS_AT_ONE)
- div_flags |= CLK_DIVIDER_ONE_BASED;
-
- if (div->flags & CLKF_INDEX_POWER_OF_TWO)
- div_flags |= CLK_DIVIDER_POWER_OF_TWO;
-
- if (div->flags & CLKF_SET_RATE_PARENT)
- flags |= CLK_SET_RATE_PARENT;
-
- table = _get_div_table_from_setup(div, &width);
- if (IS_ERR(table))
- return (struct clk *)table;
-
- clk = _register_divider(NULL, setup->name, div->parent,
- flags, ®, div->bit_shift,
- width, -EINVAL, div_flags, table);
-
- if (IS_ERR(clk))
- kfree(table);
-
- return clk;
-}
-
static struct clk_div_table *
__init ti_clk_get_div_table(struct device_node *node)
{
diff --git a/drivers/clk/ti/gate.c b/drivers/clk/ti/gate.c
index 504c0e9..4238955 100644
--- a/drivers/clk/ti/gate.c
+++ b/drivers/clk/ti/gate.c
@@ -131,36 +131,6 @@ static struct clk *_register_gate(struct device *dev, const char *name,
return clk;
}
-struct clk_hw *ti_clk_build_component_gate(struct ti_clk_gate *setup)
-{
- struct clk_hw_omap *gate;
- struct clk_omap_reg *reg;
- const struct clk_hw_omap_ops *ops = &clkhwops_wait;
-
- if (!setup)
- return NULL;
-
- gate = kzalloc(sizeof(*gate), GFP_KERNEL);
- if (!gate)
- return ERR_PTR(-ENOMEM);
-
- reg = (struct clk_omap_reg *)&gate->enable_reg;
- reg->index = setup->module;
- reg->offset = setup->reg;
-
- gate->enable_bit = setup->bit_shift;
-
- if (setup->flags & CLKF_NO_WAIT)
- ops = NULL;
-
- if (setup->flags & CLKF_INTERFACE)
- ops = &clkhwops_iclk_wait;
-
- gate->ops = ops;
-
- return &gate->hw;
-}
-
static void __init _of_ti_gate_clk_setup(struct device_node *node,
const struct clk_ops *ops,
const struct clk_hw_omap_ops *hw_ops)
diff --git a/drivers/clk/ti/mux.c b/drivers/clk/ti/mux.c
index b7f9a4f..0069e7c 100644
--- a/drivers/clk/ti/mux.c
+++ b/drivers/clk/ti/mux.c
@@ -164,37 +164,6 @@ static struct clk *_register_mux(struct device *dev, const char *name,
return clk;
}
-struct clk *ti_clk_register_mux(struct ti_clk *setup)
-{
- struct ti_clk_mux *mux;
- u32 flags;
- u8 mux_flags = 0;
- struct clk_omap_reg reg;
- u32 mask;
-
- mux = setup->data;
- flags = CLK_SET_RATE_NO_REPARENT;
-
- mask = mux->num_parents;
- if (!(mux->flags & CLKF_INDEX_STARTS_AT_ONE))
- mask--;
-
- mask = (1 << fls(mask)) - 1;
- reg.index = mux->module;
- reg.offset = mux->reg;
- reg.ptr = NULL;
-
- if (mux->flags & CLKF_INDEX_STARTS_AT_ONE)
- mux_flags |= CLK_MUX_INDEX_ONE;
-
- if (mux->flags & CLKF_SET_RATE_PARENT)
- flags |= CLK_SET_RATE_PARENT;
-
- return _register_mux(NULL, setup->name, mux->parents, mux->num_parents,
- flags, ®, mux->bit_shift, mask, -EINVAL,
- mux_flags, NULL);
-}
-
/**
* of_mux_clk_setup - Setup function for simple mux rate clock
* @node: DT node for the clock
--
2.7.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH v3] clk: ti: Remove unused functions
2019-05-12 10:03 [PATCH] clk: ti: Remove unused function ti_clk_build_component_gate YueHaibing
2019-05-13 7:22 ` Tero Kristo
2019-05-13 8:32 ` [PATCH v2] clk: ti: Remove unused functions YueHaibing
@ 2019-05-29 9:39 ` YueHaibing
2019-06-06 17:55 ` Stephen Boyd
2 siblings, 1 reply; 6+ messages in thread
From: YueHaibing @ 2019-05-29 9:39 UTC (permalink / raw)
To: t-kristo, mturquette, sboyd, tony
Cc: linux-kernel, linux-clk, linux-omap, YueHaibing
They are not used any more since
commit 7558562a70fb ("clk: ti: Drop legacy clk-3xxx-legacy code")
Reported-by: Hulk Robot <hulkci@huawei.com>
Suggested-by: Tero Kristo <t-kristo@ti.com>
Signed-off-by: YueHaibing <yuehaibing@huawei.com>
---
v3: remove ti_clk_build_component_div and _get_div_table_from_setup
v2: also remove mux/div unused functions
---
drivers/clk/ti/divider.c | 85 ----------------------------------------
drivers/clk/ti/gate.c | 30 --------------
drivers/clk/ti/mux.c | 31 ---------------
3 files changed, 146 deletions(-)
diff --git a/drivers/clk/ti/divider.c b/drivers/clk/ti/divider.c
index 4786e0ebc2e8..6cb863c13648 100644
--- a/drivers/clk/ti/divider.c
+++ b/drivers/clk/ti/divider.c
@@ -425,91 +425,6 @@ int ti_clk_parse_divider_data(int *div_table, int num_dividers, int max_div,
return 0;
}
-static const struct clk_div_table *
-_get_div_table_from_setup(struct ti_clk_divider *setup, u8 *width)
-{
- const struct clk_div_table *table = NULL;
-
- ti_clk_parse_divider_data(setup->dividers, setup->num_dividers,
- setup->max_div, setup->flags, width,
- &table);
-
- return table;
-}
-
-struct clk_hw *ti_clk_build_component_div(struct ti_clk_divider *setup)
-{
- struct clk_omap_divider *div;
- struct clk_omap_reg *reg;
- int ret;
-
- if (!setup)
- return NULL;
-
- div = kzalloc(sizeof(*div), GFP_KERNEL);
- if (!div)
- return ERR_PTR(-ENOMEM);
-
- reg = (struct clk_omap_reg *)&div->reg;
- reg->index = setup->module;
- reg->offset = setup->reg;
-
- if (setup->flags & CLKF_INDEX_STARTS_AT_ONE)
- div->flags |= CLK_DIVIDER_ONE_BASED;
-
- if (setup->flags & CLKF_INDEX_POWER_OF_TWO)
- div->flags |= CLK_DIVIDER_POWER_OF_TWO;
-
- div->table = _get_div_table_from_setup(setup, &div->width);
- if (IS_ERR(div->table)) {
- ret = PTR_ERR(div->table);
- kfree(div);
- return ERR_PTR(ret);
- }
-
-
- div->shift = setup->bit_shift;
- div->latch = -EINVAL;
-
- return &div->hw;
-}
-
-struct clk *ti_clk_register_divider(struct ti_clk *setup)
-{
- struct ti_clk_divider *div = setup->data;
- struct clk_omap_reg reg = {
- .index = div->module,
- .offset = div->reg,
- };
- u8 width;
- u32 flags = 0;
- u8 div_flags = 0;
- const struct clk_div_table *table;
- struct clk *clk;
-
- if (div->flags & CLKF_INDEX_STARTS_AT_ONE)
- div_flags |= CLK_DIVIDER_ONE_BASED;
-
- if (div->flags & CLKF_INDEX_POWER_OF_TWO)
- div_flags |= CLK_DIVIDER_POWER_OF_TWO;
-
- if (div->flags & CLKF_SET_RATE_PARENT)
- flags |= CLK_SET_RATE_PARENT;
-
- table = _get_div_table_from_setup(div, &width);
- if (IS_ERR(table))
- return (struct clk *)table;
-
- clk = _register_divider(NULL, setup->name, div->parent,
- flags, ®, div->bit_shift,
- width, -EINVAL, div_flags, table);
-
- if (IS_ERR(clk))
- kfree(table);
-
- return clk;
-}
-
static struct clk_div_table *
__init ti_clk_get_div_table(struct device_node *node)
{
diff --git a/drivers/clk/ti/gate.c b/drivers/clk/ti/gate.c
index 504c0e91cdc7..42389558418c 100644
--- a/drivers/clk/ti/gate.c
+++ b/drivers/clk/ti/gate.c
@@ -131,36 +131,6 @@ static struct clk *_register_gate(struct device *dev, const char *name,
return clk;
}
-struct clk_hw *ti_clk_build_component_gate(struct ti_clk_gate *setup)
-{
- struct clk_hw_omap *gate;
- struct clk_omap_reg *reg;
- const struct clk_hw_omap_ops *ops = &clkhwops_wait;
-
- if (!setup)
- return NULL;
-
- gate = kzalloc(sizeof(*gate), GFP_KERNEL);
- if (!gate)
- return ERR_PTR(-ENOMEM);
-
- reg = (struct clk_omap_reg *)&gate->enable_reg;
- reg->index = setup->module;
- reg->offset = setup->reg;
-
- gate->enable_bit = setup->bit_shift;
-
- if (setup->flags & CLKF_NO_WAIT)
- ops = NULL;
-
- if (setup->flags & CLKF_INTERFACE)
- ops = &clkhwops_iclk_wait;
-
- gate->ops = ops;
-
- return &gate->hw;
-}
-
static void __init _of_ti_gate_clk_setup(struct device_node *node,
const struct clk_ops *ops,
const struct clk_hw_omap_ops *hw_ops)
diff --git a/drivers/clk/ti/mux.c b/drivers/clk/ti/mux.c
index b7f9a4f068bf..0069e7cf3ebc 100644
--- a/drivers/clk/ti/mux.c
+++ b/drivers/clk/ti/mux.c
@@ -164,37 +164,6 @@ static struct clk *_register_mux(struct device *dev, const char *name,
return clk;
}
-struct clk *ti_clk_register_mux(struct ti_clk *setup)
-{
- struct ti_clk_mux *mux;
- u32 flags;
- u8 mux_flags = 0;
- struct clk_omap_reg reg;
- u32 mask;
-
- mux = setup->data;
- flags = CLK_SET_RATE_NO_REPARENT;
-
- mask = mux->num_parents;
- if (!(mux->flags & CLKF_INDEX_STARTS_AT_ONE))
- mask--;
-
- mask = (1 << fls(mask)) - 1;
- reg.index = mux->module;
- reg.offset = mux->reg;
- reg.ptr = NULL;
-
- if (mux->flags & CLKF_INDEX_STARTS_AT_ONE)
- mux_flags |= CLK_MUX_INDEX_ONE;
-
- if (mux->flags & CLKF_SET_RATE_PARENT)
- flags |= CLK_SET_RATE_PARENT;
-
- return _register_mux(NULL, setup->name, mux->parents, mux->num_parents,
- flags, ®, mux->bit_shift, mask, -EINVAL,
- mux_flags, NULL);
-}
-
/**
* of_mux_clk_setup - Setup function for simple mux rate clock
* @node: DT node for the clock
--
2.17.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH v3] clk: ti: Remove unused functions
2019-05-29 9:39 ` [PATCH v3] " YueHaibing
@ 2019-06-06 17:55 ` Stephen Boyd
0 siblings, 0 replies; 6+ messages in thread
From: Stephen Boyd @ 2019-06-06 17:55 UTC (permalink / raw)
To: YueHaibing, mturquette, t-kristo, tony
Cc: linux-kernel, linux-clk, linux-omap, YueHaibing
Quoting YueHaibing (2019-05-29 02:39:37)
> They are not used any more since
> commit 7558562a70fb ("clk: ti: Drop legacy clk-3xxx-legacy code")
>
> Reported-by: Hulk Robot <hulkci@huawei.com>
> Suggested-by: Tero Kristo <t-kristo@ti.com>
> Signed-off-by: YueHaibing <yuehaibing@huawei.com>
> ---
Applied to clk-next
^ permalink raw reply [flat|nested] 6+ messages in thread