Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7002483c authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Mike Turquette
Browse files

clk: s2mps11: Remove useless check for clk_table 



There is no need for checking if 'clk_table' is not NULL twice (first
after allocation and second at the end of probe()). Also move allocation
of this 'clk_table' to probe from s2mps11_clk_parse_dt as this is
logical place for it.

Signed-off-by: default avatarKrzysztof Kozlowski <k.kozlowski@samsung.com>
Signed-off-by: default avatarMike Turquette <mturquette@linaro.org>
parent bf416bd4

drivers/clk/clk-s2mps11.c

+11 −13
Original line number Diff line number Diff line
@@ -141,11 +141,6 @@ static struct device_node *s2mps11_clk_parse_dt(struct platform_device *pdev) 
		return ERR_PTR(-EINVAL);

	}



	clk_table = devm_kzalloc(&pdev->dev, sizeof(struct clk *) *

				 S2MPS11_CLKS_NUM, GFP_KERNEL);

	if (!clk_table)

		return ERR_PTR(-ENOMEM);



	for (i = 0; i < S2MPS11_CLKS_NUM; i++)

		of_property_read_string_index(clk_np, "clock-output-names", i,

				&s2mps11_clks_init[i].name);
@@ -168,6 +163,11 @@ static int s2mps11_clk_probe(struct platform_device *pdev) 


	s2mps11_clk = s2mps11_clks;



	clk_table = devm_kzalloc(&pdev->dev, sizeof(struct clk *) *

				 S2MPS11_CLKS_NUM, GFP_KERNEL);

	if (!clk_table)

		return -ENOMEM;



	/* Store clocks of_node in first element of s2mps11_clks array */

	s2mps11_clks->clk_np = s2mps11_clk_parse_dt(pdev);

	if (IS_ERR(s2mps11_clks->clk_np))
@@ -220,15 +220,13 @@ static int s2mps11_clk_probe(struct platform_device *pdev) 
		clkdev_add(s2mps11_clk->lookup);

	}



	if (clk_table) {

	for (i = 0; i < S2MPS11_CLKS_NUM; i++)

		clk_table[i] = s2mps11_clks[i].clk;



	clk_data.clks = clk_table;

	clk_data.clk_num = S2MPS11_CLKS_NUM;

		of_clk_add_provider(s2mps11_clks->clk_np,

				of_clk_src_onecell_get, &clk_data);

	}

	of_clk_add_provider(s2mps11_clks->clk_np, of_clk_src_onecell_get,

			&clk_data);



	platform_set_drvdata(pdev, s2mps11_clks);