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, 25 insertions, 17 deletions

diff --git a/drivers/media/video/cx88/cx88-mpeg.c b/drivers/media/video/cx88/cx88-mpeg.c
index 1df245ace2d0..5da47e251e66 100644
--- a/drivers/media/video/cx88/cx88-mpeg.c
+++ b/drivers/media/video/cx88/cx88-mpeg.c
@@ -675,22 +675,24 @@ int cx8802_register_driver(struct cx8802_driver *drv)
         struct list_head *list;
         int err = 0, i = 0;
 
-        printk(KERN_INFO "%s() ->registering driver type=%s access=%s\n", __FUNCTION__ ,
-                drv->type_id == CX88_MPEG_DVB ? "dvb" : "blackbird",
-                drv->hw_access == CX8802_DRVCTL_SHARED ? "shared" : "exclusive");
+        printk(KERN_INFO
+               "cx88/2: registering cx8802 driver, type: %s access: %s\n",
+               drv->type_id == CX88_MPEG_DVB ? "dvb" : "blackbird",
+               drv->hw_access == CX8802_DRVCTL_SHARED ? "shared" : "exclusive");
 
         if ((err = cx8802_check_driver(drv)) != 0) {
-                printk(KERN_INFO "%s() cx8802_driver is invalid\n", __FUNCTION__ );
+                printk(KERN_ERR "cx88/2: cx8802_driver is invalid\n");
                 return err;
         }
 
         list_for_each(list,&cx8802_devlist) {
                 h = list_entry(list, struct cx8802_dev, devlist);
 
-                printk(KERN_INFO "CORE %s: subsystem: %04x:%04x, board: %s [card=%d]\n",
-                        h->core->name,h->pci->subsystem_vendor,
-                        h->pci->subsystem_device,h->core->board.name,
-                        h->core->boardnr);
+                printk(KERN_INFO
+                       "%s/2: subsystem: %04x:%04x, board: %s [card=%d]\n",
+                       h->core->name, h->pci->subsystem_vendor,
+                       h->pci->subsystem_device, h->core->board.name,
+                       h->core->boardnr);
 
                 /* Bring up a new struct for each driver instance */
                 driver = kzalloc(sizeof(*drv),GFP_KERNEL);
@@ -712,7 +714,9 @@ int cx8802_register_driver(struct cx8802_driver *drv)
                         list_add_tail(&driver->devlist,&h->drvlist.devlist);
                         mutex_unlock(&drv->core->lock);
                 } else {
-                        printk(KERN_ERR "%s() ->probe failed err = %d\n", __FUNCTION__, err);
+                        printk(KERN_ERR
+                               "%s/2: cx8802 probe failed, err = %d\n",
+                               h->core->name, err);
                 }
 
         }
@@ -732,17 +736,20 @@ int cx8802_unregister_driver(struct cx8802_driver *drv)
         struct list_head *list2, *q;
         int err = 0, i = 0;
 
-        printk(KERN_INFO "%s() ->unregistering driver type=%s\n", __FUNCTION__ ,
-                drv->type_id == CX88_MPEG_DVB ? "dvb" : "blackbird");
+        printk(KERN_INFO
+               "cx88/2: unregistering cx8802 driver, type: %s access: %s\n",
+               drv->type_id == CX88_MPEG_DVB ? "dvb" : "blackbird",
+               drv->hw_access == CX8802_DRVCTL_SHARED ? "shared" : "exclusive");
 
         list_for_each(list,&cx8802_devlist) {
                 i++;
                 h = list_entry(list, struct cx8802_dev, devlist);
 
-                printk(KERN_INFO "CORE %s: subsystem: %04x:%04x, board: %s [card=%d]\n",
-                        h->core->name,h->pci->subsystem_vendor,
-                        h->pci->subsystem_device,h->core->board.name,
-                        h->core->boardnr);
+                printk(KERN_INFO
+                       "%s/2: subsystem: %04x:%04x, board: %s [card=%d]\n",
+                       h->core->name, h->pci->subsystem_vendor,
+                       h->pci->subsystem_device, h->core->board.name,
+                       h->core->boardnr);
 
                 list_for_each_safe(list2, q, &h->drvlist.devlist) {
                         d = list_entry(list2, struct cx8802_driver, devlist);
@@ -757,7 +764,8 @@ int cx8802_unregister_driver(struct cx8802_driver *drv)
                                 list_del(list2);
                                 mutex_unlock(&drv->core->lock);
                         } else
-                                printk(KERN_ERR "%s() ->remove failed err = %d\n", __FUNCTION__, err);
+                                printk(KERN_ERR "%s/2: cx8802 driver remove "
+                                       "failed (%d)\n", h->core->name, err);
 
                 }
 
@@ -865,7 +873,7 @@ static struct pci_driver cx8802_pci_driver = {
 
 static int cx8802_init(void)
 {
-        printk(KERN_INFO "cx2388x cx88-mpeg Driver Manager version %d.%d.%d loaded\n",
+        printk(KERN_INFO "cx88/2: cx2388x MPEG-TS Driver Manager version %d.%d.%d loaded\n",
                (CX88_VERSION_CODE >> 16) & 0xff,
                (CX88_VERSION_CODE >>  8) & 0xff,
                CX88_VERSION_CODE & 0xff);