[media] saa7146: Use current logging styles

Standardize the mechanisms to emit logging messages.

A few other modules used an #include from saa7146,
convert those at the same time.

Add pr_fmt.
Convert printks to pr_<level>
Convert printks without KERN_<level> to appropriate pr_<level>.
Convert logging macros requiring multiple parentheses to normal style.
Removed embedded prefixes when pr_fmt was added.
Whitespace cleanups when around other conversions.
Use printf extension %pM to print mac address.
Coalesce format strings.

Signed-off-by: Joe Perches <joe@perches.com>
Acked-by: Michael Hunold <michael@mihu.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

1 files changed, 64 insertions, 54 deletions

diff --git a/drivers/media/common/saa7146_fops.c b/drivers/media/common/saa7146_fops.c
index 1bd3dd762c6b..a92546144eaa 100644
--- a/drivers/media/common/saa7146_fops.c
+++ b/drivers/media/common/saa7146_fops.c
@@ -1,3 +1,5 @@
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <media/saa7146_vv.h>
 
 /****************************************************************************/
@@ -9,21 +11,23 @@ int saa7146_res_get(struct saa7146_fh *fh, unsigned int bit)
         struct saa7146_vv *vv = dev->vv_data;
 
         if (fh->resources & bit) {
-                DEB_D(("already allocated! want: 0x%02x, cur:0x%02x\n",bit,vv->resources));
+                DEB_D("already allocated! want: 0x%02x, cur:0x%02x\n",
+                      bit, vv->resources);
                 /* have it already allocated */
                 return 1;
         }
 
         /* is it free? */
         if (vv->resources & bit) {
-                DEB_D(("locked! vv->resources:0x%02x, we want:0x%02x\n",vv->resources,bit));
+                DEB_D("locked! vv->resources:0x%02x, we want:0x%02x\n",
+                      vv->resources, bit);
                 /* no, someone else uses it */
                 return 0;
         }
         /* it's free, grab it */
-        fh->resources  |= bit;
+        fh->resources |= bit;
         vv->resources |= bit;
-        DEB_D(("res: get 0x%02x, cur:0x%02x\n",bit,vv->resources));
+        DEB_D("res: get 0x%02x, cur:0x%02x\n", bit, vv->resources);
         return 1;
 }
 
@@ -34,9 +38,9 @@ void saa7146_res_free(struct saa7146_fh *fh, unsigned int bits)
 
         BUG_ON((fh->resources & bits) != bits);
 
-        fh->resources  &= ~bits;
+        fh->resources &= ~bits;
         vv->resources &= ~bits;
-        DEB_D(("res: put 0x%02x, cur:0x%02x\n",bits,vv->resources));
+        DEB_D("res: put 0x%02x, cur:0x%02x\n", bits, vv->resources);
 }
 
 
