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>

diff --git a/drivers/media/video/cx88/cx88-cards.c b/drivers/media/video/cx88/cx88-cards.c
index 6204a453c11ed991add20fcd74f22d0e0386477f..e73e8c96d5b96c7b4d5b0f1f89defc7a914f47ac 100644 (file)
--- a/drivers/media/video/cx88/cx88-cards.c
+++ b/drivers/media/video/cx88/cx88-cards.c
@@ -2094,7 +2094,7 @@ struct cx88_core *cx88_core_create(struct pci_dev *pci, int nr)
 
        memcpy(&core->board, &cx88_boards[core->boardnr], sizeof(core->board));
 
-       printk(KERN_INFO "CORE %s: subsystem: %04x:%04x, board: %s [card=%d,%s]\n",
+       printk(KERN_INFO "%s: subsystem: %04x:%04x, board: %s [card=%d,%s]\n",
                core->name,pci->subsystem_vendor,
                pci->subsystem_device, core->board.name,
                core->boardnr, card[core->nr] == core->boardnr ?
@@ -2105,9 +2105,8 @@ struct cx88_core *cx88_core_create(struct pci_dev *pci, int nr)
        if (radio[core->nr] != UNSET)
                core->board.radio_type = radio[core->nr];
 
-       printk(KERN_INFO "TV tuner %d at 0x%02x, Radio tuner %d at 0x%02x\n",
-               core->board.tuner_type, core->board.tuner_addr<<1,
-               core->board.radio_type, core->board.radio_addr<<1);
+       printk(KERN_INFO "%s: TV tuner type %d, Radio tuner type %d\n",
+              core->name, core->board.tuner_type, core->board.radio_type);
 
        /* init hardware */
        cx88_reset(core);

diff --git a/drivers/media/video/cx88/cx88-dvb.c b/drivers/media/video/cx88/cx88-dvb.c
index d98b90721019cd6045fb32870c48f70f39640cbd..00d0e43785a0d8544d1e9a21cee76f4fe70fa66d 100644 (file)
--- 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);

diff --git a/drivers/media/video/cx88/cx88-mpeg.c b/drivers/media/video/cx88/cx88-mpeg.c
index 1df245ace2d0af7162c79d3cccf99c1198b5db82..5da47e251e663f26762728f2051e77070ea31190 100644 (file)
--- 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);

