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

Commit 92e79e1c authored by Biju Das's avatar Biju Das Committed by Greg Kroah-Hartman
Browse files

clk: Fix undefined reference to `clk_rate_exclusive_{get,put}' 



[ Upstream commit 2746f13f6f1df7999001d6595b16f789ecc28ad1 ]

The COMMON_CLK config is not enabled in some of the architectures.
This causes below build issues:

pwm-rz-mtu3.c:(.text+0x114):
undefined reference to `clk_rate_exclusive_put'
pwm-rz-mtu3.c:(.text+0x32c):
undefined reference to `clk_rate_exclusive_get'

Fix these issues by moving clk_rate_exclusive_{get,put} inside COMMON_CLK
code block, as clk.c is enabled by COMMON_CLK.

Fixes: 55e9b8b7 ("clk: add clk_rate_exclusive api")
Reported-by: default avatarkernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/all/202307251752.vLfmmhYm-lkp@intel.com/


Signed-off-by: default avatarBiju Das <biju.das.jz@bp.renesas.com>
Link: https://lore.kernel.org/r/20230725175140.361479-1-biju.das.jz@bp.renesas.com


Signed-off-by: default avatarStephen Boyd <sboyd@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 11c86708

include/linux/clk.h

+40 −40
Original line number Diff line number Diff line
@@ -175,6 +175,39 @@ int clk_get_scaled_duty_cycle(struct clk *clk, unsigned int scale); 
 */

bool clk_is_match(const struct clk *p, const struct clk *q);



/**

 * clk_rate_exclusive_get - get exclusivity over the rate control of a

 *                          producer

 * @clk: clock source

 *

 * This function allows drivers to get exclusive control over the rate of a

 * provider. It prevents any other consumer to execute, even indirectly,

 * opereation which could alter the rate of the provider or cause glitches

 *

 * If exlusivity is claimed more than once on clock, even by the same driver,

 * the rate effectively gets locked as exclusivity can't be preempted.

 *

 * Must not be called from within atomic context.

 *

 * Returns success (0) or negative errno.

 */

int clk_rate_exclusive_get(struct clk *clk);



/**

 * clk_rate_exclusive_put - release exclusivity over the rate control of a

 *                          producer

 * @clk: clock source

 *

 * This function allows drivers to release the exclusivity it previously got

 * from clk_rate_exclusive_get()

 *

 * The caller must balance the number of clk_rate_exclusive_get() and

 * clk_rate_exclusive_put() calls.

 *

 * Must not be called from within atomic context.

 */

void clk_rate_exclusive_put(struct clk *clk);



#else



static inline int clk_notifier_register(struct clk *clk,
@@ -221,6 +254,13 @@ static inline bool clk_is_match(const struct clk *p, const struct clk *q) 
	return p == q;

}



static inline int clk_rate_exclusive_get(struct clk *clk)

{

	return 0;

}



static inline void clk_rate_exclusive_put(struct clk *clk) {}



#endif



/**
@@ -364,38 +404,6 @@ struct clk *devm_clk_get(struct device *dev, const char *id); 
 */

struct clk *devm_get_clk_from_child(struct device *dev,

				    struct device_node *np, const char *con_id);

/**

 * clk_rate_exclusive_get - get exclusivity over the rate control of a

 *                          producer

 * @clk: clock source

 *

 * This function allows drivers to get exclusive control over the rate of a

 * provider. It prevents any other consumer to execute, even indirectly,

 * opereation which could alter the rate of the provider or cause glitches

 *

 * If exlusivity is claimed more than once on clock, even by the same driver,

 * the rate effectively gets locked as exclusivity can't be preempted.

 *

 * Must not be called from within atomic context.

 *

 * Returns success (0) or negative errno.

 */

int clk_rate_exclusive_get(struct clk *clk);



/**

 * clk_rate_exclusive_put - release exclusivity over the rate control of a

 *                          producer

 * @clk: clock source

 *

 * This function allows drivers to release the exclusivity it previously got

 * from clk_rate_exclusive_get()

 *

 * The caller must balance the number of clk_rate_exclusive_get() and

 * clk_rate_exclusive_put() calls.

 *

 * Must not be called from within atomic context.

 */

void clk_rate_exclusive_put(struct clk *clk);



/**

 * clk_enable - inform the system when the clock source should be running.
@@ -665,14 +673,6 @@ static inline void clk_bulk_put(int num_clks, struct clk_bulk_data *clks) {} 


static inline void devm_clk_put(struct device *dev, struct clk *clk) {}





static inline int clk_rate_exclusive_get(struct clk *clk)

{

	return 0;

}



static inline void clk_rate_exclusive_put(struct clk *clk) {}



static inline int clk_enable(struct clk *clk)

{

	return 0;