@@ -47,7 +51,7 @@ void saa7146_dma_free(struct saa7146_dev *dev,struct videobuf_queue *q,
                                                 struct saa7146_buf *buf)
 {
         struct videobuf_dmabuf *dma=videobuf_to_dma(&buf->vb);
-        DEB_EE(("dev:%p, buf:%p\n",dev,buf));
+        DEB_EE("dev:%p, buf:%p\n", dev, buf);
 
         BUG_ON(in_interrupt());
 
@@ -66,18 +70,19 @@ int saa7146_buffer_queue(struct saa7146_dev *dev,
                          struct saa7146_buf *buf)
 {
         assert_spin_locked(&dev->slock);
-        DEB_EE(("dev:%p, dmaq:%p, buf:%p\n", dev, q, buf));
+        DEB_EE("dev:%p, dmaq:%p, buf:%p\n", dev, q, buf);
 
         BUG_ON(!q);
 
         if (NULL == q->curr) {
                 q->curr = buf;
-                DEB_D(("immediately activating buffer %p\n", buf));
+                DEB_D("immediately activating buffer %p\n", buf);
                 buf->activate(dev,buf,NULL);
         } else {
                 list_add_tail(&buf->vb.queue,&q->queue);
                 buf->vb.state = VIDEOBUF_QUEUED;
-                DEB_D(("adding buffer %p to queue. (active buffer present)\n", buf));
+                DEB_D("adding buffer %p to queue. (active buffer present)\n",
+                      buf);
         }
         return 0;
 }
@@ -87,14 +92,14 @@ void saa7146_buffer_finish(struct saa7146_dev *dev,
                            int state)
 {
         assert_spin_locked(&dev->slock);
-        DEB_EE(("dev:%p, dmaq:%p, state:%d\n", dev, q, state));
-        DEB_EE(("q->curr:%p\n",q->curr));
+        DEB_EE("dev:%p, dmaq:%p, state:%d\n", dev, q, state);
+        DEB_EE("q->curr:%p\n", q->curr);
 
         BUG_ON(!q->curr);
 
         /* finish current buffer */
         if (NULL == q->curr) {
-                DEB_D(("aiii. no current buffer\n"));
+                DEB_D("aiii. no current buffer\n");
                 return;
         }
 
@@ -112,7 +117,7 @@ void saa7146_buffer_next(struct saa7146_dev *dev,
 
         BUG_ON(!q);
 
-        DEB_INT(("dev:%p, dmaq:%p, vbi:%d\n", dev, q, vbi));
+        DEB_INT("dev:%p, dmaq:%p, vbi:%d\n", dev, q, vbi);
 
         assert_spin_locked(&dev->slock);
         if (!list_empty(&q->queue)) {
@@ -122,10 +127,11 @@ void saa7146_buffer_next(struct saa7146_dev *dev,
                 if (!list_empty(&q->queue))
                         next = list_entry(q->queue.next,struct saa7146_buf, vb.queue);
                 q->curr = buf;
-                DEB_INT(("next buffer: buf:%p, prev:%p, next:%p\n", buf, q->queue.prev,q->queue.next));
+                DEB_INT("next buffer: buf:%p, prev:%p, next:%p\n",
+                        buf, q->queue.prev, q->queue.next);
                 buf->activate(dev,buf,next);
         } else {
-                DEB_INT(("no next buffer. stopping.\n"));
+                DEB_INT("no next buffer. stopping.\n");
                 if( 0 != vbi ) {
                         /* turn off video-dma3 */
                         saa7146_write(dev,MC1, MASK_20);
@@ -162,11 +168,11 @@ void saa7146_buffer_timeout(unsigned long data)
         struct saa7146_dev *dev = q->dev;
         unsigned long flags;
 
-        DEB_EE(("dev:%p, dmaq:%p\n", dev, q));
+        DEB_EE("dev:%p, dmaq:%p\n", dev, q);
 
         spin_lock_irqsave(&dev->slock,flags);
         if (q->curr) {
-                DEB_D(("timeout on %p\n", q->curr));
+                DEB_D("timeout on %p\n", q->curr);
                 saa7146_buffer_finish(dev,q,VIDEOBUF_ERROR);
         }
 
@@ -194,12 +200,12 @@ static int fops_open(struct file *file)
 
         enum v4l2_buf_type type;
 
-        DEB_EE(("file:%p, dev:%s\n", file, video_device_node_name(vdev)));
+        DEB_EE("file:%p, dev:%s\n", file, video_device_node_name(vdev));
 
         if (mutex_lock_interruptible(&saa7146_devices_lock))
                 return -ERESTARTSYS;
 
-        DEB_D(("using: %p\n",dev));
+        DEB_D("using: %p\n", dev);
 
         type = vdev->vfl_type == VFL_TYPE_GRABBER
              ? V4L2_BUF_TYPE_VIDEO_CAPTURE
@@ -207,7 +213,7 @@ static int fops_open(struct file *file)
 
         /* check if an extension is registered */
         if( NULL == dev->ext ) {
-                DEB_S(("no extension registered for this device.\n"));
+                DEB_S("no extension registered for this device\n");
                 result = -ENODEV;
                 goto out;
         }
@@ -215,7 +221,7 @@ static int fops_open(struct file *file)
         /* allocate per open data */
         fh = kzalloc(sizeof(*fh),GFP_KERNEL);
         if (NULL == fh) {
-                DEB_S(("cannot allocate memory for per open data.\n"));
+                DEB_S("cannot allocate memory for per open data\n");
                 result = -ENOMEM;
                 goto out;
         }
@@ -225,13 +231,13 @@ static int fops_open(struct file *file)
         fh->type = type;
 
         if( fh->type == V4L2_BUF_TYPE_VBI_CAPTURE) {
-                DEB_S(("initializing vbi...\n"));
+                DEB_S("initializing vbi...\n");
                 if (dev->ext_vv_data->capabilities & V4L2_CAP_VBI_CAPTURE)
                         result = saa7146_vbi_uops.open(dev,file);
                 if (dev->ext_vv_data->vbi_fops.open)
                         dev->ext_vv_data->vbi_fops.open(file);
         } else {
-                DEB_S(("initializing video...\n"));
+                DEB_S("initializing video...\n");
                 result = saa7146_video_uops.open(dev,file);
         }
 
@@ -259,7 +265,7 @@ static int fops_release(struct file *file)
         struct saa7146_fh  *fh  = file->private_data;
         struct saa7146_dev *dev = fh->dev;
 
-        DEB_EE(("file:%p\n", file));
+        DEB_EE("file:%p\n", file);
 
         if (mutex_lock_interruptible(&saa7146_devices_lock))
                 return -ERESTARTSYS;
@@ -289,12 +295,14 @@ static int fops_mmap(struct file *file, struct vm_area_struct * vma)
 
         switch (fh->type) {
         case V4L2_BUF_TYPE_VIDEO_CAPTURE: {
-                DEB_EE(("V4L2_BUF_TYPE_VIDEO_CAPTURE: file:%p, vma:%p\n",file, vma));
+                DEB_EE("V4L2_BUF_TYPE_VIDEO_CAPTURE: file:%p, vma:%p\n",
+                       file, vma);
                 q = &fh->video_q;
                 break;
                 }
         case V4L2_BUF_TYPE_VBI_CAPTURE: {
-                DEB_EE(("V4L2_BUF_TYPE_VBI_CAPTURE: file:%p, vma:%p\n",file, vma));
+                DEB_EE("V4L2_BUF_TYPE_VBI_CAPTURE: file:%p, vma:%p\n",
+                       file, vma);
                 q = &fh->vbi_q;
                 break;
                 }
@@ -312,14 +320,14 @@ static unsigned int fops_poll(struct file *file, struct poll_table_struct *wait)
         struct videobuf_buffer *buf = NULL;
         struct videobuf_queue *q;
 
-        DEB_EE(("file:%p, poll:%p\n",file, wait));
+        DEB_EE("file:%p, poll:%p\n", file, wait);
 
         if (V4L2_BUF_TYPE_VBI_CAPTURE == fh->type) {
                 if( 0 == fh->vbi_q.streaming )
                         return videobuf_poll_stream(file, &fh->vbi_q, wait);
                 q = &fh->vbi_q;
         } else {
-                DEB_D(("using video queue.\n"));
+                DEB_D("using video queue\n");
                 q = &fh->video_q;
         }
 
@@ -327,17 +335,17 @@ static unsigned int fops_poll(struct file *file, struct poll_table_struct *wait)
                 buf = list_entry(q->stream.next, struct videobuf_buffer, stream);
 
         if (!buf) {
-                DEB_D(("buf == NULL!\n"));
+                DEB_D("buf == NULL!\n");
                 return POLLERR;
         }
 
         poll_wait(file, &buf->done, wait);
         if (buf->state == VIDEOBUF_DONE || buf->state == VIDEOBUF_ERROR) {
-                DEB_D(("poll succeeded!\n"));
+                DEB_D("poll succeeded!\n");
                 return POLLIN|POLLRDNORM;
         }
 
-        DEB_D(("nothing to poll for, buf->state:%d\n",buf->state));
+        DEB_D("nothing to poll for, buf->state:%d\n", buf->state);
         return 0;
 }
 
@@ -346,18 +354,20 @@ static ssize_t fops_read(struct file *file, char __user *data, size_t count, lof
         struct saa7146_fh *fh = file->private_data;
 
         switch (fh->type) {
-        case V4L2_BUF_TYPE_VIDEO_CAPTURE: {
-//              DEB_EE(("V4L2_BUF_TYPE_VIDEO_CAPTURE: file:%p, data:%p, count:%lun", file, data, (unsigned long)count));
+        case V4L2_BUF_TYPE_VIDEO_CAPTURE:
+/*
+                DEB_EE("V4L2_BUF_TYPE_VIDEO_CAPTURE: file:%p, data:%p, count:%lun",
+                       file, data, (unsigned long)count);
+*/
                 return saa7146_video_uops.read(file,data,count,ppos);
-                }
-        case V4L2_BUF_TYPE_VBI_CAPTURE: {
-//              DEB_EE(("V4L2_BUF_TYPE_VBI_CAPTURE: file:%p, data:%p, count:%lu\n", file, data, (unsigned long)count));
+        case V4L2_BUF_TYPE_VBI_CAPTURE:
+/*
+                DEB_EE("V4L2_BUF_TYPE_VBI_CAPTURE: file:%p, data:%p, count:%lu\n",
+                       file, data, (unsigned long)count);
+*/
                 if (fh->dev->ext_vv_data->capabilities & V4L2_CAP_VBI_CAPTURE)
                         return saa7146_vbi_uops.read(file,data,count,ppos);
-                else
-                        return -EINVAL;
-                }
-                break;
+                return -EINVAL;
         default:
                 BUG();
                 return 0;
@@ -398,22 +408,22 @@ static void vv_callback(struct saa7146_dev *dev, unsigned long status)
 {
         u32 isr = status;
 
-        DEB_INT(("dev:%p, isr:0x%08x\n",dev,(u32)status));
+        DEB_INT("dev:%p, isr:0x%08x\n", dev, (u32)status);
 
         if (0 != (isr & (MASK_27))) {
-                DEB_INT(("irq: RPS0 (0x%08x).\n",isr));
+                DEB_INT("irq: RPS0 (0x%08x)\n", isr);
                 saa7146_video_uops.irq_done(dev,isr);
         }
 
         if (0 != (isr & (MASK_28))) {
                 u32 mc2 = saa7146_read(dev, MC2);
                 if( 0 != (mc2 & MASK_15)) {
-                        DEB_INT(("irq: RPS1 vbi workaround (0x%08x).\n",isr));
+                        DEB_INT("irq: RPS1 vbi workaround (0x%08x)\n", isr);
                         wake_up(&dev->vv_data->vbi_wq);
                         saa7146_write(dev,MC2, MASK_31);
                         return;
                 }
-                DEB_INT(("irq: RPS1 (0x%08x).\n",isr));
+                DEB_INT("irq: RPS1 (0x%08x)\n", isr);
                 saa7146_vbi_uops.irq_done(dev,isr);
         }
 }
@@ -429,13 +439,13 @@ int saa7146_vv_init(struct saa7146_dev* dev, struct saa7146_ext_vv *ext_vv)
 
         vv = kzalloc(sizeof(struct saa7146_vv), GFP_KERNEL);
         if (vv == NULL) {
-                ERR(("out of memory. aborting.\n"));
+                ERR("out of memory. aborting.\n");
                 return -ENOMEM;
         }
         ext_vv->ops = saa7146_video_ioctl_ops;
         ext_vv->core_ops = &saa7146_video_ioctl_ops;
 
-        DEB_EE(("dev:%p\n",dev));
+        DEB_EE("dev:%p\n", dev);
 
         /* set default values for video parts of the saa7146 */
         saa7146_write(dev, BCS_CTRL, 0x80400040);
@@ -450,7 +460,7 @@ int saa7146_vv_init(struct saa7146_dev* dev, struct saa7146_ext_vv *ext_vv)
 
         vv->d_clipping.cpu_addr = pci_alloc_consistent(dev->pci, SAA7146_CLIPPING_MEM, &vv->d_clipping.dma_handle);
         if( NULL == vv->d_clipping.cpu_addr ) {
-                ERR(("out of memory. aborting.\n"));
+                ERR("out of memory. aborting.\n");
                 kfree(vv);
                 return -1;
         }
@@ -471,7 +481,7 @@ int saa7146_vv_release(struct saa7146_dev* dev)
 {
         struct saa7146_vv *vv = dev->vv_data;
 
-        DEB_EE(("dev:%p\n",dev));
+        DEB_EE("dev:%p\n", dev);
 
         v4l2_device_unregister(&dev->v4l2_dev);
         pci_free_consistent(dev->pci, SAA7146_CLIPPING_MEM, vv->d_clipping.cpu_addr, vv->d_clipping.dma_handle);
@@ -490,7 +500,7 @@ int saa7146_register_device(struct video_device **vid, struct saa7146_dev* dev,
         int err;
         int i;
 
-        DEB_EE(("dev:%p, name:'%s', type:%d\n",dev,name,type));
+        DEB_EE("dev:%p, name:'%s', type:%d\n", dev, name, type);
 
         // released by vfd->release
         vfd = video_device_alloc();
@@ -509,13 +519,13 @@ int saa7146_register_device(struct video_device **vid, struct saa7146_dev* dev,
 
         err = video_register_device(vfd, type, -1);
         if (err < 0) {
-                ERR(("cannot register v4l2 device. skipping.\n"));
+                ERR("cannot register v4l2 device. skipping.\n");
                 video_device_release(vfd);
                 return err;
         }
 
-        INFO(("%s: registered device %s [v4l2]\n",
-                dev->name, video_device_node_name(vfd)));
+        pr_info("%s: registered device %s [v4l2]\n",
+                dev->name, video_device_node_name(vfd));
 
         *vid = vfd;
         return 0;
@@ -524,7 +534,7 @@ EXPORT_SYMBOL_GPL(saa7146_register_device);
 
 int saa7146_unregister_device(struct video_device **vid, struct saa7146_dev* dev)
 {
-        DEB_EE(("dev:%p\n",dev));
+        DEB_EE("dev:%p\n", dev);
 
         video_unregister_device(*vid);
         *vid = NULL;