mirror of
https://github.com/FEX-Emu/linux.git
synced 2025-02-03 17:44:54 +00:00
avr32: handle NULL as a valid clock object
Since NULL is used as valid clock object on optional clocks we have to handle this case in avr32 implementation as well. Fixes: e1824dfe0d8e (net: macb: Adjust tx_clk when link speed changes) Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Acked-by: Hans-Christian Egtvedt <egtvedt@samfundet.no>
This commit is contained in:
parent
cbfe8fa6cd
commit
5c02a42065
@ -80,6 +80,9 @@ int clk_enable(struct clk *clk)
|
|||||||
{
|
{
|
||||||
unsigned long flags;
|
unsigned long flags;
|
||||||
|
|
||||||
|
if (!clk)
|
||||||
|
return 0;
|
||||||
|
|
||||||
spin_lock_irqsave(&clk_lock, flags);
|
spin_lock_irqsave(&clk_lock, flags);
|
||||||
__clk_enable(clk);
|
__clk_enable(clk);
|
||||||
spin_unlock_irqrestore(&clk_lock, flags);
|
spin_unlock_irqrestore(&clk_lock, flags);
|
||||||
@ -106,6 +109,9 @@ void clk_disable(struct clk *clk)
|
|||||||
{
|
{
|
||||||
unsigned long flags;
|
unsigned long flags;
|
||||||
|
|
||||||
|
if (IS_ERR_OR_NULL(clk))
|
||||||
|
return;
|
||||||
|
|
||||||
spin_lock_irqsave(&clk_lock, flags);
|
spin_lock_irqsave(&clk_lock, flags);
|
||||||
__clk_disable(clk);
|
__clk_disable(clk);
|
||||||
spin_unlock_irqrestore(&clk_lock, flags);
|
spin_unlock_irqrestore(&clk_lock, flags);
|
||||||
@ -117,6 +123,9 @@ unsigned long clk_get_rate(struct clk *clk)
|
|||||||
unsigned long flags;
|
unsigned long flags;
|
||||||
unsigned long rate;
|
unsigned long rate;
|
||||||
|
|
||||||
|
if (!clk)
|
||||||
|
return 0;
|
||||||
|
|
||||||
spin_lock_irqsave(&clk_lock, flags);
|
spin_lock_irqsave(&clk_lock, flags);
|
||||||
rate = clk->get_rate(clk);
|
rate = clk->get_rate(clk);
|
||||||
spin_unlock_irqrestore(&clk_lock, flags);
|
spin_unlock_irqrestore(&clk_lock, flags);
|
||||||
@ -129,6 +138,9 @@ long clk_round_rate(struct clk *clk, unsigned long rate)
|
|||||||
{
|
{
|
||||||
unsigned long flags, actual_rate;
|
unsigned long flags, actual_rate;
|
||||||
|
|
||||||
|
if (!clk)
|
||||||
|
return 0;
|
||||||
|
|
||||||
if (!clk->set_rate)
|
if (!clk->set_rate)
|
||||||
return -ENOSYS;
|
return -ENOSYS;
|
||||||
|
|
||||||
@ -145,6 +157,9 @@ int clk_set_rate(struct clk *clk, unsigned long rate)
|
|||||||
unsigned long flags;
|
unsigned long flags;
|
||||||
long ret;
|
long ret;
|
||||||
|
|
||||||
|
if (!clk)
|
||||||
|
return 0;
|
||||||
|
|
||||||
if (!clk->set_rate)
|
if (!clk->set_rate)
|
||||||
return -ENOSYS;
|
return -ENOSYS;
|
||||||
|
|
||||||
@ -161,6 +176,9 @@ int clk_set_parent(struct clk *clk, struct clk *parent)
|
|||||||
unsigned long flags;
|
unsigned long flags;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
|
if (!clk)
|
||||||
|
return 0;
|
||||||
|
|
||||||
if (!clk->set_parent)
|
if (!clk->set_parent)
|
||||||
return -ENOSYS;
|
return -ENOSYS;
|
||||||
|
|
||||||
@ -174,7 +192,7 @@ EXPORT_SYMBOL(clk_set_parent);
|
|||||||
|
|
||||||
struct clk *clk_get_parent(struct clk *clk)
|
struct clk *clk_get_parent(struct clk *clk)
|
||||||
{
|
{
|
||||||
return clk->parent;
|
return !clk ? NULL : clk->parent;
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL(clk_get_parent);
|
EXPORT_SYMBOL(clk_get_parent);
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user