staging: most: removed redundant code

This patch removes redundant code.

Signed-off-by: Christian Gromm <christian.gromm@microchip.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/most/aim-v4l2/video.c b/drivers/staging/most/aim-v4l2/video.c
index 0d752580d8092cb4d239213557e78b533cd90778..228971abf310d8050ac0b7bb21548d21743b392e 100644 (file)
--- a/drivers/staging/most/aim-v4l2/video.c
+++ b/drivers/staging/most/aim-v4l2/video.c
@@ -239,28 +239,6 @@ static void aim_set_format_struct(struct v4l2_format *f)
 static int aim_set_format(struct most_video_dev *mdev, unsigned int cmd,
                          struct v4l2_format *format)
 {
-#if 0
-       u32 const pixfmt = format->fmt.pix.pixelformat;
-       const char *fmt;
-
-       if (pixfmt != V4L2_PIX_FMT_MPEG) {
-               if (cmd == VIDIOC_TRY_FMT)
-                       fmt = KERN_ERR "try %c%c%c%c failed\n";
-               else
-                       fmt = KERN_ERR "set %c%c%c%c failed\n";
-       } else {
-               if (cmd == VIDIOC_TRY_FMT)
-                       fmt = KERN_ERR "try %c%c%c%c\n";
-               else
-                       fmt = KERN_ERR "set %c%c%c%c\n";
-       }
-       printk(fmt,
-              (pixfmt) & 255,
-              (pixfmt >> 8) & 255,
-              (pixfmt >> 16) & 255,
-              (pixfmt >> 24) & 255);
-#endif
-
        if (format->fmt.pix.pixelformat != V4L2_PIX_FMT_MPEG)
                return -EINVAL;
 

diff --git a/drivers/staging/most/hdm-dim2/dim2_hal.c b/drivers/staging/most/hdm-dim2/dim2_hal.c
index 4c1104de36fee2c9b220b72acaf4122dee82df31..53b34a74d72410d2b775e02215d3172c56f10830 100644 (file)
--- a/drivers/staging/most/hdm-dim2/dim2_hal.c
+++ b/drivers/staging/most/hdm-dim2/dim2_hal.c
@@ -493,22 +493,6 @@ static void dim2_initialize(bool enable_6pin, u8 mlb_clock)
        DIMCB_IoWrite(&g.dim2->ACTL,
                      ACTL_DMA_MODE_VAL_DMA_MODE_1 << ACTL_DMA_MODE_BIT |
                      true << ACTL_SCE_BIT);
-
-#if 0
-       DIMCB_IoWrite(&g.dim2->MIEN,
-                     bit_mask(MIEN_CTX_BREAK_BIT) |
-                     bit_mask(MIEN_CTX_PE_BIT) |
-                     bit_mask(MIEN_CTX_DONE_BIT) |
-                     bit_mask(MIEN_CRX_BREAK_BIT) |
-                     bit_mask(MIEN_CRX_PE_BIT) |
-                     bit_mask(MIEN_CRX_DONE_BIT) |
-                     bit_mask(MIEN_ATX_BREAK_BIT) |
-                     bit_mask(MIEN_ATX_PE_BIT) |
-                     bit_mask(MIEN_ATX_DONE_BIT) |
-                     bit_mask(MIEN_ARX_BREAK_BIT) |
-                     bit_mask(MIEN_ARX_PE_BIT) |
-                     bit_mask(MIEN_ARX_DONE_BIT));
-#endif
 }
 
 static bool dim2_is_mlb_locked(void)