projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'next/soc' into HEAD
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
arch
/
arm
/
plat-samsung
/
clock.c
diff --git
a/arch/arm/plat-samsung/clock.c
b/arch/arm/plat-samsung/clock.c
index
d1116e2
..
012bbd0
100644
(file)
--- a/
arch/arm/plat-samsung/clock.c
+++ b/
arch/arm/plat-samsung/clock.c
@@
-119,7
+119,7
@@
void clk_disable(struct clk *clk)
unsigned long clk_get_rate(struct clk *clk)
{
unsigned long clk_get_rate(struct clk *clk)
{
- if (IS_ERR(clk))
+ if (IS_ERR
_OR_NULL
(clk))
return 0;
if (clk->rate != 0)
return 0;
if (clk->rate != 0)
@@
-136,7
+136,7
@@
unsigned long clk_get_rate(struct clk *clk)
long clk_round_rate(struct clk *clk, unsigned long rate)
{
long clk_round_rate(struct clk *clk, unsigned long rate)
{
- if (!IS_ERR(clk) && clk->ops && clk->ops->round_rate)
+ if (!IS_ERR
_OR_NULL
(clk) && clk->ops && clk->ops->round_rate)
return (clk->ops->round_rate)(clk, rate);
return rate;
return (clk->ops->round_rate)(clk, rate);
return rate;
@@
-147,7
+147,7
@@
int clk_set_rate(struct clk *clk, unsigned long rate)
unsigned long flags;
int ret;
unsigned long flags;
int ret;
- if (IS_ERR(clk))
+ if (IS_ERR
_OR_NULL
(clk))
return -EINVAL;
/* We do not default just do a clk->rate = rate as
return -EINVAL;
/* We do not default just do a clk->rate = rate as
@@
-177,7
+177,7
@@
int clk_set_parent(struct clk *clk, struct clk *parent)
unsigned long flags;
int ret = 0;
unsigned long flags;
int ret = 0;
- if (IS_ERR
(clk
))
+ if (IS_ERR
_OR_NULL(clk) || IS_ERR_OR_NULL(parent
))
return -EINVAL;
spin_lock_irqsave(&clocks_lock, flags);
return -EINVAL;
spin_lock_irqsave(&clocks_lock, flags);