From 21b07cf8f7f8572d0d342d5a570a39ffde9f62ba Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Thu, 21 Jul 2011 03:30:57 -0300
Subject: [PATCH] --- yaml --- r: 285634 b: refs/heads/master c:
 fd1126cac093f626e412c0419c763ea3ee304dfe h: refs/heads/master v: v3

---
 [refs]                                     |  2 +-
 trunk/drivers/media/common/tuners/mt2063.c | 34 ++--------------------
 2 files changed, 4 insertions(+), 32 deletions(-)

diff --git a/[refs] b/[refs]
index a9fea7c1f028..b52e2e5ebdbf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8c64f93285e81e7595d169aac9636d215ba5bcb7
+refs/heads/master: fd1126cac093f626e412c0419c763ea3ee304dfe
diff --git a/trunk/drivers/media/common/tuners/mt2063.c b/trunk/drivers/media/common/tuners/mt2063.c
index 6c73bfd31c47..86620073c174 100644
--- a/trunk/drivers/media/common/tuners/mt2063.c
+++ b/trunk/drivers/media/common/tuners/mt2063.c
@@ -951,34 +951,6 @@ static u32 MT2063_gcd(u32 u, u32 v)
 	return u;
 }
 
-/****************************************************************************
-**
-**  Name: umax
-**
-**  Description:    Implements a simple maximum function for unsigned numbers.
-**                  Implemented as a function rather than a macro to avoid
-**                  multiple evaluation of the calling parameters.
-**
-**  Parameters:     a, b     - Values to be compared
-**
-**  Global:         None
-**
-**  Returns:        larger of the input values.
-**
-**  Dependencies:   None.
-**
-**  Revision History:
-**
-**   SCR      Date      Author  Description
-**  -------------------------------------------------------------------------
-**   N/A   06-02-2004    JWS    Original
-**
-****************************************************************************/
-static u32 MT2063_umax(u32 a, u32 b)
-{
-	return (a >= b) ? a : b;
-}
-
 /****************************************************************************
 **
 **  Name: IsSpurInBand
@@ -1037,11 +1009,11 @@ static u32 IsSpurInBand(struct MT2063_AvoidSpursData_t *pAS_Info,
 	 ** gcd-based scale factor or f_Scale.
 	 */
 	lo_gcd = MT2063_gcd(f_LO1, f_LO2);
-	gd_Scale = MT2063_umax((u32) MT2063_gcd(lo_gcd, d), f_Scale);
+	gd_Scale = max((u32) MT2063_gcd(lo_gcd, d), f_Scale);
 	hgds = gd_Scale / 2;
-	gc_Scale = MT2063_umax((u32) MT2063_gcd(lo_gcd, c), f_Scale);
+	gc_Scale = max((u32) MT2063_gcd(lo_gcd, c), f_Scale);
 	hgcs = gc_Scale / 2;
-	gf_Scale = MT2063_umax((u32) MT2063_gcd(lo_gcd, f), f_Scale);
+	gf_Scale = max((u32) MT2063_gcd(lo_gcd, f), f_Scale);
 	hgfs = gf_Scale / 2;
 
 	n0 = DIV_ROUND_UP(f_LO2 - d, f_LO1 - f_LO2);