Skip to content

Commit

Permalink
PNP: log PNP resources, as we do for PCI
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Bjorn Helgaas authored and Len Brown committed Oct 1, 2010
1 parent 899611e commit c1f3f28
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 7 deletions.
5 changes: 3 additions & 2 deletions drivers/pnp/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -194,8 +194,9 @@ int pnp_add_device(struct pnp_dev *dev)
for (id = dev->id; id; id = id->next)
len += scnprintf(buf + len, sizeof(buf) - len, " %s", id->id);

pnp_dbg(&dev->dev, "%s device, IDs%s (%s)\n",
dev->protocol->name, buf, dev->active ? "active" : "disabled");
dev_printk(KERN_DEBUG, &dev->dev, "%s device, IDs%s (%s)\n",
dev->protocol->name, buf,
dev->active ? "active" : "disabled");
return 0;
}

Expand Down
10 changes: 5 additions & 5 deletions drivers/pnp/resource.c
Original file line number Diff line number Diff line change
Expand Up @@ -523,7 +523,7 @@ struct pnp_resource *pnp_add_irq_resource(struct pnp_dev *dev, int irq,
res->start = irq;
res->end = irq;

pnp_dbg(&dev->dev, " add %pr\n", res);
dev_printk(KERN_DEBUG, &dev->dev, "%pR\n", res);
return pnp_res;
}

Expand All @@ -544,7 +544,7 @@ struct pnp_resource *pnp_add_dma_resource(struct pnp_dev *dev, int dma,
res->start = dma;
res->end = dma;

pnp_dbg(&dev->dev, " add %pr\n", res);
dev_printk(KERN_DEBUG, &dev->dev, "%pR\n", res);
return pnp_res;
}

Expand All @@ -568,7 +568,7 @@ struct pnp_resource *pnp_add_io_resource(struct pnp_dev *dev,
res->start = start;
res->end = end;

pnp_dbg(&dev->dev, " add %pr\n", res);
dev_printk(KERN_DEBUG, &dev->dev, "%pR\n", res);
return pnp_res;
}

Expand All @@ -592,7 +592,7 @@ struct pnp_resource *pnp_add_mem_resource(struct pnp_dev *dev,
res->start = start;
res->end = end;

pnp_dbg(&dev->dev, " add %pr\n", res);
dev_printk(KERN_DEBUG, &dev->dev, "%pR\n", res);
return pnp_res;
}

Expand All @@ -616,7 +616,7 @@ struct pnp_resource *pnp_add_bus_resource(struct pnp_dev *dev,
res->start = start;
res->end = end;

pnp_dbg(&dev->dev, " add %pr\n", res);
dev_printk(KERN_DEBUG, &dev->dev, "%pR\n", res);
return pnp_res;
}

Expand Down

0 comments on commit c1f3f28

Please sign in to comment.