aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pnp/pnpbios
diff options
context:
space:
mode:
authorBjorn Helgaas <bjorn.helgaas@hp.com>2008-08-19 18:53:47 -0400
committerLen Brown <len.brown@intel.com>2008-10-10 23:34:33 -0400
commit2f53432c2aedbe79020e44525eb069d9138a01dd (patch)
tree54ac6a9d9ff7aa24c0d9fabe48e38caf076830c7 /drivers/pnp/pnpbios
parent97ef062bbe08f46903f29ecdf432be302c977f3b (diff)
PNP: convert to using pnp_dbg()
pnp_dbg() is equivalent to dev_dbg() except that we can turn it on at boot-time with the "pnp.debug" kernel parameter, so we don't have to build a new kernel image. Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Signed-off-by: Andi Kleen <ak@linux.intel.com> Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/pnp/pnpbios')
-rw-r--r--drivers/pnp/pnpbios/core.c4
-rw-r--r--drivers/pnp/pnpbios/rsparser.c18
2 files changed, 11 insertions, 11 deletions
diff --git a/drivers/pnp/pnpbios/core.c b/drivers/pnp/pnpbios/core.c
index 19a4be1a9a31..2f79eb2190e1 100644
--- a/drivers/pnp/pnpbios/core.c
+++ b/drivers/pnp/pnpbios/core.c
@@ -211,7 +211,7 @@ static int pnpbios_get_resources(struct pnp_dev *dev)
211 if (!pnpbios_is_dynamic(dev)) 211 if (!pnpbios_is_dynamic(dev))
212 return -EPERM; 212 return -EPERM;
213 213
214 dev_dbg(&dev->dev, "get resources\n"); 214 pnp_dbg(&dev->dev, "get resources\n");
215 node = kzalloc(node_info.max_node_size, GFP_KERNEL); 215 node = kzalloc(node_info.max_node_size, GFP_KERNEL);
216 if (!node) 216 if (!node)
217 return -1; 217 return -1;
@@ -234,7 +234,7 @@ static int pnpbios_set_resources(struct pnp_dev *dev)
234 if (!pnpbios_is_dynamic(dev)) 234 if (!pnpbios_is_dynamic(dev))
235 return -EPERM; 235 return -EPERM;
236 236
237 dev_dbg(&dev->dev, "set resources\n"); 237 pnp_dbg(&dev->dev, "set resources\n");
238 node = kzalloc(node_info.max_node_size, GFP_KERNEL); 238 node = kzalloc(node_info.max_node_size, GFP_KERNEL);
239 if (!node) 239 if (!node)
240 return -1; 240 return -1;
diff --git a/drivers/pnp/pnpbios/rsparser.c b/drivers/pnp/pnpbios/rsparser.c
index ca567671379e..87b4f49a5251 100644
--- a/drivers/pnp/pnpbios/rsparser.c
+++ b/drivers/pnp/pnpbios/rsparser.c
@@ -87,7 +87,7 @@ static unsigned char *pnpbios_parse_allocated_resource_data(struct pnp_dev *dev,
87 if (!p) 87 if (!p)
88 return NULL; 88 return NULL;
89 89
90 dev_dbg(&dev->dev, "parse allocated resources\n"); 90 pnp_dbg(&dev->dev, "parse allocated resources\n");
91 91
92 pnp_init_resources(dev); 92 pnp_init_resources(dev);
93 93
@@ -324,7 +324,7 @@ pnpbios_parse_resource_option_data(unsigned char *p, unsigned char *end,
324 if (!p) 324 if (!p)
325 return NULL; 325 return NULL;
326 326
327 dev_dbg(&dev->dev, "parse resource options\n"); 327 pnp_dbg(&dev->dev, "parse resource options\n");
328 option_flags = 0; 328 option_flags = 0;
329 while ((char *)p < (char *)end) { 329 while ((char *)p < (char *)end) {
330 330
@@ -519,7 +519,7 @@ static void pnpbios_encode_mem(struct pnp_dev *dev, unsigned char *p,
519 p[10] = (len >> 8) & 0xff; 519 p[10] = (len >> 8) & 0xff;
520 p[11] = ((len >> 8) >> 8) & 0xff; 520 p[11] = ((len >> 8) >> 8) & 0xff;
521 521
522 dev_dbg(&dev->dev, " encode mem %#lx-%#lx\n", base, base + len - 1); 522 pnp_dbg(&dev->dev, " encode mem %#lx-%#lx\n", base, base + len - 1);
523} 523}
524 524
525static void pnpbios_encode_mem32(struct pnp_dev *dev, unsigned char *p, 525static void pnpbios_encode_mem32(struct pnp_dev *dev, unsigned char *p,
@@ -549,7 +549,7 @@ static void pnpbios_encode_mem32(struct pnp_dev *dev, unsigned char *p,
549 p[18] = (len >> 16) & 0xff; 549 p[18] = (len >> 16) & 0xff;
550 p[19] = (len >> 24) & 0xff; 550 p[19] = (len >> 24) & 0xff;
551 551
552 dev_dbg(&dev->dev, " encode mem32 %#lx-%#lx\n", base, base + len - 1); 552 pnp_dbg(&dev->dev, " encode mem32 %#lx-%#lx\n", base, base + len - 1);
553} 553}
554 554
555static void pnpbios_encode_fixed_mem32(struct pnp_dev *dev, unsigned char *p, 555static void pnpbios_encode_fixed_mem32(struct pnp_dev *dev, unsigned char *p,
@@ -575,7 +575,7 @@ static void pnpbios_encode_fixed_mem32(struct pnp_dev *dev, unsigned char *p,
575 p[10] = (len >> 16) & 0xff; 575 p[10] = (len >> 16) & 0xff;
576 p[11] = (len >> 24) & 0xff; 576 p[11] = (len >> 24) & 0xff;
577 577
578 dev_dbg(&dev->dev, " encode fixed_mem32 %#lx-%#lx\n", base, 578 pnp_dbg(&dev->dev, " encode fixed_mem32 %#lx-%#lx\n", base,
579 base + len - 1); 579 base + len - 1);
580} 580}
581 581
@@ -592,7 +592,7 @@ static void pnpbios_encode_irq(struct pnp_dev *dev, unsigned char *p,
592 p[1] = map & 0xff; 592 p[1] = map & 0xff;
593 p[2] = (map >> 8) & 0xff; 593 p[2] = (map >> 8) & 0xff;
594 594
595 dev_dbg(&dev->dev, " encode irq mask %#lx\n", map); 595 pnp_dbg(&dev->dev, " encode irq mask %#lx\n", map);
596} 596}
597 597
598static void pnpbios_encode_dma(struct pnp_dev *dev, unsigned char *p, 598static void pnpbios_encode_dma(struct pnp_dev *dev, unsigned char *p,
@@ -607,7 +607,7 @@ static void pnpbios_encode_dma(struct pnp_dev *dev, unsigned char *p,
607 607
608 p[1] = map & 0xff; 608 p[1] = map & 0xff;
609 609
610 dev_dbg(&dev->dev, " encode dma mask %#lx\n", map); 610 pnp_dbg(&dev->dev, " encode dma mask %#lx\n", map);
611} 611}
612 612
613static void pnpbios_encode_port(struct pnp_dev *dev, unsigned char *p, 613static void pnpbios_encode_port(struct pnp_dev *dev, unsigned char *p,
@@ -630,7 +630,7 @@ static void pnpbios_encode_port(struct pnp_dev *dev, unsigned char *p,
630 p[5] = (base >> 8) & 0xff; 630 p[5] = (base >> 8) & 0xff;
631 p[7] = len & 0xff; 631 p[7] = len & 0xff;
632 632
633 dev_dbg(&dev->dev, " encode io %#lx-%#lx\n", base, base + len - 1); 633 pnp_dbg(&dev->dev, " encode io %#lx-%#lx\n", base, base + len - 1);
634} 634}
635 635
636static void pnpbios_encode_fixed_port(struct pnp_dev *dev, unsigned char *p, 636static void pnpbios_encode_fixed_port(struct pnp_dev *dev, unsigned char *p,
@@ -651,7 +651,7 @@ static void pnpbios_encode_fixed_port(struct pnp_dev *dev, unsigned char *p,
651 p[2] = (base >> 8) & 0xff; 651 p[2] = (base >> 8) & 0xff;
652 p[3] = len & 0xff; 652 p[3] = len & 0xff;
653 653
654 dev_dbg(&dev->dev, " encode fixed_io %#lx-%#lx\n", base, 654 pnp_dbg(&dev->dev, " encode fixed_io %#lx-%#lx\n", base,
655 base + len - 1); 655 base + len - 1);
656} 656}
657 657