media: zoran: convert dprintk debug

This patch convert dprintk(debug) to pci_dbg.

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

diff --git a/drivers/staging/media/zoran/zoran_card.c b/drivers/staging/media/zoran/zoran_card.c
index f2387f4..e9c0dc1 100644 (file)
--- a/drivers/staging/media/zoran/zoran_card.c
+++ b/drivers/staging/media/zoran/zoran_card.c
@@ -203,7 +203,7 @@ void zr36016_write(struct videocodec *codec, u16 reg, u32 val)
 
 static void dc10_init(struct zoran *zr)
 {
-       dprintk(3, KERN_DEBUG "%s: %s\n", ZR_DEVNAME(zr), __func__);
+       pci_dbg(zr->pci_dev, "%s\n", __func__);
 
        /* Pixel clock selection */
        GPIO(zr, 4, 0);
@@ -214,12 +214,12 @@ static void dc10_init(struct zoran *zr)
 
 static void dc10plus_init(struct zoran *zr)
 {
-       dprintk(3, KERN_DEBUG "%s: %s\n", ZR_DEVNAME(zr), __func__);
+       pci_dbg(zr->pci_dev, "%s\n", __func__);
 }
 
 static void buz_init(struct zoran *zr)
 {
-       dprintk(3, KERN_DEBUG "%s: %s\n", ZR_DEVNAME(zr), __func__);
+       pci_dbg(zr->pci_dev, "%s\n", __func__);
 
        /* some stuff from Iomega */
        pci_write_config_dword(zr->pci_dev, 0xfc, 0x90680f15);
@@ -229,7 +229,7 @@ static void buz_init(struct zoran *zr)
 
 static void lml33_init(struct zoran *zr)
 {
-       dprintk(3, KERN_DEBUG "%s: %s\n", ZR_DEVNAME(zr), __func__);
+       pci_dbg(zr->pci_dev, "%s\n", __func__);
 
        GPIO(zr, 2, 1);         // Set Composite input/output
 }
@@ -671,15 +671,11 @@ int zoran_check_jpg_settings(struct zoran *zr,
 {
        int err = 0, err0 = 0;
 
-       dprintk(4,
-               KERN_DEBUG
-               "%s: %s - dec: %d, Hdcm: %d, Vdcm: %d, Tdcm: %d\n",
-               ZR_DEVNAME(zr), __func__, settings->decimation, settings->HorDcm,
+       pci_dbg(zr->pci_dev, "%s - dec: %d, Hdcm: %d, Vdcm: %d, Tdcm: %d\n",
+               __func__, settings->decimation, settings->HorDcm,
                settings->VerDcm, settings->TmpDcm);
-       dprintk(4,
-               KERN_DEBUG
-               "%s: %s - x: %d, y: %d, w: %d, y: %d\n",
-               ZR_DEVNAME(zr), __func__, settings->img_x, settings->img_y,
+       pci_dbg(zr->pci_dev, "%s - x: %d, y: %d, w: %d, y: %d\n", __func__,
+               settings->img_x, settings->img_y,
                settings->img_width, settings->img_height);
        /* Check decimation, set default values for decimation = 1, 2, 4 */
        switch (settings->decimation) {
@@ -709,10 +705,7 @@ int zoran_check_jpg_settings(struct zoran *zr,
        case 4:
 
                if (zr->card.type == DC10_new) {
-                       dprintk(1,
-                               KERN_DEBUG
-                               "%s: %s - HDec by 4 is not supported on the DC10\n",
-                               ZR_DEVNAME(zr), __func__);
+                       pci_dbg(zr->pci_dev, "%s - HDec by 4 is not supported on the DC10\n", __func__);
                        err0++;
                        break;
                }
@@ -1157,10 +1150,7 @@ static int zoran_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                        pci_err(pdev, "Unknown card, try specifying card=X module parameter\n");
                        goto zr_unreg;
                }
-               dprintk(3,
-                       KERN_DEBUG
-                       "%s: %s() - card %s detected\n",
-                       ZR_DEVNAME(zr), __func__, zoran_cards[card_num].name);
+               pci_info(zr->pci_dev, "%s() - card %s detected\n", __func__, zoran_cards[card_num].name);
        } else {
                card_num = card[nr];
                if (card_num >= NUM_CARDS || card_num < 0) {

diff --git a/drivers/staging/media/zoran/zoran_card.h b/drivers/staging/media/zoran/zoran_card.h
index 4af8cb9..8e0d634 100644 (file)
--- a/drivers/staging/media/zoran/zoran_card.h
+++ b/drivers/staging/media/zoran/zoran_card.h
@@ -14,12 +14,6 @@
 
 extern int zr36067_debug;
 
-#define dprintk(num, format, args...) \
-       do { \
-               if (zr36067_debug >= num) \
-                       printk(format, ##args); \
-       } while (0)
-
 /* Anybody who uses more than four? */
 #define BUZ_MAX 4
 

diff --git a/drivers/staging/media/zoran/zoran_device.c b/drivers/staging/media/zoran/zoran_device.c
index 013d448..61b4cfc 100644 (file)
--- a/drivers/staging/media/zoran/zoran_device.c
+++ b/drivers/staging/media/zoran/zoran_device.c
@@ -874,7 +874,7 @@ void jpeg_start(struct zoran *zr)
 
        set_frame(zr, 1);       // /FRAME
 
-       dprintk(3, KERN_DEBUG "%s: jpeg_start\n", ZR_DEVNAME(zr));
+       pci_dbg(zr->pci_dev, "jpeg_start\n");
 }
 
 void zr36057_enable_jpg(struct zoran *zr, enum zoran_codec_mode mode)

diff --git a/drivers/staging/media/zoran/zoran_driver.c b/drivers/staging/media/zoran/zoran_driver.c
index 226a99d..21a258b 100644 (file)
--- a/drivers/staging/media/zoran/zoran_driver.c
+++ b/drivers/staging/media/zoran/zoran_driver.c
@@ -341,9 +341,7 @@ static int jpg_fbuffer_alloc(struct zoran_fh *fh)
                }
        }
 
-       dprintk(4,
-               KERN_DEBUG "%s: %s - %d KB allocated\n",
-               ZR_DEVNAME(zr), __func__,
+       pci_dbg(zr->pci_dev, "%s - %d KB allocated\n", __func__,
                (fh->buffers.num_buffers * fh->buffers.buffer_size) >> 10);
 
        fh->buffers.allocated = 1;
@@ -360,7 +358,7 @@ static void jpg_fbuffer_free(struct zoran_fh *fh)
        __le32 frag_tab;
        struct zoran_buffer *buffer;
 
-       dprintk(4, KERN_DEBUG "%s: %s\n", ZR_DEVNAME(zr), __func__);
+       pci_dbg(zr->pci_dev, "%s\n", __func__);
 
        for (i = 0, buffer = &fh->buffers.buffer[0];
             i < fh->buffers.num_buffers; i++, buffer++) {
@@ -1185,10 +1183,7 @@ static int zoran_v4l2_buffer_status(struct zoran_fh *fh,
                }
 
                spin_lock_irqsave(&zr->spinlock, flags);
-               dprintk(3,
-                       KERN_DEBUG
-                       "%s: %s() - raw active=%c, buffer %d: state=%c, map=%c\n",
-                       ZR_DEVNAME(zr), __func__,
+               pci_dbg(zr->pci_dev, "%s() - raw active=%c, buffer %d: state=%c, map=%c\n", __func__,
                        "FAL"[fh->buffers.active], num,
                        "UPMD"[zr->v4l_buffers.buffer[num].state],
                        fh->buffers.buffer[num].map ? 'Y' : 'N');
@@ -1566,9 +1561,10 @@ static int zoran_s_fmt_vid_overlay(struct file *file, void *__fh,
                                   struct v4l2_format *fmt)
 {
        struct zoran_fh *fh = __fh;
+       struct zoran *zr = fh->zr;
        int res;
 
-       dprintk(3, "x=%d, y=%d, w=%d, h=%d, cnt=%d, map=0x%p\n",
+       pci_dbg(zr->pci_dev, "x=%d, y=%d, w=%d, h=%d, cnt=%d, map=0x%p\n",
                fmt->fmt.win.w.left, fmt->fmt.win.w.top,
                        fmt->fmt.win.w.width,
                        fmt->fmt.win.w.height,
@@ -1590,7 +1586,7 @@ static int zoran_s_fmt_vid_out(struct file *file, void *__fh,
        struct zoran_jpg_settings settings;
        int res = 0;
 
-       dprintk(3, "size=%dx%d, fmt=0x%x (%4.4s)\n",
+       pci_dbg(zr->pci_dev, "size=%dx%d, fmt=0x%x (%4.4s)\n",
                fmt->fmt.pix.width, fmt->fmt.pix.height,
                        fmt->fmt.pix.pixelformat,
                        (char *)&printformat);
@@ -2312,10 +2308,8 @@ static __poll_t zoran_poll(struct file *file, poll_table  *wait)
                frame = zr->v4l_pend[zr->v4l_sync_tail & V4L_MASK_FRAME];
 
                spin_lock_irqsave(&zr->spinlock, flags);
-               dprintk(3,
-                       KERN_DEBUG
-                       "%s: %s() raw - active=%c, sync_tail=%lu/%c, pend_tail=%lu, pend_head=%lu\n",
-                       ZR_DEVNAME(zr), __func__,
+               pci_dbg(zr->pci_dev, "%s() raw - active=%c, sync_tail=%lu/%c, pend_tail=%lu, pend_head=%lu\n",
+                       __func__,
                        "FAL"[fh->buffers.active], zr->v4l_sync_tail,
                        "UPMD"[zr->v4l_buffers.buffer[frame].state],
                        zr->v4l_pend_tail, zr->v4l_pend_head);
@@ -2334,10 +2328,8 @@ static __poll_t zoran_poll(struct file *file, poll_table  *wait)
                frame = zr->jpg_pend[zr->jpg_que_tail & BUZ_MASK_FRAME];
 
                spin_lock_irqsave(&zr->spinlock, flags);
-               dprintk(3,
-                       KERN_DEBUG
-                       "%s: %s() jpg - active=%c, que_tail=%lu/%c, que_head=%lu, dma=%lu/%lu\n",
-                       ZR_DEVNAME(zr), __func__,
+               pci_dbg(zr->pci_dev, "%s() jpg - active=%c, que_tail=%lu/%c, que_head=%lu, dma=%lu/%lu\n",
+                       __func__,
                        "FAL"[fh->buffers.active], zr->jpg_que_tail,
                        "UPMD"[zr->jpg_buffers.buffer[frame].state],
                        zr->jpg_que_head, zr->jpg_dma_tail, zr->jpg_dma_head);