media: staging: media: zoran: drop kernel log spam

Do not spam the kernel log with messages that result from incorrect
userspace input. Those should be either dropped completely (the error
code gives sufficient info) or changed to debug messages.

Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Corentin Labbe <clabbe@baylibre.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>

diff --git a/drivers/staging/media/zoran/zoran_device.c b/drivers/staging/media/zoran/zoran_device.c
index fb1f0465ca87fab32060c67deebc5250eb32e5d0..2470889a58fa014343f5aa7477a4b86244a15a6d 100644 (file)
--- a/drivers/staging/media/zoran/zoran_device.c
+++ b/drivers/staging/media/zoran/zoran_device.c
@@ -239,7 +239,7 @@ static void zr36057_set_vfe(struct zoran *zr, int video_width, int video_height,
        wa = tvn->wa;
        ha = tvn->ha;
 
-       pci_info(zr->pci_dev, "set_vfe() - width = %d, height = %d\n", video_width, video_height);
+       pci_dbg(zr->pci_dev, "set_vfe() - width = %d, height = %d\n", video_width, video_height);
 
        if (video_width < BUZ_MIN_WIDTH ||
            video_height < BUZ_MIN_HEIGHT ||
@@ -664,7 +664,7 @@ void zr36057_enable_jpg(struct zoran *zr, enum zoran_codec_mode mode)
                zr36057_set_jpg(zr, mode);      // \P_Reset, ... Video param, FIFO
 
                clear_interrupt_counters(zr);
-               pci_info(zr->pci_dev, "enable_jpg(MOTION_COMPRESS)\n");
+               pci_dbg(zr->pci_dev, "enable_jpg(MOTION_COMPRESS)\n");
                break;
        }
 
@@ -693,7 +693,7 @@ void zr36057_enable_jpg(struct zoran *zr, enum zoran_codec_mode mode)
                zr36057_set_jpg(zr, mode);      // \P_Reset, ... Video param, FIFO
 
                clear_interrupt_counters(zr);
-               pci_info(zr->pci_dev, "enable_jpg(MOTION_DECOMPRESS)\n");
+               pci_dbg(zr->pci_dev, "enable_jpg(MOTION_DECOMPRESS)\n");
                break;
 
        case BUZ_MODE_IDLE:
@@ -720,7 +720,7 @@ void zr36057_enable_jpg(struct zoran *zr, enum zoran_codec_mode mode)
                decoder_call(zr, video, s_stream, 1);
                encoder_call(zr, video, s_routing, 0, 0, 0);
 
-               pci_info(zr->pci_dev, "enable_jpg(IDLE)\n");
+               pci_dbg(zr->pci_dev, "enable_jpg(IDLE)\n");
                break;
        }
 }

