Commit e620a1e0 authored by Stephen Kitt's avatar Stephen Kitt Committed by Stephen Boyd
Browse files

drivers/clk: convert VL struct to struct_size 



There are a few manually-calculated variable-length struct allocations
left, this converts them to use struct_size. Found with the following
git grep command

	git grep -A1 'kzalloc.*sizeof[^_].*+'

Signed-off-by: default avatarStephen Kitt <steve@sk2.org>
Link: https://lkml.kernel.org/r/20190927185110.29897-1-steve@sk2.org


Acked-by: default avatarGustavo A. R. Silva <gustavo@embeddedor.com>
[sboyd@kernel.org: Add grep command]
Signed-off-by: default avatarStephen Boyd <sboyd@kernel.org>
parent 54ecb8f7

drivers/clk/at91/sckc.c

+1 −2
Original line number Diff line number Diff line
@@ -478,8 +478,7 @@ static void __init of_sam9x60_sckc_setup(struct device_node *np) 
	if (IS_ERR(slow_osc))

		goto unregister_slow_rc;



	clk_data = kzalloc(sizeof(*clk_data) + (2 * sizeof(struct clk_hw *)),

			   GFP_KERNEL);

	clk_data = kzalloc(struct_size(clk_data, hws, 2), GFP_KERNEL);

	if (!clk_data)

		goto unregister_slow_osc;

drivers/clk/imgtec/clk-boston.c

+1 −2
Original line number Diff line number Diff line
@@ -58,8 +58,7 @@ static void __init clk_boston_setup(struct device_node *np) 
	cpu_div = ext_field(mmcmdiv, BOSTON_PLAT_MMCMDIV_CLK1DIV);

	cpu_freq = mult_frac(in_freq, mul, cpu_div);



	onecell = kzalloc(sizeof(*onecell) +

			  (BOSTON_CLK_COUNT * sizeof(struct clk_hw *)),

	onecell = kzalloc(struct_size(onecell, hws, BOSTON_CLK_COUNT),

			  GFP_KERNEL);

	if (!onecell)

		return;

drivers/clk/ingenic/tcu.c

+1 −2
Original line number Diff line number Diff line
@@ -358,8 +358,7 @@ static int __init ingenic_tcu_probe(struct device_node *np) 
		}

	}



	tcu->clocks = kzalloc(sizeof(*tcu->clocks) +

			      sizeof(*tcu->clocks->hws) * TCU_CLK_COUNT,

	tcu->clocks = kzalloc(struct_size(tcu->clocks, hws, TCU_CLK_COUNT),

			      GFP_KERNEL);

	if (!tcu->clocks) {

		ret = -ENOMEM;

drivers/clk/mvebu/ap-cpu-clk.c

+2 −2
Original line number Diff line number Diff line
@@ -274,8 +274,8 @@ static int ap_cpu_clock_probe(struct platform_device *pdev) 
	if (!ap_cpu_clk)

		return -ENOMEM;



	ap_cpu_data = devm_kzalloc(dev, sizeof(*ap_cpu_data) +

				sizeof(struct clk_hw *) * nclusters,

	ap_cpu_data = devm_kzalloc(dev, struct_size(ap_cpu_data, hws,

						    nclusters),

				GFP_KERNEL);

	if (!ap_cpu_data)

		return -ENOMEM;

drivers/clk/mvebu/cp110-system-controller.c

+2 −2
Original line number Diff line number Diff line
@@ -235,8 +235,8 @@ static int cp110_syscon_common_probe(struct platform_device *pdev, 
	if (ret)

		return ret;



	cp110_clk_data = devm_kzalloc(dev, sizeof(*cp110_clk_data) +

				      sizeof(struct clk_hw *) * CP110_CLK_NUM,

	cp110_clk_data = devm_kzalloc(dev, struct_size(cp110_clk_data, hws,

						       CP110_CLK_NUM),

				      GFP_KERNEL);

	if (!cp110_clk_data)

		return -ENOMEM;

CRA Git | Maintained and supported by SUSTech CRA and CCSE