aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjorn Helgaas <bjorn.helgaas@hp.com>2008-09-04 16:24:51 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-10-12 07:36:46 -0400
commit29e66a6ce84abe04bc809ddb35634752881dec79 (patch)
tree1ecb200aacc9c9f8eca3539ea645e53e0e34fcda
parent96f1e40431d4b0afc75474d7961f8dd98ef21112 (diff)
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>
-rw-r--r--drivers/media/dvb/bt8xx/dvb-bt8xx.c2
-rw-r--r--drivers/media/dvb/ttpci/av7110.c2
-rw-r--r--drivers/media/dvb/ttpci/budget-av.c2
-rw-r--r--drivers/media/dvb/ttpci/budget-ci.c2
-rw-r--r--drivers/media/dvb/ttpci/budget-patch.c2
-rw-r--r--drivers/media/dvb/ttpci/budget.c2
-rw-r--r--drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c2
-rw-r--r--drivers/media/dvb/ttusb-dec/ttusb_dec.c2
-rw-r--r--drivers/media/video/cx18/cx18-driver.c4
-rw-r--r--drivers/media/video/ivtv/ivtv-driver.c4
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)
702 } 702 }
703 703
704 if (card->fe == NULL) 704 if (card->fe == NULL)
705 printk("dvb-bt8xx: A frontend driver was not found for device %04x/%04x subsystem %04x/%04x\n", 705 printk("dvb-bt8xx: A frontend driver was not found for device [%04x:%04x] subsystem [%04x:%04x]\n",
706 card->bt->dev->vendor, 706 card->bt->dev->vendor,
707 card->bt->dev->device, 707 card->bt->dev->device,
708 card->bt->dev->subsystem_vendor, 708 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)
2256 if (!av7110->fe) { 2256 if (!av7110->fe) {
2257 /* FIXME: propagate the failure code from the lower layers */ 2257 /* FIXME: propagate the failure code from the lower layers */
2258 ret = -ENOMEM; 2258 ret = -ENOMEM;
2259 printk("dvb-ttpci: A frontend driver was not found for device %04x/%04x subsystem %04x/%04x\n", 2259 printk("dvb-ttpci: A frontend driver was not found for device [%04x:%04x] subsystem [%04x:%04x]\n",
2260 av7110->dev->pci->vendor, 2260 av7110->dev->pci->vendor,
2261 av7110->dev->pci->device, 2261 av7110->dev->pci->device,
2262 av7110->dev->pci->subsystem_vendor, 2262 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)
1049 1049
1050 if (fe == NULL) { 1050 if (fe == NULL) {
1051 printk(KERN_ERR "budget-av: A frontend driver was not found " 1051 printk(KERN_ERR "budget-av: A frontend driver was not found "
1052 "for device %04x/%04x subsystem %04x/%04x\n", 1052 "for device [%04x:%04x] subsystem [%04x:%04x]\n",
1053 saa->pci->vendor, 1053 saa->pci->vendor,
1054 saa->pci->device, 1054 saa->pci->device,
1055 saa->pci->subsystem_vendor, 1055 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)
1153 } 1153 }
1154 1154
1155 if (budget_ci->budget.dvb_frontend == NULL) { 1155 if (budget_ci->budget.dvb_frontend == NULL) {
1156 printk("budget-ci: A frontend driver was not found for device %04x/%04x subsystem %04x/%04x\n", 1156 printk("budget-ci: A frontend driver was not found for device [%04x:%04x] subsystem [%04x:%04x]\n",
1157 budget_ci->budget.dev->pci->vendor, 1157 budget_ci->budget.dev->pci->vendor,
1158 budget_ci->budget.dev->pci->device, 1158 budget_ci->budget.dev->pci->device,
1159 budget_ci->budget.dev->pci->subsystem_vendor, 1159 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)
360 } 360 }
361 361
362 if (budget->dvb_frontend == NULL) { 362 if (budget->dvb_frontend == NULL) {
363 printk("dvb-ttpci: A frontend driver was not found for device %04x/%04x subsystem %04x/%04x\n", 363 printk("dvb-ttpci: A frontend driver was not found for device [%04x:%04x] subsystem [%04x:%04x]\n",
364 budget->dev->pci->vendor, 364 budget->dev->pci->vendor,
365 budget->dev->pci->device, 365 budget->dev->pci->device,
366 budget->dev->pci->subsystem_vendor, 366 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)
550 } 550 }
551 551
552 if (budget->dvb_frontend == NULL) { 552 if (budget->dvb_frontend == NULL) {
553 printk("budget: A frontend driver was not found for device %04x/%04x subsystem %04x/%04x\n", 553 printk("budget: A frontend driver was not found for device [%04x:%04x] subsystem [%04x:%04x]\n",
554 budget->dev->pci->vendor, 554 budget->dev->pci->vendor,
555 budget->dev->pci->device, 555 budget->dev->pci->device,
556 budget->dev->pci->subsystem_vendor, 556 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)
1614 } 1614 }
1615 1615
1616 if (ttusb->fe == NULL) { 1616 if (ttusb->fe == NULL) {
1617 printk("dvb-ttusb-budget: A frontend driver was not found for device %04x/%04x\n", 1617 printk("dvb-ttusb-budget: A frontend driver was not found for device [%04x:%04x]\n",
1618 le16_to_cpu(ttusb->dev->descriptor.idVendor), 1618 le16_to_cpu(ttusb->dev->descriptor.idVendor),
1619 le16_to_cpu(ttusb->dev->descriptor.idProduct)); 1619 le16_to_cpu(ttusb->dev->descriptor.idProduct));
1620 } else { 1620 } 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,
1665 } 1665 }
1666 1666
1667 if (dec->fe == NULL) { 1667 if (dec->fe == NULL) {
1668 printk("dvb-ttusb-dec: A frontend driver was not found for device %04x/%04x\n", 1668 printk("dvb-ttusb-dec: A frontend driver was not found for device [%04x:%04x]\n",
1669 le16_to_cpu(dec->udev->descriptor.idVendor), 1669 le16_to_cpu(dec->udev->descriptor.idVendor),
1670 le16_to_cpu(dec->udev->descriptor.idProduct)); 1670 le16_to_cpu(dec->udev->descriptor.idProduct));
1671 } else { 1671 } 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:
395 395
396 if (cx->card == NULL) { 396 if (cx->card == NULL) {
397 cx->card = cx18_get_card(CX18_CARD_HVR_1600_ESMT); 397 cx->card = cx18_get_card(CX18_CARD_HVR_1600_ESMT);
398 CX18_ERR("Unknown card: vendor/device: %04x/%04x\n", 398 CX18_ERR("Unknown card: vendor/device: [%04x:%04x]\n",
399 cx->dev->vendor, cx->dev->device); 399 cx->dev->vendor, cx->dev->device);
400 CX18_ERR(" subsystem vendor/device: %04x/%04x\n", 400 CX18_ERR(" subsystem vendor/device: [%04x:%04x]\n",
401 cx->dev->subsystem_vendor, cx->dev->subsystem_device); 401 cx->dev->subsystem_vendor, cx->dev->subsystem_device);
402 CX18_ERR("Defaulting to %s card\n", cx->card->name); 402 CX18_ERR("Defaulting to %s card\n", cx->card->name);
403 CX18_ERR("Please mail the vendor/device and subsystem vendor/device IDs and what kind of\n"); 403 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:
655 655
656 if (itv->card == NULL) { 656 if (itv->card == NULL) {
657 itv->card = ivtv_get_card(IVTV_CARD_PVR_150); 657 itv->card = ivtv_get_card(IVTV_CARD_PVR_150);
658 IVTV_ERR("Unknown card: vendor/device: %04x/%04x\n", 658 IVTV_ERR("Unknown card: vendor/device: [%04x:%04x]\n",
659 itv->dev->vendor, itv->dev->device); 659 itv->dev->vendor, itv->dev->device);
660 IVTV_ERR(" subsystem vendor/device: %04x/%04x\n", 660 IVTV_ERR(" subsystem vendor/device: [%04x:%04x]\n",
661 itv->dev->subsystem_vendor, itv->dev->subsystem_device); 661 itv->dev->subsystem_vendor, itv->dev->subsystem_device);
662 IVTV_ERR(" %s based\n", chipname); 662 IVTV_ERR(" %s based\n", chipname);
663 IVTV_ERR("Defaulting to %s card\n", itv->card->name); 663 IVTV_ERR("Defaulting to %s card\n", itv->card->name);