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

Commit f07adc59 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

ARM: OMAP: 1/4 Fix clock framework to use clk_enable/disable 



This patch fixes OMAP clock framework to use clk_enable/disable
instead of clk_use/unuse as specified in include/linux/clk.h.

Instances of clk_use/unuse are renamed to clk_enable/disable,
and references clk_use/unuse are removed.

Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 2664b250

arch/arm/plat-omap/clock.c

+4 −37
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ DEFINE_SPINLOCK(clockfw_lock); 
static struct clk_functions *arch_clock;



/*-------------------------------------------------------------------------

 * Standard clock functions defined in asm/hardware/clock.h

 * Standard clock functions defined in include/linux/clk.h

 *-------------------------------------------------------------------------*/



struct clk * clk_get(struct device *dev, const char *id)
@@ -60,12 +60,8 @@ int clk_enable(struct clk *clk) 
	int ret = 0;



	spin_lock_irqsave(&clockfw_lock, flags);

	if (clk->enable)

		ret = clk->enable(clk);

	else if (arch_clock->clk_enable)

	if (arch_clock->clk_enable)

		ret = arch_clock->clk_enable(clk);

	else

		printk(KERN_ERR "Could not enable clock %s\n", clk->name);

	spin_unlock_irqrestore(&clockfw_lock, flags);



	return ret;
@@ -77,41 +73,12 @@ void clk_disable(struct clk *clk) 
	unsigned long flags;



	spin_lock_irqsave(&clockfw_lock, flags);

	if (clk->disable)

		clk->disable(clk);

	else if (arch_clock->clk_disable)

	if (arch_clock->clk_disable)

		arch_clock->clk_disable(clk);

	else

		printk(KERN_ERR "Could not disable clock %s\n", clk->name);

	spin_unlock_irqrestore(&clockfw_lock, flags);

}

EXPORT_SYMBOL(clk_disable);



int clk_use(struct clk *clk)

{

	unsigned long flags;

	int ret = 0;



	spin_lock_irqsave(&clockfw_lock, flags);

	if (arch_clock->clk_use)

		ret = arch_clock->clk_use(clk);

	spin_unlock_irqrestore(&clockfw_lock, flags);



	return ret;

}

EXPORT_SYMBOL(clk_use);



void clk_unuse(struct clk *clk)

{

	unsigned long flags;



	spin_lock_irqsave(&clockfw_lock, flags);

	if (arch_clock->clk_unuse)

		arch_clock->clk_unuse(clk);

	spin_unlock_irqrestore(&clockfw_lock, flags);

}

EXPORT_SYMBOL(clk_unuse);



int clk_get_usecount(struct clk *clk)

{

	unsigned long flags;
@@ -146,7 +113,7 @@ void clk_put(struct clk *clk) 
EXPORT_SYMBOL(clk_put);



/*-------------------------------------------------------------------------

 * Optional clock functions defined in asm/hardware/clock.h

 * Optional clock functions defined in include/linux/clk.h

 *-------------------------------------------------------------------------*/



long clk_round_rate(struct clk *clk, unsigned long rate)

include/asm-arm/arch-omap/clock.h

+0 −2
Original line number Diff line number Diff line
@@ -38,8 +38,6 @@ struct clk { 
struct clk_functions {

	int		(*clk_enable)(struct clk *clk);

	void		(*clk_disable)(struct clk *clk);

	int		(*clk_use)(struct clk *clk);

	void		(*clk_unuse)(struct clk *clk);

	long		(*clk_round_rate)(struct clk *clk, unsigned long rate);

	int		(*clk_set_rate)(struct clk *clk, unsigned long rate);

	int		(*clk_set_parent)(struct clk *clk, struct clk *parent);