Commit 50e68b99 authored by Markus Schneider-Pargmann's avatar Markus Schneider-Pargmann Committed by Stephen Boyd
Browse files

clk: mediatek: Provide mtk_devm_alloc_clk_data 



Provide a helper that replaces the kzalloc with devm_kzalloc so error
handling gets easier.

Signed-off-by: default avatarMarkus Schneider-Pargmann <msp@baylibre.com>
Link: https://lore.kernel.org/r/20220822152652.3499972-3-msp@baylibre.com


Reported-by: default avatarkernel test robot <lkp@intel.com>
Signed-off-by: default avatarStephen Boyd <sboyd@kernel.org>
parent c6197817

drivers/clk/mediatek/clk-mtk.c

+28 −5
Original line number Diff line number Diff line
@@ -18,19 +18,42 @@ 
#include "clk-mtk.h"

#include "clk-gate.h"



struct clk_hw_onecell_data *mtk_alloc_clk_data(unsigned int clk_num)

static void mtk_init_clk_data(struct clk_hw_onecell_data *clk_data,

			      unsigned int clk_num)

{

	int i;



	clk_data->num = clk_num;



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

		clk_data->hws[i] = ERR_PTR(-ENOENT);

}



struct clk_hw_onecell_data *mtk_devm_alloc_clk_data(struct device *dev,

						    unsigned int clk_num)

{

	struct clk_hw_onecell_data *clk_data;



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

	clk_data = devm_kzalloc(dev, struct_size(clk_data, hws, clk_num),

				GFP_KERNEL);

	if (!clk_data)

		return NULL;



	clk_data->num = clk_num;

	mtk_init_clk_data(clk_data, clk_num);



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

		clk_data->hws[i] = ERR_PTR(-ENOENT);

	return clk_data;

}

EXPORT_SYMBOL_GPL(mtk_devm_alloc_clk_data);



struct clk_hw_onecell_data *mtk_alloc_clk_data(unsigned int clk_num)

{

	struct clk_hw_onecell_data *clk_data;



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

	if (!clk_data)

		return NULL;



	mtk_init_clk_data(clk_data, clk_num);



	return clk_data;

}

drivers/clk/mediatek/clk-mtk.h

+2 −0
Original line number Diff line number Diff line
@@ -184,6 +184,8 @@ void mtk_clk_unregister_dividers(const struct mtk_clk_divider *mcds, int num, 
				 struct clk_hw_onecell_data *clk_data);



struct clk_hw_onecell_data *mtk_alloc_clk_data(unsigned int clk_num);

struct clk_hw_onecell_data *mtk_devm_alloc_clk_data(struct device *dev,

						    unsigned int clk_num);

void mtk_free_clk_data(struct clk_hw_onecell_data *clk_data);



struct clk_hw *mtk_clk_register_ref2usb_tx(const char *name,