[PATCH 2/6] video: use clamp() macro from kernel.h to replace local defintions

[PATCH 2/6] video: use clamp() macro from kernel.h to replace local defintions

[Harvey Harrison]

Clamps a value to be within a given range with strict typechecking.

Acked-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
---
 drivers/media/video/bt8xx/bttvp.h    |    2 --
 drivers/media/video/usbvideo/vicam.c |    6 ------
 2 files changed, 0 insertions(+), 8 deletions(-)

diff --git a/drivers/media/video/bt8xx/bttvp.h b/drivers/media/video/bt8xx/bttvp.h
index 1305d31..b38e3a0 100644
--- a/drivers/media/video/bt8xx/bttvp.h
+++ b/drivers/media/video/bt8xx/bttvp.h
@@ -82,8 +82,6 @@
 /* Limits scaled width, which must be a multiple of 4. */
 #define MAX_HACTIVE (0x3FF & -4)
 
-#define clamp(x, low, high) min (max (low, x), high)
-
 #define BTTV_NORMS    (\
 		V4L2_STD_PAL    | V4L2_STD_PAL_N | \
 		V4L2_STD_PAL_Nc | V4L2_STD_SECAM | \
diff --git a/drivers/media/video/usbvideo/vicam.c b/drivers/media/video/usbvideo/vicam.c
index da1ba02..938a60d 100644
--- a/drivers/media/video/usbvideo/vicam.c
+++ b/drivers/media/video/usbvideo/vicam.c
@@ -70,12 +70,6 @@
 
 #define VICAM_HEADER_SIZE       64
 
-#define clamp( x, l, h )        max_t( __typeof__( x ),         \
-				       ( l ),                   \
-				       min_t( __typeof__( x ),  \
-					      ( h ),            \
-					      ( x ) ) )
-
 /* Not sure what all the bytes in these char
  * arrays do, but they're necessary to make
  * the camera work.
-- 
1.5.4.4.592.g32d4c