Unverified Commit d94f0f09 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Stephen Boyd
Browse files

clk: Merge prepare and unprepare sections 



<linux/clk.h> contains two consecutive #ifdef/#else/#endif sections
that check for CONFIG_HAVE_CLK_PREPARE: one for prepare-related
functionality, and a second for unprepare-related functionality.
Reduce #ifdef clutter by merging them.

Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: default avatarStephen Boyd <sboyd@kernel.org>
parent f47c1b77

include/linux/clk.h

+23 −23
Original line number Diff line number Diff line
@@ -329,8 +329,21 @@ static inline void clk_restore_context(void) {} 
 * Must not be called from within atomic context.

 */

int clk_prepare(struct clk *clk);



/**

 * clk_unprepare - undo preparation of a clock source

 * @clk: clock source

 *

 * This undoes a previously prepared clock.  The caller must balance

 * the number of prepare and unprepare calls.

 *

 * Must not be called from within atomic context.

 */

void clk_unprepare(struct clk *clk);



int __must_check clk_bulk_prepare(int num_clks,

				  const struct clk_bulk_data *clks);

void clk_bulk_unprepare(int num_clks, const struct clk_bulk_data *clks);



/**

 * clk_is_enabled_when_prepared - indicate if preparing a clock also enables it.
@@ -355,41 +368,28 @@ static inline int clk_prepare(struct clk *clk) 
	return 0;

}



static inline int __must_check

clk_bulk_prepare(int num_clks, const struct clk_bulk_data *clks)

static inline void clk_unprepare(struct clk *clk)

{

	might_sleep();

	return 0;

}



static inline bool clk_is_enabled_when_prepared(struct clk *clk)

{

	return false;

}

#endif



/**

 * clk_unprepare - undo preparation of a clock source

 * @clk: clock source

 *

 * This undoes a previously prepared clock.  The caller must balance

 * the number of prepare and unprepare calls.

 *

 * Must not be called from within atomic context.

 */

#ifdef CONFIG_HAVE_CLK_PREPARE

void clk_unprepare(struct clk *clk);

void clk_bulk_unprepare(int num_clks, const struct clk_bulk_data *clks);

#else

static inline void clk_unprepare(struct clk *clk)

static inline int __must_check

clk_bulk_prepare(int num_clks, const struct clk_bulk_data *clks)

{

	might_sleep();

	return 0;

}



static inline void clk_bulk_unprepare(int num_clks,

				      const struct clk_bulk_data *clks)

{

	might_sleep();

}



static inline bool clk_is_enabled_when_prepared(struct clk *clk)

{

	return false;

}

#endif



#ifdef CONFIG_HAVE_CLK