---

yaml --- r: 367169 b: refs/heads/master c: bad1f29 h: refs/heads/master i: 367167: ced5d21 v: v3
git-mirror · Apr 16, 2013 · f5821ee · f5821ee
1 parent e1a8c8a
commit f5821ee
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 8 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f8d7ee70919d44ef4f01f3c9bc49af54fdc433bc
+refs/heads/master: bad1f29d0f98972665e6503a286d058125212aa5
diff --git a/trunk/drivers/media/pci/cx25821/cx25821-core.c b/trunk/drivers/media/pci/cx25821/cx25821-core.c
@@ -814,7 +814,7 @@ static void cx25821_initialize(struct cx25821_dev *dev)
 		cx25821_sram_channel_setup(dev, dev->channels[i].sram_channels,
 						1440, 0);
 		dev->channels[i].pixel_formats = PIXEL_FRMT_422;
-		dev->channels[i].use_cif_resolution = FALSE;
+		dev->channels[i].use_cif_resolution = 0;
 	}
 
 	/* Probably only affect Downstream */

diff --git a/trunk/drivers/media/pci/cx25821/cx25821-medusa-video.c b/trunk/drivers/media/pci/cx25821/cx25821-medusa-video.c
@@ -404,7 +404,7 @@ static int medusa_initialize_pal(struct cx25821_dev *dev)
 
 int medusa_set_videostandard(struct cx25821_dev *dev)
 {
-	int status = STATUS_SUCCESS;
+	int status = 0;
 	u32 value = 0, tmp = 0;
 
 	if (dev->tvnorm & V4L2_STD_PAL_BG || dev->tvnorm & V4L2_STD_PAL_DK)

diff --git a/trunk/drivers/media/pci/cx25821/cx25821.h b/trunk/drivers/media/pci/cx25821/cx25821.h
@@ -52,8 +52,6 @@
 
 #define CX25821_MAXBOARDS 2
 
-#define TRUE    1
-#define FALSE   0
 #define LINE_SIZE_D1    1440
 
 /* Number of decoders and encoders */
@@ -456,9 +454,6 @@ struct sram_channel {
 
 extern const struct sram_channel cx25821_sram_channels[];
 
-#define STATUS_SUCCESS         0
-#define STATUS_UNSUCCESSFUL    -1
-
 #define cx_read(reg)             readl(dev->lmmio + ((reg)>>2))
 #define cx_write(reg, value)     writel((value), dev->lmmio + ((reg)>>2))