[media] V4L: ov772x: rename macros to not pollute the global namespace

Macros, defined in a header under include/ should be kept in a local
namespace and not pollute the global one.

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

1 files changed, 12 insertions, 13 deletions

diff --git a/include/media/ov772x.h b/include/media/ov772x.h
index 548bf1155c83..f9e27c0ce901 100644
--- a/include/media/ov772x.h
+++ b/include/media/ov772x.h
@@ -12,8 +12,6 @@
 #ifndef __OV772X_H__
 #define __OV772X_H__
 
-#include <media/soc_camera.h>
-
 /* for flags */
 #define OV772X_FLAG_VFLIP       (1 << 0) /* Vertical flip image */
 #define OV772X_FLAG_HFLIP       (1 << 1) /* Horizontal flip image */
@@ -32,22 +30,23 @@ struct ov772x_edge_ctrl {
         unsigned char lower;
 };
 
-#define OV772X_MANUAL_EDGE_CTRL 0x80 /* un-used bit of strength */
-#define EDGE_STRENGTH_MASK      0x1F
-#define EDGE_THRESHOLD_MASK     0x0F
-#define EDGE_UPPER_MASK         0xFF
-#define EDGE_LOWER_MASK         0xFF
+#define OV772X_MANUAL_EDGE_CTRL         0x80 /* un-used bit of strength */
+#define OV772X_EDGE_STRENGTH_MASK       0x1F
+#define OV772X_EDGE_THRESHOLD_MASK      0x0F
+#define OV772X_EDGE_UPPER_MASK          0xFF
+#define OV772X_EDGE_LOWER_MASK          0xFF
 
 #define OV772X_AUTO_EDGECTRL(u, l)      \
 {                                       \
-        .upper = (u & EDGE_UPPER_MASK), \
-        .lower = (l & EDGE_LOWER_MASK), \
+        .upper = (u & OV772X_EDGE_UPPER_MASK),  \
+        .lower = (l & OV772X_EDGE_LOWER_MASK),  \
 }
 
-#define OV772X_MANUAL_EDGECTRL(s, t)                                    \
-{                                                                       \
-        .strength  = (s & EDGE_STRENGTH_MASK) | OV772X_MANUAL_EDGE_CTRL,\
-        .threshold = (t & EDGE_THRESHOLD_MASK),                         \
+#define OV772X_MANUAL_EDGECTRL(s, t)                    \
+{                                                       \
+        .strength  = (s & OV772X_EDGE_STRENGTH_MASK) |  \
+                        OV772X_MANUAL_EDGE_CTRL,        \
+        .threshold = (t & OV772X_EDGE_THRESHOLD_MASK),  \
 }
 
 /*