diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-05-02 00:57:47 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-05-02 00:57:47 -0300 |
| commit | a2f35a3ccf9953ece897da27cd27701c60bc296d (patch) | |
| tree | 8a0ccab4a3376e23a477729bb8e783d0d4c47bc9 | |
| parent | 0dd5bfe651abdb225c8b2d9fcdcd251c5a175e88 (diff) | |
| download | mediapointer-dvb-s2-a2f35a3ccf9953ece897da27cd27701c60bc296d.tar.gz mediapointer-dvb-s2-a2f35a3ccf9953ece897da27cd27701c60bc296d.tar.bz2 | |
backport commit bdf4bbaaee3d4b8f555658333cbce1affe9070fb
From: Mauro Carvalho Chehab <mchehab@infradead.org>
kernel-sync:
Author: Harvey Harrison <harvey.harrison@gmail.com>
Date: Wed Apr 30 00:54:55 2008 -0700
Add macros similar to min/max/min_t/max_t
Also, change the variable names used in the min/max macros to avoid shadowed
variable warnings when min/max min_t/max_t are nested.
Small formatting changes to make all the macros have a similar form.
[akpm@linux-foundation.org: coding-style fixes]
[akpm@linux-foundation.org: fix v4l build]
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| -rw-r--r-- | linux/drivers/media/video/bt8xx/bttvp.h | 2 | ||||
| -rw-r--r-- | linux/drivers/media/video/usbvideo/vicam.c | 6 | ||||
| -rw-r--r-- | v4l/compat.h | 7 |
3 files changed, 7 insertions, 8 deletions
diff --git a/linux/drivers/media/video/bt8xx/bttvp.h b/linux/drivers/media/video/bt8xx/bttvp.h index e9219458e..b8ab81fb8 100644 --- a/linux/drivers/media/video/bt8xx/bttvp.h +++ b/linux/drivers/media/video/bt8xx/bttvp.h @@ -90,8 +90,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/linux/drivers/media/video/usbvideo/vicam.c b/linux/drivers/media/video/usbvideo/vicam.c index 5853563fa..049f588ae 100644 --- a/linux/drivers/media/video/usbvideo/vicam.c +++ b/linux/drivers/media/video/usbvideo/vicam.c @@ -72,12 +72,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. diff --git a/v4l/compat.h b/v4l/compat.h index 01847a319..49b04961f 100644 --- a/v4l/compat.h +++ b/v4l/compat.h @@ -554,6 +554,13 @@ static inline struct proc_dir_entry *proc_create(const char *a, #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26) #define div64_u64(a,b) div64_64(a,b) + +#define clamp( x, l, h ) max_t( __typeof__( x ), \ + ( l ), \ + min_t( __typeof__( x ), \ + ( h ), \ + ( x ) ) ) + #endif #endif |