diff options
author | Bjorn Helgaas <bjorn.helgaas@hp.com> | 2010-09-29 14:24:23 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2010-10-01 01:59:34 -0400 |
commit | c1f3f2819667a238585c65bba96c8b16af39a442 (patch) | |
tree | 18cdfe75cc3a77bed489f11bcf7407957c8bd2df /drivers/pnp | |
parent | 899611ee7d373e5eeda08e9a8632684e1ebbbf00 (diff) |
PNP: log PNP resources, as we do for PCI
ACPI devices are often involved in address space conflicts with PCI devices,
so I think it's worth logging the resources they use. Otherwise we have to
depend on lspnp or groping around in sysfs to find them.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/pnp')
-rw-r--r-- | drivers/pnp/core.c | 5 | ||||
-rw-r--r-- | drivers/pnp/resource.c | 10 |
2 files changed, 8 insertions, 7 deletions
diff --git a/drivers/pnp/core.c b/drivers/pnp/core.c index 88b3cde52596..53a8f33e649c 100644 --- a/drivers/pnp/core.c +++ b/drivers/pnp/core.c | |||
@@ -194,8 +194,9 @@ int pnp_add_device(struct pnp_dev *dev) | |||
194 | for (id = dev->id; id; id = id->next) | 194 | for (id = dev->id; id; id = id->next) |
195 | len += scnprintf(buf + len, sizeof(buf) - len, " %s", id->id); | 195 | len += scnprintf(buf + len, sizeof(buf) - len, " %s", id->id); |
196 | 196 | ||
197 | pnp_dbg(&dev->dev, "%s device, IDs%s (%s)\n", | 197 | dev_printk(KERN_DEBUG, &dev->dev, "%s device, IDs%s (%s)\n", |
198 | dev->protocol->name, buf, dev->active ? "active" : "disabled"); | 198 | dev->protocol->name, buf, |
199 | dev->active ? "active" : "disabled"); | ||
199 | return 0; | 200 | return 0; |
200 | } | 201 | } |
201 | 202 | ||
diff --git a/drivers/pnp/resource.c b/drivers/pnp/resource.c index e3446ab8b563..a925e6b63d72 100644 --- a/drivers/pnp/resource.c +++ b/drivers/pnp/resource.c | |||
@@ -523,7 +523,7 @@ struct pnp_resource *pnp_add_irq_resource(struct pnp_dev *dev, int irq, | |||
523 | res->start = irq; | 523 | res->start = irq; |
524 | res->end = irq; | 524 | res->end = irq; |
525 | 525 | ||
526 | pnp_dbg(&dev->dev, " add %pr\n", res); | 526 | dev_printk(KERN_DEBUG, &dev->dev, "%pR\n", res); |
527 | return pnp_res; | 527 | return pnp_res; |
528 | } | 528 | } |
529 | 529 | ||
@@ -544,7 +544,7 @@ struct pnp_resource *pnp_add_dma_resource(struct pnp_dev *dev, int dma, | |||
544 | res->start = dma; | 544 | res->start = dma; |
545 | res->end = dma; | 545 | res->end = dma; |
546 | 546 | ||
547 | pnp_dbg(&dev->dev, " add %pr\n", res); | 547 | dev_printk(KERN_DEBUG, &dev->dev, "%pR\n", res); |
548 | return pnp_res; | 548 | return pnp_res; |
549 | } | 549 | } |
550 | 550 | ||
@@ -568,7 +568,7 @@ struct pnp_resource *pnp_add_io_resource(struct pnp_dev *dev, | |||
568 | res->start = start; | 568 | res->start = start; |
569 | res->end = end; | 569 | res->end = end; |
570 | 570 | ||
571 | pnp_dbg(&dev->dev, " add %pr\n", res); | 571 | dev_printk(KERN_DEBUG, &dev->dev, "%pR\n", res); |
572 | return pnp_res; | 572 | return pnp_res; |
573 | } | 573 | } |
574 | 574 | ||
@@ -592,7 +592,7 @@ struct pnp_resource *pnp_add_mem_resource(struct pnp_dev *dev, | |||
592 | res->start = start; | 592 | res->start = start; |
593 | res->end = end; | 593 | res->end = end; |
594 | 594 | ||
595 | pnp_dbg(&dev->dev, " add %pr\n", res); | 595 | dev_printk(KERN_DEBUG, &dev->dev, "%pR\n", res); |
596 | return pnp_res; | 596 | return pnp_res; |
597 | } | 597 | } |
598 | 598 | ||
@@ -616,7 +616,7 @@ struct pnp_resource *pnp_add_bus_resource(struct pnp_dev *dev, | |||
616 | res->start = start; | 616 | res->start = start; |
617 | res->end = end; | 617 | res->end = end; |
618 | 618 | ||
619 | pnp_dbg(&dev->dev, " add %pr\n", res); | 619 | dev_printk(KERN_DEBUG, &dev->dev, "%pR\n", res); |
620 | return pnp_res; | 620 | return pnp_res; |
621 | } | 621 | } |
622 | 622 | ||