V4L/DVB (7219): zoran: Fix namespace conflicts with Zoran 'GPIO_MAX' enum

Thanks to Martin Michlmayr <tbm@cyrius.com> for reporting this issue:

The zoran driver fails to compile on the ARM Orion platform with:

In file included from drivers/media/video/zoran_procfs.c:50:
drivers/media/video/zoran.h:232: error: expected identifier before numeric
constant

The reason is that drivers/media/video/zoran.h defines an enum with
GPIO_MAX in it, but Orion contains a #define GPIO_MAX 32 in
include/asm-arm/arch-orion/orion.h

Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

2 files changed, 17 insertions, 17 deletions

diff --git a/drivers/media/video/zoran.h b/drivers/media/video/zoran.h
index 937c4a616c0e..498a43c1f2b1 100644
--- a/drivers/media/video/zoran.h
+++ b/drivers/media/video/zoran.h
@@ -221,15 +221,15 @@ enum zoran_map_mode {
 };
 
 enum gpio_type {
-        GPIO_JPEG_SLEEP = 0,
-        GPIO_JPEG_RESET,
-        GPIO_JPEG_FRAME,
-        GPIO_VID_DIR,
-        GPIO_VID_EN,
-        GPIO_VID_RESET,
-        GPIO_CLK_SEL1,
-        GPIO_CLK_SEL2,
-        GPIO_MAX,
+        ZR_GPIO_JPEG_SLEEP = 0,
+        ZR_GPIO_JPEG_RESET,
+        ZR_GPIO_JPEG_FRAME,
+        ZR_GPIO_VID_DIR,
+        ZR_GPIO_VID_EN,
+        ZR_GPIO_VID_RESET,
+        ZR_GPIO_CLK_SEL1,
+        ZR_GPIO_CLK_SEL2,
+        ZR_GPIO_MAX,
 };
 
 enum gpcs_type {
@@ -378,11 +378,11 @@ struct card_info {
 
         u32 jpeg_int;           /* JPEG interrupt */
         u32 vsync_int;          /* VSYNC interrupt */
-        s8 gpio[GPIO_MAX];
+        s8 gpio[ZR_GPIO_MAX];
         u8 gpcs[GPCS_MAX];
 
         struct vfe_polarity vfe_pol;
-        u8 gpio_pol[GPIO_MAX];
+        u8 gpio_pol[ZR_GPIO_MAX];
 
         /* is the /GWS line conected? */
         u8 gws_not_connected;
diff --git a/drivers/media/video/zoran_device.c b/drivers/media/video/zoran_device.c
index 68c7c505587e..f97c20692057 100644
--- a/drivers/media/video/zoran_device.c
+++ b/drivers/media/video/zoran_device.c
@@ -250,7 +250,7 @@ void
 jpeg_codec_sleep (struct zoran *zr,
                   int           sleep)
 {
-        GPIO(zr, zr->card.gpio[GPIO_JPEG_SLEEP], !sleep);
+        GPIO(zr, zr->card.gpio[ZR_GPIO_JPEG_SLEEP], !sleep);
         if (!sleep) {
                 dprintk(3,
                         KERN_DEBUG
@@ -277,9 +277,9 @@ jpeg_codec_reset (struct zoran *zr)
                                   0);
                 udelay(2);
         } else {
-                GPIO(zr, zr->card.gpio[GPIO_JPEG_RESET], 0);
+                GPIO(zr, zr->card.gpio[ZR_GPIO_JPEG_RESET], 0);
                 udelay(2);
-                GPIO(zr, zr->card.gpio[GPIO_JPEG_RESET], 1);
+                GPIO(zr, zr->card.gpio[ZR_GPIO_JPEG_RESET], 1);
                 udelay(2);
         }
 
@@ -688,7 +688,7 @@ static inline void
 set_frame (struct zoran *zr,
            int           val)
 {
-        GPIO(zr, zr->card.gpio[GPIO_JPEG_FRAME], val);
+        GPIO(zr, zr->card.gpio[ZR_GPIO_JPEG_FRAME], val);
 }
 
 static void
@@ -704,8 +704,8 @@ set_videobus_dir (struct zoran *zr,
                         GPIO(zr, 5, 1);
                 break;
         default:
-                GPIO(zr, zr->card.gpio[GPIO_VID_DIR],
-                     zr->card.gpio_pol[GPIO_VID_DIR] ? !val : val);
+                GPIO(zr, zr->card.gpio[ZR_GPIO_VID_DIR],
+                     zr->card.gpio_pol[ZR_GPIO_VID_DIR] ? !val : val);
                 break;
         }
 }