diff --git a/drivers/media/video/cx88/cx88-video.c b/drivers/media/video/cx88/cx88-video.c
index b0dd4313a841a839078c72b60faf8818a623447d..e158ea2454af86ac16157a85e0bb342774a331d0 100644 (file)
--- a/drivers/media/video/cx88/cx88-video.c
+++ b/drivers/media/video/cx88/cx88-video.c
@@ -1818,7 +1818,7 @@ static int __devinit cx8800_initdev(struct pci_dev *pci_dev,
        err = request_irq(pci_dev->irq, cx8800_irq,
                          IRQF_SHARED | IRQF_DISABLED, core->name, dev);
        if (err < 0) {
-               printk(KERN_ERR "%s: can't get IRQ %d\n",
+               printk(KERN_ERR "%s/0: can't get IRQ %d\n",
                       core->name,pci_dev->irq);
                goto fail_core;
        }
@@ -1837,7 +1837,7 @@ static int __devinit cx8800_initdev(struct pci_dev *pci_dev,
        err = video_register_device(dev->video_dev,VFL_TYPE_GRABBER,
                                    video_nr[core->nr]);
        if (err < 0) {
-               printk(KERN_INFO "%s: can't register video device\n",
+               printk(KERN_ERR "%s/0: can't register video device\n",
                       core->name);
                goto fail_unreg;
        }
@@ -1848,7 +1848,7 @@ static int __devinit cx8800_initdev(struct pci_dev *pci_dev,
        err = video_register_device(dev->vbi_dev,VFL_TYPE_VBI,
                                    vbi_nr[core->nr]);
        if (err < 0) {
-               printk(KERN_INFO "%s/0: can't register vbi device\n",
+               printk(KERN_ERR "%s/0: can't register vbi device\n",
                       core->name);
                goto fail_unreg;
        }
@@ -1861,7 +1861,7 @@ static int __devinit cx8800_initdev(struct pci_dev *pci_dev,
                err = video_register_device(dev->radio_dev,VFL_TYPE_RADIO,
                                            radio_nr[core->nr]);
                if (err < 0) {
-                       printk(KERN_INFO "%s/0: can't register radio device\n",
+                       printk(KERN_ERR "%s/0: can't register radio device\n",
                               core->name);
                        goto fail_unreg;
                }
@@ -1885,8 +1885,8 @@ static int __devinit cx8800_initdev(struct pci_dev *pci_dev,
                core->kthread = kthread_run(cx88_audio_thread, core, "cx88 tvaudio");
                if (IS_ERR(core->kthread)) {
                        err = PTR_ERR(core->kthread);
-                       printk(KERN_ERR "Failed to create cx88 audio thread, err=%d\n",
-                              err);
+                       printk(KERN_ERR "%s/0: failed to create cx88 audio thread, err=%d\n",
+                              core->name, err);
                }
        }
        return 0;
@@ -1937,12 +1937,12 @@ static int cx8800_suspend(struct pci_dev *pci_dev, pm_message_t state)
        /* stop video+vbi capture */
        spin_lock(&dev->slock);
        if (!list_empty(&dev->vidq.active)) {
-               printk("%s: suspend video\n", core->name);
+               printk("%s/0: suspend video\n", core->name);
                stop_video_dma(dev);
                del_timer(&dev->vidq.timeout);
        }
        if (!list_empty(&dev->vbiq.active)) {
-               printk("%s: suspend vbi\n", core->name);
+               printk("%s/0: suspend vbi\n", core->name);
                cx8800_stop_vbi_dma(dev);
                del_timer(&dev->vbiq.timeout);
        }
@@ -1968,8 +1968,8 @@ static int cx8800_resume(struct pci_dev *pci_dev)
        if (dev->state.disabled) {
                err=pci_enable_device(pci_dev);
                if (err) {
-                       printk(KERN_ERR "%s: can't enable device\n",
-                                                      core->name);
+                       printk(KERN_ERR "%s/0: can't enable device\n",
+                              core->name);
                        return err;
                }
 
@@ -1977,9 +1977,7 @@ static int cx8800_resume(struct pci_dev *pci_dev)
        }
        err= pci_set_power_state(pci_dev, PCI_D0);
        if (err) {
-               printk(KERN_ERR "%s: can't enable device\n",
-                                      core->name);
-
+               printk(KERN_ERR "%s/0: can't set power state\n", core->name);
                pci_disable_device(pci_dev);
                dev->state.disabled = 1;
 
@@ -1993,11 +1991,11 @@ static int cx8800_resume(struct pci_dev *pci_dev)
        /* restart video+vbi capture */
        spin_lock(&dev->slock);
        if (!list_empty(&dev->vidq.active)) {
-               printk("%s: resume video\n", core->name);
+               printk("%s/0: resume video\n", core->name);
                restart_video_queue(dev,&dev->vidq);
        }
        if (!list_empty(&dev->vbiq.active)) {
-               printk("%s: resume vbi\n", core->name);
+               printk("%s/0: resume vbi\n", core->name);
                cx8800_restart_vbi_queue(dev,&dev->vbiq);
        }
        spin_unlock(&dev->slock);
@@ -2033,7 +2031,7 @@ static struct pci_driver cx8800_pci_driver = {
 
 static int cx8800_init(void)
 {
-       printk(KERN_INFO "cx2388x v4l2 driver version %d.%d.%d loaded\n",
+       printk(KERN_INFO "cx88/0: cx2388x v4l2 driver version %d.%d.%d loaded\n",
               (CX88_VERSION_CODE >> 16) & 0xff,
               (CX88_VERSION_CODE >>  8) & 0xff,
               CX88_VERSION_CODE & 0xff);