git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'tip/perf/jump-label-2' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
arch
/
arm
/
mach-ep93xx
/
clock.c
diff --git
a/arch/arm/mach-ep93xx/clock.c
b/arch/arm/mach-ep93xx/clock.c
index
4566bd1
..
ef06c66
100644
(file)
--- a/
arch/arm/mach-ep93xx/clock.c
+++ b/
arch/arm/mach-ep93xx/clock.c
@@
-358,8
+358,7
@@
static int calc_clk_div(struct clk *clk, unsigned long rate,
int i, found = 0, __div = 0, __pdiv = 0;
/* Don't exceed the maximum rate */
int i, found = 0, __div = 0, __pdiv = 0;
/* Don't exceed the maximum rate */
- max_rate = max(max(clk_pll1.rate / 4, clk_pll2.rate / 4),
- clk_xtali.rate / 4);
+ max_rate = max3(clk_pll1.rate / 4, clk_pll2.rate / 4, clk_xtali.rate / 4);
rate = min(rate, max_rate);
/*
rate = min(rate, max_rate);
/*