From: Krzysztof Helt Date: Thu, 16 Oct 2008 05:03:36 +0000 (-0700) Subject: cirrusfb: simplify clock calculation X-Git-Tag: v2.6.28-rc1~397 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=7528f543889fd460964b42881296b2e84457684e;p=linux-2.6-omap-h63xx.git cirrusfb: simplify clock calculation Simplify clock calculation. Signed-off-by: Krzysztof Helt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/drivers/video/cirrusfb.c b/drivers/video/cirrusfb.c index 09f42145a5d..dfd12a2dfe7 100644 --- a/drivers/video/cirrusfb.c +++ b/drivers/video/cirrusfb.c @@ -3075,38 +3075,36 @@ static void bestclock(long freq, long *best, long *nom, f = freq * 10; for (n = 32; n < 128; n++) { + int s = 0; + d = (143181 * n) / f; if ((d >= 7) && (d <= 63)) { - if (d > 31) - d = (d / 2) * 2; - h = (14318 * n) / d; + int temp = d; + + if (temp > 31) { + s = 1; + temp >>= 1; + } + h = ((14318 * n) / temp) >> s; if (abs(h - freq) < abs(*best - freq)) { *best = h; *nom = n; - if (d < 32) { - *den = d; - *div = 0; - } else { - *den = d / 2; - *div = 1; - } + *den = temp; + *div = s; } } - d = DIV_ROUND_UP(143181 * n, f); + d++; if ((d >= 7) && (d <= 63)) { - if (d > 31) - d = (d / 2) * 2; - h = (14318 * n) / d; + if (d > 31) { + s = 1; + d >>= 1; + } + h = ((14318 * n) / d) >> s; if (abs(h - freq) < abs(*best - freq)) { *best = h; *nom = n; - if (d < 32) { - *den = d; - *div = 0; - } else { - *den = d / 2; - *div = 1; - } + *den = d; + *div = s; } } }