iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ARM: davinci: clock: Correct return values for API functions

Browse Source 
Fix the values returned by the publicly used functions.
These function should return 0 when they are called with clk == NULL in
similar manner as the clock API does to avoid different behavior in drivers
used by daVinci and other architectures.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Sekhar Nori <nsekhar@ti.com>
This commit is contained in:
Peter Ujfalusi 2015-09-14 12:29:39 +03:00 committed by Sekhar Nori
parent d1a31e9757
commit f6c1a8a6ce
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
arch/arm/mach-davinci/clock.c
View File

@ -97,7 +97,9 @@ int clk_enable(struct clk *clk)
{ {
unsigned long flags; unsigned long flags;
if (clk == NULL || IS_ERR(clk)) if (!clk)
return 0;
else if (IS_ERR(clk))
return -EINVAL; return -EINVAL;
spin_lock_irqsave(&clockfw_lock, flags); spin_lock_irqsave(&clockfw_lock, flags);
@ -124,7 +126,7 @@ EXPORT_SYMBOL(clk_disable);
unsigned long clk_get_rate(struct clk *clk) unsigned long clk_get_rate(struct clk *clk)
{ {
if (clk == NULL || IS_ERR(clk)) if (clk == NULL || IS_ERR(clk))
return -EINVAL; return 0;
return clk->rate; return clk->rate;
} }
@ -159,8 +161,10 @@ int clk_set_rate(struct clk *clk, unsigned long rate)
unsigned long flags; unsigned long flags;
int ret = -EINVAL; int ret = -EINVAL;
if (clk == NULL || IS_ERR(clk)) if (!clk)
return ret; return 0;
else if (IS_ERR(clk))
return -EINVAL;
if (clk->set_rate) if (clk->set_rate)
ret = clk->set_rate(clk, rate); ret = clk->set_rate(clk, rate);
@ -181,7 +185,9 @@ int clk_set_parent(struct clk *clk, struct clk *parent)
{ {
unsigned long flags; unsigned long flags;
if (clk == NULL || IS_ERR(clk)) if (!clk)
return 0;
else if (IS_ERR(clk))
return -EINVAL; return -EINVAL;
/* Cannot change parent on enabled clock */ /* Cannot change parent on enabled clock */