V4L/DVB (6023): cx88: Clean up some ugly and inconsistent printk()s

Get rid of the "CORE" prefix from cx88 printks.  It was only used a few times,
and it makes it look like they're coming from the kernel core or something.

Fix the message, "TV tuner 60 at 0x1fe, Radio tuner -1 at 0x1fe", by adding a
"cx88[0]" prefix to be consistent, and to keep people who grep their dmesg
output for cx88 from missing it.  Get rid of the addresses, which are always
wrong.  The addresses are always set to -1, but because it's an unsigned 8-bit
value, the left shift converts it to the nonsense address 0x1fe.

In the cx8802 driver, some cut and pasted code prefixed lines with "CORE
cx88[0]:", which has been changed to "cx88[0]/2:" like the other printks from
the cx8802 driver.

Also fix some ugly printks in the cx8802 driver that used __FUNCTION__ for
KERN_INFO and KERN_ERR messages.

The changed printks in cx88-mpeg.c also needed lots of whitespace and
80-column fixes.

A bunch of misc changes in cx88-dvb.c and cx88-video.c to add message levels
or a consistent "cx88[?]/2" or "cx88[?]/0" prefix.

Signed-off-by: Trent Piepho <xyzzy@speakeasy.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

1 files changed, 7 insertions, 6 deletions

diff --git a/drivers/media/video/cx88/cx88-dvb.c b/drivers/media/video/cx88/cx88-dvb.c
index d98b9072101..00d0e43785a 100644
--- a/drivers/media/video/cx88/cx88-dvb.c
+++ b/drivers/media/video/cx88/cx88-dvb.c
@@ -482,7 +482,7 @@ static int dvb_register(struct cx8802_dev *dev)
                                    &dev->core->i2c_adap, DVB_PLL_FMD1216ME);
                 }
 #else
-                printk("%s: built without vp3054 support\n", dev->core->name);
+                printk(KERN_ERR "%s/2: built without vp3054 support\n", dev->core->name);
 #endif
                 break;
         case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_HYBRID:
@@ -625,12 +625,12 @@ static int dvb_register(struct cx8802_dev *dev)
                 }
                 break;
         default:
-                printk("%s: The frontend of your DVB/ATSC card isn't supported yet\n",
+                printk(KERN_ERR "%s/2: The frontend of your DVB/ATSC card isn't supported yet\n",
                        dev->core->name);
                 break;
         }
         if (NULL == dev->dvb.frontend) {
-                printk("%s: frontend initialization failed\n",dev->core->name);
+                printk(KERN_ERR "%s/2: frontend initialization failed\n", dev->core->name);
                 return -1;
         }
 
@@ -709,7 +709,7 @@ static int cx8802_dvb_probe(struct cx8802_driver *drv)
                 goto fail_core;
 
         /* dvb stuff */
-        printk("%s/2: cx2388x based dvb card\n", core->name);
+        printk(KERN_INFO "%s/2: cx2388x based DVB/ATSC card\n", core->name);
         videobuf_queue_init(&dev->dvb.dvbq, &dvb_qops,
                             dev->pci, &dev->slock,
                             V4L2_BUF_TYPE_VIDEO_CAPTURE,
@@ -718,7 +718,8 @@ static int cx8802_dvb_probe(struct cx8802_driver *drv)
                             dev);
         err = dvb_register(dev);
         if (err != 0)
-                printk("%s dvb_register failed err = %d\n", __FUNCTION__, err);
+                printk(KERN_ERR "%s/2: dvb_register failed (err = %d)\n",
+                       core->name, err);
 
  fail_core:
         return err;
@@ -747,7 +748,7 @@ static struct cx8802_driver cx8802_dvb_driver = {
 
 static int dvb_init(void)
 {
-        printk(KERN_INFO "cx2388x dvb driver version %d.%d.%d loaded\n",
+        printk(KERN_INFO "cx88/2: cx2388x dvb driver version %d.%d.%d loaded\n",
                (CX88_VERSION_CODE >> 16) & 0xff,
                (CX88_VERSION_CODE >>  8) & 0xff,
                CX88_VERSION_CODE & 0xff);