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>

diff --git a/drivers/media/dvb/bt8xx/dvb-bt8xx.c b/drivers/media/dvb/bt8xx/dvb-bt8xx.c
index 6afbfbbef0ce304885826365df8a40735c9a5ee7..48762a2b9e42e340c63f94534a171052e5b7f103 100644 (file)
--- 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 0777e8f9544ba66d63402a7f7bc5facd2a73c08c..3b641804f6cb0bec069a3c7c7b72766a05864107 100644 (file)
--- 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 b7d1f2f18d3a45e1939b61e69ea1dd9ff6448cc9..839c94101b4e923297b4dcf25f6bf2938bad3dc4 100644 (file)
--- 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 060e7c7853266f9a2ae6fd514748a6e10b67182c..38dd5cf1aed2e31d622637e3100298d85d9b8850 100644 (file)
--- 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 aa5ed4ef19f24cfcf68eb8282cb369317c9478d3..bbd234fe11c154dfc536e88c7fc1e32f083815fc 100644 (file)
--- 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 f0068996ac07eb907e4042ed01be74e5c0bdd462..851e523fbffc9c404eff62550fd2feb9f112543d 100644 (file)
--- 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 e6c9cd2e3b94514784a4ee423553e2f94987ca35..66ab0c6e9783da4f8a99cca3699c3a32dd51ec58 100644 (file)
--- 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 de5829b863fd26edd62923cf6168bf9e883bb6ef..ab33fec8a19fbcef75855786f5dadc44c2bf721f 100644 (file)
--- 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 bd18afebbf860565292b212bde83361486761d8e..3419de9a5a4ef0107655b830ba6217bed9016140 100644 (file)
--- 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 4afc7ea07e86ec16866862c4c4e118367dd8116a..6b04930d12787862dcb5d60bec96f8eaeeac4b4f 100644 (file)
--- 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);