Commit 29e66a6c authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Mauro Carvalho Chehab

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: default avatarBjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 96f1e404
...@@ -702,7 +702,7 @@ static void frontend_init(struct dvb_bt8xx_card *card, u32 type) ...@@ -702,7 +702,7 @@ static void frontend_init(struct dvb_bt8xx_card *card, u32 type)
} }
if (card->fe == NULL) 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->vendor,
card->bt->dev->device, card->bt->dev->device,
card->bt->dev->subsystem_vendor, card->bt->dev->subsystem_vendor,
......
...@@ -2256,7 +2256,7 @@ static int frontend_init(struct av7110 *av7110) ...@@ -2256,7 +2256,7 @@ static int frontend_init(struct av7110 *av7110)
if (!av7110->fe) { if (!av7110->fe) {
/* FIXME: propagate the failure code from the lower layers */ /* FIXME: propagate the failure code from the lower layers */
ret = -ENOMEM; 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->vendor,
av7110->dev->pci->device, av7110->dev->pci->device,
av7110->dev->pci->subsystem_vendor, av7110->dev->pci->subsystem_vendor,
......
...@@ -1049,7 +1049,7 @@ static void frontend_init(struct budget_av *budget_av) ...@@ -1049,7 +1049,7 @@ static void frontend_init(struct budget_av *budget_av)
if (fe == NULL) { if (fe == NULL) {
printk(KERN_ERR "budget-av: A frontend driver was not found " 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->vendor,
saa->pci->device, saa->pci->device,
saa->pci->subsystem_vendor, saa->pci->subsystem_vendor,
......
...@@ -1153,7 +1153,7 @@ static void frontend_init(struct budget_ci *budget_ci) ...@@ -1153,7 +1153,7 @@ static void frontend_init(struct budget_ci *budget_ci)
} }
if (budget_ci->budget.dvb_frontend == NULL) { 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->vendor,
budget_ci->budget.dev->pci->device, budget_ci->budget.dev->pci->device,
budget_ci->budget.dev->pci->subsystem_vendor, budget_ci->budget.dev->pci->subsystem_vendor,
......
...@@ -360,7 +360,7 @@ static void frontend_init(struct budget_patch* budget) ...@@ -360,7 +360,7 @@ static void frontend_init(struct budget_patch* budget)
} }
if (budget->dvb_frontend == NULL) { 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->vendor,
budget->dev->pci->device, budget->dev->pci->device,
budget->dev->pci->subsystem_vendor, budget->dev->pci->subsystem_vendor,
......
...@@ -550,7 +550,7 @@ static void frontend_init(struct budget *budget) ...@@ -550,7 +550,7 @@ static void frontend_init(struct budget *budget)
} }
if (budget->dvb_frontend == NULL) { 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->vendor,
budget->dev->pci->device, budget->dev->pci->device,
budget->dev->pci->subsystem_vendor, budget->dev->pci->subsystem_vendor,
......
...@@ -1614,7 +1614,7 @@ static void frontend_init(struct ttusb* ttusb) ...@@ -1614,7 +1614,7 @@ static void frontend_init(struct ttusb* ttusb)
} }
if (ttusb->fe == NULL) { 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.idVendor),
le16_to_cpu(ttusb->dev->descriptor.idProduct)); le16_to_cpu(ttusb->dev->descriptor.idProduct));
} else { } else {
......
...@@ -1665,7 +1665,7 @@ static int ttusb_dec_probe(struct usb_interface *intf, ...@@ -1665,7 +1665,7 @@ static int ttusb_dec_probe(struct usb_interface *intf,
} }
if (dec->fe == NULL) { 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.idVendor),
le16_to_cpu(dec->udev->descriptor.idProduct)); le16_to_cpu(dec->udev->descriptor.idProduct));
} else { } else {
......
...@@ -395,9 +395,9 @@ static void cx18_process_options(struct cx18 *cx) ...@@ -395,9 +395,9 @@ static void cx18_process_options(struct cx18 *cx)
if (cx->card == NULL) { if (cx->card == NULL) {
cx->card = cx18_get_card(CX18_CARD_HVR_1600_ESMT); 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); 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); cx->dev->subsystem_vendor, cx->dev->subsystem_device);
CX18_ERR("Defaulting to %s card\n", cx->card->name); 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"); CX18_ERR("Please mail the vendor/device and subsystem vendor/device IDs and what kind of\n");
......
...@@ -655,9 +655,9 @@ static void ivtv_process_options(struct ivtv *itv) ...@@ -655,9 +655,9 @@ static void ivtv_process_options(struct ivtv *itv)
if (itv->card == NULL) { if (itv->card == NULL) {
itv->card = ivtv_get_card(IVTV_CARD_PVR_150); 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); 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); itv->dev->subsystem_vendor, itv->dev->subsystem_device);
IVTV_ERR(" %s based\n", chipname); IVTV_ERR(" %s based\n", chipname);
IVTV_ERR("Defaulting to %s card\n", itv->card->name); IVTV_ERR("Defaulting to %s card\n", itv->card->name);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment