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

Commit 79716870 authored by Paul Walmsley's avatar Paul Walmsley Committed by paul
Browse files

OMAP2xxx clock: rename clk_init_one() to clk_preinit() 



Rename clk_init_one() to clk_preinit() to distinguish its function
from clk_init() and the individual struct clk init functions.

Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
parent 0db4e825

arch/arm/mach-omap1/clock.c

+1 −1
Original line number Diff line number Diff line
@@ -776,7 +776,7 @@ int __init omap1_clk_init(void) 
	arm_idlect1_mask = ~0;



	for (c = omap_clks; c < omap_clks + ARRAY_SIZE(omap_clks); c++)

		clk_init_one(c->lk.clk);

		clk_preinit(c->lk.clk);



	cpu_mask = 0;

	if (cpu_is_omap16xx())

arch/arm/mach-omap2/clock24xx.c

+1 −1
Original line number Diff line number Diff line
@@ -722,7 +722,7 @@ int __init omap2_clk_init(void) 
	clk_init(&omap2_clk_functions);



	for (c = omap24xx_clks; c < omap24xx_clks + ARRAY_SIZE(omap24xx_clks); c++)

		clk_init_one(c->lk.clk);

		clk_preinit(c->lk.clk);



	osc_ck.rate = omap2_osc_clk_recalc(&osc_ck);

	propagate_rate(&osc_ck);

arch/arm/mach-omap2/clock34xx.c

+1 −1
Original line number Diff line number Diff line
@@ -964,7 +964,7 @@ int __init omap2_clk_init(void) 
	clk_init(&omap2_clk_functions);



	for (c = omap34xx_clks; c < omap34xx_clks + ARRAY_SIZE(omap34xx_clks); c++)

		clk_init_one(c->lk.clk);

		clk_preinit(c->lk.clk);



	for (c = omap34xx_clks; c < omap34xx_clks + ARRAY_SIZE(omap34xx_clks); c++)

		if (c->cpu & cpu_clkflg) {

arch/arm/plat-omap/clock.c

+2 −2
Original line number Diff line number Diff line
@@ -240,13 +240,13 @@ void recalculate_root_clocks(void) 
}



/**

 * clk_init_one - initialize any fields in the struct clk before clk init

 * clk_preinit - initialize any fields in the struct clk before clk init

 * @clk: struct clk * to initialize

 *

 * Initialize any struct clk fields needed before normal clk initialization

 * can run.  No return value.

 */

void clk_init_one(struct clk *clk)

void clk_preinit(struct clk *clk)

{

	INIT_LIST_HEAD(&clk->children);

}

arch/arm/plat-omap/include/mach/clock.h

+1 −1
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ struct clk_functions { 
extern unsigned int mpurate;



extern int clk_init(struct clk_functions *custom_clocks);

extern void clk_init_one(struct clk *clk);

extern void clk_preinit(struct clk *clk);

extern int clk_register(struct clk *clk);

extern void clk_reparent(struct clk *child, struct clk *parent);

extern void clk_unregister(struct clk *clk);