diff --git a/drivers/staging/media/zoran/zoran_driver.c b/drivers/staging/media/zoran/zoran_driver.c
index 367fe4be8357dbaf749b867631f46e01d66e3f23..013efdecd582f65fef6259b20e7d16d3ad6e4f20 100644 (file)
--- a/drivers/staging/media/zoran/zoran_driver.c
+++ b/drivers/staging/media/zoran/zoran_driver.c
@@ -171,7 +171,7 @@ static int zoran_v4l_set_format(struct zoran *zr, int width, int height,
 
        if (height < BUZ_MIN_HEIGHT || width < BUZ_MIN_WIDTH ||
            height > BUZ_MAX_HEIGHT || width > BUZ_MAX_WIDTH) {
-               pci_err(zr->pci_dev, "%s - wrong frame size (%dx%d)\n", __func__, width, height);
+               pci_dbg(zr->pci_dev, "%s - wrong frame size (%dx%d)\n", __func__, width, height);
                return -EINVAL;
        }
 
@@ -181,7 +181,7 @@ static int zoran_v4l_set_format(struct zoran *zr, int width, int height,
 
        /* Check against available buffer size */
        if (height * width * bpp > zr->buffer_size) {
-               pci_err(zr->pci_dev, "%s - video buffer size (%d kB) is too small\n",
+               pci_dbg(zr->pci_dev, "%s - video buffer size (%d kB) is too small\n",
                        __func__, zr->buffer_size >> 10);
                return -EINVAL;
        }
@@ -189,7 +189,7 @@ static int zoran_v4l_set_format(struct zoran *zr, int width, int height,
        /* The video front end needs 4-byte alinged line sizes */
 
        if ((bpp == 2 && (width & 1)) || (bpp == 3 && (width & 3))) {
-               pci_err(zr->pci_dev, "%s - wrong frame alignment\n", __func__);
+               pci_dbg(zr->pci_dev, "%s - wrong frame alignment\n", __func__);
                return -EINVAL;
        }
 
@@ -205,7 +205,7 @@ static int zoran_set_norm(struct zoran *zr, v4l2_std_id norm)
 {
 
        if (!(norm & zr->card.norms)) {
-               pci_err(zr->pci_dev, "%s - unsupported norm %llx\n", __func__, norm);
+               pci_dbg(zr->pci_dev, "%s - unsupported norm %llx\n", __func__, norm);
                return -EINVAL;
        }
 
@@ -231,7 +231,7 @@ static int zoran_set_input(struct zoran *zr, int input)
                return 0;
 
        if (input < 0 || input >= zr->card.inputs) {
-               pci_err(zr->pci_dev, "%s - unsupported input %d\n", __func__, input);
+               pci_dbg(zr->pci_dev, "%s - unsupported input %d\n", __func__, input);
                return -EINVAL;
        }
 
@@ -532,7 +532,7 @@ static int zoran_s_fmt_vid_cap(struct file *file, void *__fh,
                if (fmt->fmt.pix.pixelformat == zoran_formats[i].fourcc)
                        break;
        if (i == NUM_FORMATS) {
-               pci_err(zr->pci_dev, "VIDIOC_S_FMT - unknown/unsupported format 0x%x\n",
+               pci_dbg(zr->pci_dev, "VIDIOC_S_FMT - unknown/unsupported format 0x%x\n",
                        fmt->fmt.pix.pixelformat);
                /* TODO do not return here to fix the TRY_FMT cannot handle an invalid pixelformat*/
                return -EINVAL;
@@ -666,7 +666,7 @@ static int zoran_g_selection(struct file *file, void *__fh, struct v4l2_selectio
 
        if (sel->type != V4L2_BUF_TYPE_VIDEO_OUTPUT &&
            sel->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) {
-               pci_err(zr->pci_dev, "%s invalid selection type combination\n", __func__);
+               pci_dbg(zr->pci_dev, "%s invalid selection type combination\n", __func__);
                return -EINVAL;
        }
 
@@ -712,7 +712,7 @@ static int zoran_s_selection(struct file *file, void *__fh, struct v4l2_selectio
                return -EINVAL;
 
        if (zr->map_mode == ZORAN_MAP_MODE_RAW) {
-               pci_err(zr->pci_dev, "VIDIOC_S_SELECTION - subcapture only supported for compressed capture\n");
+               pci_dbg(zr->pci_dev, "VIDIOC_S_SELECTION - subcapture only supported for compressed capture\n");
                return -EINVAL;
        }
 
@@ -937,7 +937,7 @@ static int zr_vb2_start_streaming(struct vb2_queue *vq, unsigned int count)
        zr->vbseq = 0;
 
        if (zr->map_mode != ZORAN_MAP_MODE_RAW) {
-               pci_info(zr->pci_dev, "START JPG\n");
+               pci_dbg(zr->pci_dev, "START JPG\n");
                zr36057_restart(zr);
                zoran_init_hardware(zr);
                if (zr->map_mode == ZORAN_MAP_MODE_JPG_REC)
@@ -951,7 +951,7 @@ static int zr_vb2_start_streaming(struct vb2_queue *vq, unsigned int count)
                return 0;
        }
 
-       pci_info(zr->pci_dev, "START RAW\n");
+       pci_dbg(zr->pci_dev, "START RAW\n");
        zr36057_restart(zr);
        zoran_init_hardware(zr);
 
@@ -1001,7 +1001,7 @@ static void zr_vb2_stop_streaming(struct vb2_queue *vq)
        }
        spin_unlock_irqrestore(&zr->queued_bufs_lock, flags);
        if (zr->buf_in_reserve)
-               pci_err(zr->pci_dev, "Buffer remaining %d\n", zr->buf_in_reserve);
+               pci_dbg(zr->pci_dev, "Buffer remaining %d\n", zr->buf_in_reserve);
        zr->map_mode = ZORAN_MAP_MODE_RAW;
 }