V4L/DVB: follow lspci device/vendor style

Use "[%04x:%04x]" for PCI vendor/device IDs to follow the format
used by lspci(8).

Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

10 files changed, 12 insertions, 12 deletions

diff --git a/drivers/media/dvb/bt8xx/dvb-bt8xx.c b/drivers/media/dvb/bt8xx/dvb-bt8xx.c
index 6afbfbbef0ce..48762a2b9e42 100644
--- a/drivers/media/dvb/bt8xx/dvb-bt8xx.c
+++ b/drivers/media/dvb/bt8xx/dvb-bt8xx.c
@@ -702,7 +702,7 @@ static void frontend_init(struct dvb_bt8xx_card *card, u32 type)
         }
 
         if (card->fe == NULL)
-                printk("dvb-bt8xx: A frontend driver was not found for device %04x/%04x subsystem %04x/%04x\n",
+                printk("dvb-bt8xx: A frontend driver was not found for device [%04x:%04x] subsystem [%04x:%04x]\n",
                        card->bt->dev->vendor,
                        card->bt->dev->device,
                        card->bt->dev->subsystem_vendor,
diff --git a/drivers/media/dvb/ttpci/av7110.c b/drivers/media/dvb/ttpci/av7110.c
index 0777e8f9544b..3b641804f6cb 100644
--- a/drivers/media/dvb/ttpci/av7110.c
+++ b/drivers/media/dvb/ttpci/av7110.c
@@ -2256,7 +2256,7 @@ static int frontend_init(struct av7110 *av7110)
         if (!av7110->fe) {
                 /* FIXME: propagate the failure code from the lower layers */
                 ret = -ENOMEM;
-                printk("dvb-ttpci: A frontend driver was not found for device %04x/%04x subsystem %04x/%04x\n",
+                printk("dvb-ttpci: A frontend driver was not found for device [%04x:%04x] subsystem [%04x:%04x]\n",
                        av7110->dev->pci->vendor,
                        av7110->dev->pci->device,
                        av7110->dev->pci->subsystem_vendor,
diff --git a/drivers/media/dvb/ttpci/budget-av.c b/drivers/media/dvb/ttpci/budget-av.c
index b7d1f2f18d3a..839c94101b4e 100644
--- a/drivers/media/dvb/ttpci/budget-av.c
+++ b/drivers/media/dvb/ttpci/budget-av.c
@@ -1049,7 +1049,7 @@ static void frontend_init(struct budget_av *budget_av)
 
         if (fe == NULL) {
                 printk(KERN_ERR "budget-av: A frontend driver was not found "
-                                "for device %04x/%04x subsystem %04x/%04x\n",
+                                "for device [%04x:%04x] subsystem [%04x:%04x]\n",
                        saa->pci->vendor,
                        saa->pci->device,
                        saa->pci->subsystem_vendor,
diff --git a/drivers/media/dvb/ttpci/budget-ci.c b/drivers/media/dvb/ttpci/budget-ci.c
index 060e7c785326..38dd5cf1aed2 100644
--- a/drivers/media/dvb/ttpci/budget-ci.c
+++ b/drivers/media/dvb/ttpci/budget-ci.c
@@ -1153,7 +1153,7 @@ static void frontend_init(struct budget_ci *budget_ci)
         }
 
         if (budget_ci->budget.dvb_frontend == NULL) {
-                printk("budget-ci: A frontend driver was not found for device %04x/%04x subsystem %04x/%04x\n",
+                printk("budget-ci: A frontend driver was not found for device [%04x:%04x] subsystem [%04x:%04x]\n",
                        budget_ci->budget.dev->pci->vendor,
                        budget_ci->budget.dev->pci->device,
                        budget_ci->budget.dev->pci->subsystem_vendor,
diff --git a/drivers/media/dvb/ttpci/budget-patch.c b/drivers/media/dvb/ttpci/budget-patch.c
index aa5ed4ef19f2..bbd234fe11c1 100644
--- a/drivers/media/dvb/ttpci/budget-patch.c
+++ b/drivers/media/dvb/ttpci/budget-patch.c
@@ -360,7 +360,7 @@ static void frontend_init(struct budget_patch* budget)
         }
 
         if (budget->dvb_frontend == NULL) {
-                printk("dvb-ttpci: A frontend driver was not found for device %04x/%04x subsystem %04x/%04x\n",
+                printk("dvb-ttpci: A frontend driver was not found for device [%04x:%04x] subsystem [%04x:%04x]\n",
                        budget->dev->pci->vendor,
                        budget->dev->pci->device,
                        budget->dev->pci->subsystem_vendor,
diff --git a/drivers/media/dvb/ttpci/budget.c b/drivers/media/dvb/ttpci/budget.c
index f0068996ac07..851e523fbffc 100644
--- a/drivers/media/dvb/ttpci/budget.c
+++ b/drivers/media/dvb/ttpci/budget.c
@@ -550,7 +550,7 @@ static void frontend_init(struct budget *budget)
         }
 
         if (budget->dvb_frontend == NULL) {
-                printk("budget: A frontend driver was not found for device %04x/%04x subsystem %04x/%04x\n",
+                printk("budget: A frontend driver was not found for device [%04x:%04x] subsystem [%04x:%04x]\n",
                        budget->dev->pci->vendor,
                        budget->dev->pci->device,
                        budget->dev->pci->subsystem_vendor,
diff --git a/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c b/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
index e6c9cd2e3b94..66ab0c6e9783 100644
--- a/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
+++ b/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
@@ -1614,7 +1614,7 @@ static void frontend_init(struct ttusb* ttusb)
         }
 
         if (ttusb->fe == NULL) {
-                printk("dvb-ttusb-budget: A frontend driver was not found for device %04x/%04x\n",
+                printk("dvb-ttusb-budget: A frontend driver was not found for device [%04x:%04x]\n",
                        le16_to_cpu(ttusb->dev->descriptor.idVendor),
                        le16_to_cpu(ttusb->dev->descriptor.idProduct));
         } else {
diff --git a/drivers/media/dvb/ttusb-dec/ttusb_dec.c b/drivers/media/dvb/ttusb-dec/ttusb_dec.c
index de5829b863fd..ab33fec8a19f 100644
--- a/drivers/media/dvb/ttusb-dec/ttusb_dec.c
+++ b/drivers/media/dvb/ttusb-dec/ttusb_dec.c
@@ -1665,7 +1665,7 @@ static int ttusb_dec_probe(struct usb_interface *intf,
         }
 
         if (dec->fe == NULL) {
-                printk("dvb-ttusb-dec: A frontend driver was not found for device %04x/%04x\n",
+                printk("dvb-ttusb-dec: A frontend driver was not found for device [%04x:%04x]\n",
                        le16_to_cpu(dec->udev->descriptor.idVendor),
                        le16_to_cpu(dec->udev->descriptor.idProduct));
         } else {
diff --git a/drivers/media/video/cx18/cx18-driver.c b/drivers/media/video/cx18/cx18-driver.c
index bd18afebbf86..3419de9a5a4e 100644
--- a/drivers/media/video/cx18/cx18-driver.c
+++ b/drivers/media/video/cx18/cx18-driver.c
@@ -395,9 +395,9 @@ done:
 
         if (cx->card == NULL) {
                 cx->card = cx18_get_card(CX18_CARD_HVR_1600_ESMT);
-                CX18_ERR("Unknown card: vendor/device: %04x/%04x\n",
+                CX18_ERR("Unknown card: vendor/device: [%04x:%04x]\n",
                      cx->dev->vendor, cx->dev->device);
-                CX18_ERR("              subsystem vendor/device: %04x/%04x\n",
+                CX18_ERR("              subsystem vendor/device: [%04x:%04x]\n",
                      cx->dev->subsystem_vendor, cx->dev->subsystem_device);
                 CX18_ERR("Defaulting to %s card\n", cx->card->name);
                 CX18_ERR("Please mail the vendor/device and subsystem vendor/device IDs and what kind of\n");
diff --git a/drivers/media/video/ivtv/ivtv-driver.c b/drivers/media/video/ivtv/ivtv-driver.c
index 4afc7ea07e86..6b04930d1278 100644
--- a/drivers/media/video/ivtv/ivtv-driver.c
+++ b/drivers/media/video/ivtv/ivtv-driver.c
@@ -655,9 +655,9 @@ done:
 
         if (itv->card == NULL) {
                 itv->card = ivtv_get_card(IVTV_CARD_PVR_150);
-                IVTV_ERR("Unknown card: vendor/device: %04x/%04x\n",
+                IVTV_ERR("Unknown card: vendor/device: [%04x:%04x]\n",
                      itv->dev->vendor, itv->dev->device);
-                IVTV_ERR("              subsystem vendor/device: %04x/%04x\n",
+                IVTV_ERR("              subsystem vendor/device: [%04x:%04x]\n",
                      itv->dev->subsystem_vendor, itv->dev->subsystem_device);
                 IVTV_ERR("              %s based\n", chipname);
                 IVTV_ERR("Defaulting to %s card\n", itv->card->name);