diff options
author | Hans Verkuil <hans.verkuil@cisco.com> | 2013-04-14 10:13:43 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-04-16 17:04:37 -0400 |
commit | bad1f29d0f98972665e6503a286d058125212aa5 (patch) | |
tree | 5aec1ff1e2e05f7645727a4a5ba89e21e680ee20 /drivers/media | |
parent | f8d7ee70919d44ef4f01f3c9bc49af54fdc433bc (diff) |
[media] cx25821: remove TRUE/FALSE/STATUS_(UN)SUCCESSFUL defines
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
-rw-r--r-- | drivers/media/pci/cx25821/cx25821-core.c | 2 | ||||
-rw-r--r-- | drivers/media/pci/cx25821/cx25821-medusa-video.c | 2 | ||||
-rw-r--r-- | drivers/media/pci/cx25821/cx25821.h | 5 |
3 files changed, 2 insertions, 7 deletions
diff --git a/drivers/media/pci/cx25821/cx25821-core.c b/drivers/media/pci/cx25821/cx25821-core.c index bf6c1812dd8c..ba417c978415 100644 --- a/drivers/media/pci/cx25821/cx25821-core.c +++ b/drivers/media/pci/cx25821/cx25821-core.c | |||
@@ -814,7 +814,7 @@ static void cx25821_initialize(struct cx25821_dev *dev) | |||
814 | cx25821_sram_channel_setup(dev, dev->channels[i].sram_channels, | 814 | cx25821_sram_channel_setup(dev, dev->channels[i].sram_channels, |
815 | 1440, 0); | 815 | 1440, 0); |
816 | dev->channels[i].pixel_formats = PIXEL_FRMT_422; | 816 | dev->channels[i].pixel_formats = PIXEL_FRMT_422; |
817 | dev->channels[i].use_cif_resolution = FALSE; | 817 | dev->channels[i].use_cif_resolution = 0; |
818 | } | 818 | } |
819 | 819 | ||
820 | /* Probably only affect Downstream */ | 820 | /* Probably only affect Downstream */ |
diff --git a/drivers/media/pci/cx25821/cx25821-medusa-video.c b/drivers/media/pci/cx25821/cx25821-medusa-video.c index 6a92e5c70c2a..6ab3ae08348e 100644 --- a/drivers/media/pci/cx25821/cx25821-medusa-video.c +++ b/drivers/media/pci/cx25821/cx25821-medusa-video.c | |||
@@ -404,7 +404,7 @@ static int medusa_initialize_pal(struct cx25821_dev *dev) | |||
404 | 404 | ||
405 | int medusa_set_videostandard(struct cx25821_dev *dev) | 405 | int medusa_set_videostandard(struct cx25821_dev *dev) |
406 | { | 406 | { |
407 | int status = STATUS_SUCCESS; | 407 | int status = 0; |
408 | u32 value = 0, tmp = 0; | 408 | u32 value = 0, tmp = 0; |
409 | 409 | ||
410 | if (dev->tvnorm & V4L2_STD_PAL_BG || dev->tvnorm & V4L2_STD_PAL_DK) | 410 | if (dev->tvnorm & V4L2_STD_PAL_BG || dev->tvnorm & V4L2_STD_PAL_DK) |
diff --git a/drivers/media/pci/cx25821/cx25821.h b/drivers/media/pci/cx25821/cx25821.h index c63f7f571614..95dbf70d8667 100644 --- a/drivers/media/pci/cx25821/cx25821.h +++ b/drivers/media/pci/cx25821/cx25821.h | |||
@@ -52,8 +52,6 @@ | |||
52 | 52 | ||
53 | #define CX25821_MAXBOARDS 2 | 53 | #define CX25821_MAXBOARDS 2 |
54 | 54 | ||
55 | #define TRUE 1 | ||
56 | #define FALSE 0 | ||
57 | #define LINE_SIZE_D1 1440 | 55 | #define LINE_SIZE_D1 1440 |
58 | 56 | ||
59 | /* Number of decoders and encoders */ | 57 | /* Number of decoders and encoders */ |
@@ -456,9 +454,6 @@ struct sram_channel { | |||
456 | 454 | ||
457 | extern const struct sram_channel cx25821_sram_channels[]; | 455 | extern const struct sram_channel cx25821_sram_channels[]; |
458 | 456 | ||
459 | #define STATUS_SUCCESS 0 | ||
460 | #define STATUS_UNSUCCESSFUL -1 | ||
461 | |||
462 | #define cx_read(reg) readl(dev->lmmio + ((reg)>>2)) | 457 | #define cx_read(reg) readl(dev->lmmio + ((reg)>>2)) |
463 | #define cx_write(reg, value) writel((value), dev->lmmio + ((reg)>>2)) | 458 | #define cx_write(reg, value) writel((value), dev->lmmio + ((reg)>>2)) |
464 | 459 | ||