Skip to content

Commit 14bd7b9

Browse files
jbrun3tsuperna9999
authored andcommitted
clk: meson: only one loop index is necessary in probe
We don't need several loop index variables in the probe function This is far from being critical but since we are doing a vast rework of meson clock controllers, now is the time to lower the entropy a bit Signed-off-by: Jerome Brunet <[email protected]> Signed-off-by: Neil Armstrong <[email protected]>
1 parent 332b32a commit 14bd7b9

File tree

3 files changed

+14
-15
lines changed

3 files changed

+14
-15
lines changed

drivers/clk/meson/axg.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -802,7 +802,7 @@ static int axg_clkc_probe(struct platform_device *pdev)
802802
const struct clkc_data *clkc_data;
803803
struct resource *res;
804804
void __iomem *clk_base;
805-
int ret, clkid, i;
805+
int ret, i;
806806

807807
clkc_data = of_device_get_match_data(dev);
808808
if (!clkc_data)
@@ -841,13 +841,13 @@ static int axg_clkc_probe(struct platform_device *pdev)
841841
clkc_data->clk_dividers[i]->reg = clk_base +
842842
(u64)clkc_data->clk_dividers[i]->reg;
843843

844-
for (clkid = 0; clkid < clkc_data->hw_onecell_data->num; clkid++) {
844+
for (i = 0; i < clkc_data->hw_onecell_data->num; i++) {
845845
/* array might be sparse */
846-
if (!clkc_data->hw_onecell_data->hws[clkid])
846+
if (!clkc_data->hw_onecell_data->hws[i])
847847
continue;
848848

849849
ret = devm_clk_hw_register(dev,
850-
clkc_data->hw_onecell_data->hws[clkid]);
850+
clkc_data->hw_onecell_data->hws[i]);
851851
if (ret) {
852852
dev_err(dev, "Clock registration failed\n");
853853
return ret;

drivers/clk/meson/gxbb.c

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1947,7 +1947,7 @@ static int gxbb_clkc_probe(struct platform_device *pdev)
19471947
{
19481948
const struct clkc_data *clkc_data;
19491949
void __iomem *clk_base;
1950-
int ret, clkid, i;
1950+
int ret, i;
19511951
struct device *dev = &pdev->dev;
19521952

19531953
clkc_data = of_device_get_match_data(dev);
@@ -1988,16 +1988,15 @@ static int gxbb_clkc_probe(struct platform_device *pdev)
19881988
for (i = 0; i < clkc_data->clk_audio_dividers_count; i++)
19891989
clkc_data->clk_audio_dividers[i]->base = clk_base;
19901990

1991-
/*
1992-
* register all clks
1993-
*/
1994-
for (clkid = 0; clkid < clkc_data->hw_onecell_data->num; clkid++) {
1991+
1992+
/* Register all clks */
1993+
for (i = 0; i < clkc_data->hw_onecell_data->num; i++) {
19951994
/* array might be sparse */
1996-
if (!clkc_data->hw_onecell_data->hws[clkid])
1995+
if (!clkc_data->hw_onecell_data->hws[i])
19971996
continue;
19981997

19991998
ret = devm_clk_hw_register(dev,
2000-
clkc_data->hw_onecell_data->hws[clkid]);
1999+
clkc_data->hw_onecell_data->hws[i]);
20012000
if (ret)
20022001
goto iounmap;
20032002
}

drivers/clk/meson/meson8b.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -806,7 +806,7 @@ static const struct reset_control_ops meson8b_clk_reset_ops = {
806806

807807
static int meson8b_clkc_probe(struct platform_device *pdev)
808808
{
809-
int ret, clkid, i;
809+
int ret, i;
810810
struct clk_hw *parent_hw;
811811
struct clk *parent_clk;
812812
struct device *dev = &pdev->dev;
@@ -844,13 +844,13 @@ static int meson8b_clkc_probe(struct platform_device *pdev)
844844
* register all clks
845845
* CLKID_UNUSED = 0, so skip it and start with CLKID_XTAL = 1
846846
*/
847-
for (clkid = CLKID_XTAL; clkid < CLK_NR_CLKS; clkid++) {
847+
for (i = CLKID_XTAL; i < CLK_NR_CLKS; i++) {
848848
/* array might be sparse */
849-
if (!meson8b_hw_onecell_data.hws[clkid])
849+
if (!meson8b_hw_onecell_data.hws[i])
850850
continue;
851851

852852
/* FIXME convert to devm_clk_register */
853-
ret = devm_clk_hw_register(dev, meson8b_hw_onecell_data.hws[clkid]);
853+
ret = devm_clk_hw_register(dev, meson8b_hw_onecell_data.hws[i]);
854854
if (ret)
855855
return ret;
856856
}

0 commit comments

Comments
 (0)