From 785a3de18badb13a94a4cf71ebe38ea84b63a132 Mon Sep 17 00:00:00 2001
From: Philipp Zabel
Date: Thu, 27 Feb 2014 13:44:47 -0300
Subject: [media] tvp5150: Fix type mismatch warning in clamp macro
This patch fixes the following warning:
drivers/media/i2c/tvp5150.c: In function '__tvp5150_try_crop':
include/linux/kernel.h:762:17: warning: comparison of distinct pointer types lacks a cast [enabled by default]
(void) (&__val == &__min); \
^
drivers/media/i2c/tvp5150.c:886:16: note: in expansion of macro 'clamp'
rect->width = clamp(rect->width,
^
include/linux/kernel.h:763:17: warning: comparison of distinct pointer types lacks a cast [enabled by default]
(void) (&__val == &__max); \
^
drivers/media/i2c/tvp5150.c:886:16: note: in expansion of macro 'clamp'
rect->width = clamp(rect->width,
^
include/linux/kernel.h:762:17: warning: comparison of distinct pointer types lacks a cast [enabled by default]
(void) (&__val == &__min); \
^
drivers/media/i2c/tvp5150.c:904:17: note: in expansion of macro 'clamp'
rect->height = clamp(rect->height,
^
include/linux/kernel.h:763:17: warning: comparison of distinct pointer types lacks a cast [enabled by default]
(void) (&__val == &__max); \
^
drivers/media/i2c/tvp5150.c:904:17: note: in expansion of macro 'clamp'
rect->height = clamp(rect->height,
^
Signed-off-by: Philipp Zabel
Acked-by: Lad, Prabhakar
Signed-off-by: Hans Verkuil
Signed-off-by: Mauro Carvalho Chehab
---
drivers/media/i2c/tvp5150.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/media/i2c/tvp5150.c b/drivers/media/i2c/tvp5150.c
index 542d2528b3f9..8ac52fcf3f85 100644
--- a/drivers/media/i2c/tvp5150.c
+++ b/drivers/media/i2c/tvp5150.c
@@ -16,9 +16,9 @@
#include "tvp5150_reg.h"
-#define TVP5150_H_MAX 720
-#define TVP5150_V_MAX_525_60 480
-#define TVP5150_V_MAX_OTHERS 576
+#define TVP5150_H_MAX 720U
+#define TVP5150_V_MAX_525_60 480U
+#define TVP5150_V_MAX_OTHERS 576U
#define TVP5150_MAX_CROP_LEFT 511
#define TVP5150_MAX_CROP_TOP 127
#define TVP5150_CROP_SHIFT 2
--
cgit v1.2.3