aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pnp/resource.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/pnp/resource.c')
-rw-r--r--drivers/pnp/resource.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/pnp/resource.c b/drivers/pnp/resource.c
index e0206da6851a..5ef463d89f16 100644
--- a/drivers/pnp/resource.c
+++ b/drivers/pnp/resource.c
@@ -294,7 +294,7 @@ static int pci_dev_uses_irq(struct pnp_dev *pnp, struct pci_dev *pci,
294 u8 progif; 294 u8 progif;
295 295
296 if (pci->irq == irq) { 296 if (pci->irq == irq) {
297 dev_dbg(&pnp->dev, " device %s using irq %d\n", 297 pnp_dbg(&pnp->dev, " device %s using irq %d\n",
298 pci_name(pci), irq); 298 pci_name(pci), irq);
299 return 1; 299 return 1;
300 } 300 }
@@ -316,7 +316,7 @@ static int pci_dev_uses_irq(struct pnp_dev *pnp, struct pci_dev *pci,
316 if ((progif & 0x5) != 0x5) 316 if ((progif & 0x5) != 0x5)
317 if (pci_get_legacy_ide_irq(pci, 0) == irq || 317 if (pci_get_legacy_ide_irq(pci, 0) == irq ||
318 pci_get_legacy_ide_irq(pci, 1) == irq) { 318 pci_get_legacy_ide_irq(pci, 1) == irq) {
319 dev_dbg(&pnp->dev, " legacy IDE device %s " 319 pnp_dbg(&pnp->dev, " legacy IDE device %s "
320 "using irq %d\n", pci_name(pci), irq); 320 "using irq %d\n", pci_name(pci), irq);
321 return 1; 321 return 1;
322 } 322 }
@@ -517,7 +517,7 @@ struct pnp_resource *pnp_add_irq_resource(struct pnp_dev *dev, int irq,
517 res->start = irq; 517 res->start = irq;
518 res->end = irq; 518 res->end = irq;
519 519
520 dev_dbg(&dev->dev, " add irq %d flags %#x\n", irq, flags); 520 pnp_dbg(&dev->dev, " add irq %d flags %#x\n", irq, flags);
521 return pnp_res; 521 return pnp_res;
522} 522}
523 523
@@ -538,7 +538,7 @@ struct pnp_resource *pnp_add_dma_resource(struct pnp_dev *dev, int dma,
538 res->start = dma; 538 res->start = dma;
539 res->end = dma; 539 res->end = dma;
540 540
541 dev_dbg(&dev->dev, " add dma %d flags %#x\n", dma, flags); 541 pnp_dbg(&dev->dev, " add dma %d flags %#x\n", dma, flags);
542 return pnp_res; 542 return pnp_res;
543} 543}
544 544
@@ -562,7 +562,7 @@ struct pnp_resource *pnp_add_io_resource(struct pnp_dev *dev,
562 res->start = start; 562 res->start = start;
563 res->end = end; 563 res->end = end;
564 564
565 dev_dbg(&dev->dev, " add io %#llx-%#llx flags %#x\n", 565 pnp_dbg(&dev->dev, " add io %#llx-%#llx flags %#x\n",
566 (unsigned long long) start, (unsigned long long) end, flags); 566 (unsigned long long) start, (unsigned long long) end, flags);
567 return pnp_res; 567 return pnp_res;
568} 568}
@@ -587,7 +587,7 @@ struct pnp_resource *pnp_add_mem_resource(struct pnp_dev *dev,
587 res->start = start; 587 res->start = start;
588 res->end = end; 588 res->end = end;
589 589
590 dev_dbg(&dev->dev, " add mem %#llx-%#llx flags %#x\n", 590 pnp_dbg(&dev->dev, " add mem %#llx-%#llx flags %#x\n",
591 (unsigned long long) start, (unsigned long long) end, flags); 591 (unsigned long long) start, (unsigned long long) end, flags);
592 return pnp_res; 592 return pnp_res;
593} 593}