[media] cx23885: use KERN_CONT where needed

Some continuation messages are not using KERN_CONT.

Since commit 563873318d32 ("Merge branch 'printk-cleanups'"),
this won't work as expected anymore. So, let's add KERN_CONT
to those lines.

While here, add missing log level annotations.

Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>

diff --git a/drivers/media/pci/cx23885/cx23885-core.c b/drivers/media/pci/cx23885/cx23885-core.c
index 5020a60..0d97da3 100644 (file)
--- a/drivers/media/pci/cx23885/cx23885-core.c
+++ b/drivers/media/pci/cx23885/cx23885-core.c
@@ -407,12 +407,12 @@ static int cx23885_risc_decode(u32 risc)
        };
        int i;
 
-       printk("0x%08x [ %s", risc,
+       printk(KERN_DEBUG "0x%08x [ %s", risc,
               instr[risc >> 28] ? instr[risc >> 28] : "INVALID");
        for (i = ARRAY_SIZE(bits) - 1; i >= 0; i--)
                if (risc & (1 << (i + 12)))
-                       printk(" %s", bits[i]);
-       printk(" count=%d ]\n", risc & 0xfff);
+                       printk(KERN_CONT " %s", bits[i]);
+       printk(KERN_CONT " count=%d ]\n", risc & 0xfff);
        return incr[risc >> 28] ? incr[risc >> 28] : 1;
 }
 
@@ -2003,7 +2003,7 @@ static int cx23885_initdev(struct pci_dev *pci_dev,
        pci_set_master(pci_dev);
        err = pci_set_dma_mask(pci_dev, 0xffffffff);
        if (err) {
-               printk("%s/0: Oops: no 32bit PCI DMA ???\n", dev->name);
+               printk(KERN_ERR "%s/0: Oops: no 32bit PCI DMA ???\n", dev->name);
                goto fail_ctrl;
        }
 

diff --git a/drivers/media/pci/cx23885/cx23885-i2c.c b/drivers/media/pci/cx23885/cx23885-i2c.c
index 6159122..19faf9a 100644 (file)
--- a/drivers/media/pci/cx23885/cx23885-i2c.c
+++ b/drivers/media/pci/cx23885/cx23885-i2c.c
@@ -119,9 +119,9 @@ static int i2c_sendbytes(struct i2c_adapter *i2c_adap,
        if (!i2c_wait_done(i2c_adap))
                goto eio;
        if (i2c_debug) {
-               printk(" <W %02x %02x", msg->addr << 1, msg->buf[0]);
+               printk(KERN_DEBUG " <W %02x %02x", msg->addr << 1, msg->buf[0]);
                if (!(ctrl & I2C_NOSTOP))
-                       printk(" >\n");
+                       printk(KERN_CONT " >\n");
        }
 
        for (cnt = 1; cnt < msg->len; cnt++) {
@@ -141,9 +141,9 @@ static int i2c_sendbytes(struct i2c_adapter *i2c_adap,
                if (!i2c_wait_done(i2c_adap))
                        goto eio;
                if (i2c_debug) {
-                       dprintk(1, " %02x", msg->buf[cnt]);
+                       printk(KERN_CONT " %02x", msg->buf[cnt]);
                        if (!(ctrl & I2C_NOSTOP))
-                               dprintk(1, " >\n");
+                               printk(KERN_CONT " >\n");
                }
        }
        return msg->len;