[media] cx231xx: remove bogus driver prefix in log messages

The prefix is generated automatically, so no need to provide it again.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/usb/cx231xx/cx231xx-vbi.c b/drivers/media/usb/cx231xx/cx231xx-vbi.c
index 46e3892557c2127b3e022b85056d529ec2d02f4c..1340ff268817763290e187d7658647f4a8bac0d1 100644 (file)
--- a/drivers/media/usb/cx231xx/cx231xx-vbi.c
+++ b/drivers/media/usb/cx231xx/cx231xx-vbi.c
@@ -70,10 +70,10 @@ static inline void print_err_status(struct cx231xx *dev, int packet, int status)
                break;
        }
        if (packet < 0) {
-               cx231xx_err(DRIVER_NAME "URB status %d [%s].\n", status,
+               cx231xx_err("URB status %d [%s].\n", status,
                            errmsg);
        } else {
-               cx231xx_err(DRIVER_NAME "URB packet %d, status %d [%s].\n",
+               cx231xx_err("URB packet %d, status %d [%s].\n",
                            packet, status, errmsg);
        }
 }
@@ -317,7 +317,7 @@ static void cx231xx_irq_vbi_callback(struct urb *urb)
        case -ESHUTDOWN:
                return;
        default:                /* error */
-               cx231xx_err(DRIVER_NAME "urb completition error %d.\n",
+               cx231xx_err("urb completition error %d.\n",
                            urb->status);
                break;
        }
@@ -332,7 +332,7 @@ static void cx231xx_irq_vbi_callback(struct urb *urb)
 
        urb->status = usb_submit_urb(urb, GFP_ATOMIC);
        if (urb->status) {
-               cx231xx_err(DRIVER_NAME "urb resubmit failed (error=%i)\n",
+               cx231xx_err("urb resubmit failed (error=%i)\n",
                            urb->status);
        }
 }
@@ -345,7 +345,7 @@ void cx231xx_uninit_vbi_isoc(struct cx231xx *dev)
        struct urb *urb;
        int i;
 
-       cx231xx_info(DRIVER_NAME "cx231xx: called cx231xx_uninit_vbi_isoc\n");
+       cx231xx_info("called cx231xx_uninit_vbi_isoc\n");
 
        dev->vbi_mode.bulk_ctl.nfields = -1;
        for (i = 0; i < dev->vbi_mode.bulk_ctl.num_bufs; i++) {
@@ -394,7 +394,7 @@ int cx231xx_init_vbi_isoc(struct cx231xx *dev, int max_packets,
        struct urb *urb;
        int rc;
 
-       cx231xx_info(DRIVER_NAME "cx231xx: called cx231xx_prepare_isoc\n");
+       cx231xx_info("called cx231xx_vbi_isoc\n");
 
        /* De-allocates all pending stuff */
        cx231xx_uninit_vbi_isoc(dev);
@@ -442,8 +442,7 @@ int cx231xx_init_vbi_isoc(struct cx231xx *dev, int max_packets,
 
                urb = usb_alloc_urb(0, GFP_KERNEL);
                if (!urb) {
-                       cx231xx_err(DRIVER_NAME
-                                   ": cannot alloc bulk_ctl.urb %i\n", i);
+                       cx231xx_err("cannot alloc bulk_ctl.urb %i\n", i);
                        cx231xx_uninit_vbi_isoc(dev);
                        return -ENOMEM;
                }
@@ -453,8 +452,7 @@ int cx231xx_init_vbi_isoc(struct cx231xx *dev, int max_packets,
                dev->vbi_mode.bulk_ctl.transfer_buffer[i] =
                    kzalloc(sb_size, GFP_KERNEL);
                if (!dev->vbi_mode.bulk_ctl.transfer_buffer[i]) {
-                       cx231xx_err(DRIVER_NAME
-                                   ": unable to allocate %i bytes for transfer"
+                       cx231xx_err("unable to allocate %i bytes for transfer"
                                    " buffer %i%s\n", sb_size, i,
                                    in_interrupt() ? " while in int" : "");
                        cx231xx_uninit_vbi_isoc(dev);
@@ -473,8 +471,7 @@ int cx231xx_init_vbi_isoc(struct cx231xx *dev, int max_packets,
        for (i = 0; i < dev->vbi_mode.bulk_ctl.num_bufs; i++) {
                rc = usb_submit_urb(dev->vbi_mode.bulk_ctl.urb[i], GFP_ATOMIC);
                if (rc) {
-                       cx231xx_err(DRIVER_NAME
-                                   ": submit of urb %i failed (error=%i)\n", i,
+                       cx231xx_err("submit of urb %i failed (error=%i)\n", i,
                                    rc);
                        cx231xx_uninit_vbi_isoc(dev);
                        return rc;
@@ -526,7 +523,7 @@ static inline void vbi_buffer_filled(struct cx231xx *dev,
                                     struct cx231xx_buffer *buf)
 {
        /* Advice that buffer was filled */
-       /* cx231xx_info(DRIVER_NAME "[%p/%d] wakeup\n", buf, buf->vb.i); */
+       /* cx231xx_info("[%p/%d] wakeup\n", buf, buf->vb.i); */
 
        buf->vb.state = VIDEOBUF_DONE;
        buf->vb.field_count++;
@@ -618,7 +615,7 @@ static inline void get_next_vbi_buf(struct cx231xx_dmaqueue *dma_q,
        char *outp;
 
        if (list_empty(&dma_q->active)) {
-               cx231xx_err(DRIVER_NAME ": No active queue to serve\n");
+               cx231xx_err("No active queue to serve\n");
                dev->vbi_mode.bulk_ctl.buf = NULL;
                *buf = NULL;
                return;