From: Bjorn Helgaas Date: Wed, 17 Oct 2007 06:31:10 +0000 (-0700) Subject: PNP: use dev_info(), dev_err(), etc in core X-Git-Tag: v2.6.24-rc1~533 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=a05d0781695566296e74a3670dd5bbd3daf24ae2;p=linux-2.6-omap-h63xx.git PNP: use dev_info(), dev_err(), etc in core If we have the struct pnp_dev available, we can use dev_info(), dev_err(), etc., to give a little more information and consistency. [akpm@linux-foundation.org: fix warning] Signed-off-by: Bjorn Helgaas Cc: Adam Belay Cc: Len Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/drivers/pnp/Makefile b/drivers/pnp/Makefile index a381a92fd1b..26f5abc9c3f 100644 --- a/drivers/pnp/Makefile +++ b/drivers/pnp/Makefile @@ -7,3 +7,7 @@ obj-y := core.o card.o driver.o resource.o manager.o support.o interface.o quir obj-$(CONFIG_PNPACPI) += pnpacpi/ obj-$(CONFIG_PNPBIOS) += pnpbios/ obj-$(CONFIG_ISAPNP) += isapnp/ + +ifeq ($(CONFIG_PNP_DEBUG),y) +EXTRA_CFLAGS += -DDEBUG +endif diff --git a/drivers/pnp/card.c b/drivers/pnp/card.c index 3b48aef8f4e..da1c9909eb4 100644 --- a/drivers/pnp/card.c +++ b/drivers/pnp/card.c @@ -198,8 +198,7 @@ int pnp_add_card(struct pnp_card *card) card->dev.release = &pnp_release_card; error = device_register(&card->dev); if (error) { - pnp_err("sysfs failure, card '%s' will be unavailable", - card->dev.bus_id); + dev_err(&card->dev, "could not register (err=%d)\n", error); return error; } diff --git a/drivers/pnp/driver.c b/drivers/pnp/driver.c index 2fa64a6b25c..a262762c5b8 100644 --- a/drivers/pnp/driver.c +++ b/drivers/pnp/driver.c @@ -86,9 +86,6 @@ static int pnp_device_probe(struct device *dev) pnp_dev = to_pnp_dev(dev); pnp_drv = to_pnp_driver(dev->driver); - pnp_dbg("match found with the PnP device '%s' and the driver '%s'", - dev->bus_id, pnp_drv->name); - error = pnp_device_attach(pnp_dev); if (error < 0) return error; @@ -116,6 +113,8 @@ static int pnp_device_probe(struct device *dev) error = 0; } else goto fail; + + dev_dbg(dev, "driver attached\n"); return error; fail: diff --git a/drivers/pnp/interface.c b/drivers/pnp/interface.c index e0ee28a88da..31548044fdd 100644 --- a/drivers/pnp/interface.c +++ b/drivers/pnp/interface.c @@ -327,8 +327,7 @@ pnp_set_current_resources(struct device *dmdev, struct device_attribute *attr, if (dev->status & PNP_ATTACHED) { retval = -EBUSY; - pnp_info("Device %s cannot be configured because it is in use.", - dev->dev.bus_id); + dev_info(&dev->dev, "in use; can't configure\n"); goto done; } diff --git a/drivers/pnp/manager.c b/drivers/pnp/manager.c index 5e43c471909..c6b3d4e63cc 100644 --- a/drivers/pnp/manager.c +++ b/drivers/pnp/manager.c @@ -22,8 +22,7 @@ static int pnp_assign_port(struct pnp_dev *dev, struct pnp_port *rule, int idx) unsigned long *flags; if (idx >= PNP_MAX_PORT) { - pnp_err - ("More than 4 ports is incompatible with pnp specifications."); + dev_err(&dev->dev, "too many I/O port resources\n"); /* pretend we were successful so at least the manager won't try again */ return 1; } @@ -64,8 +63,7 @@ static int pnp_assign_mem(struct pnp_dev *dev, struct pnp_mem *rule, int idx) unsigned long *flags; if (idx >= PNP_MAX_MEM) { - pnp_err - ("More than 8 mems is incompatible with pnp specifications."); + dev_err(&dev->dev, "too many memory resources\n"); /* pretend we were successful so at least the manager won't try again */ return 1; } @@ -122,8 +120,7 @@ static int pnp_assign_irq(struct pnp_dev *dev, struct pnp_irq *rule, int idx) }; if (idx >= PNP_MAX_IRQ) { - pnp_err - ("More than 2 irqs is incompatible with pnp specifications."); + dev_err(&dev->dev, "too many IRQ resources\n"); /* pretend we were successful so at least the manager won't try again */ return 1; } @@ -173,8 +170,7 @@ static void pnp_assign_dma(struct pnp_dev *dev, struct pnp_dma *rule, int idx) }; if (idx >= PNP_MAX_DMA) { - pnp_err("More than 2 dmas is incompatible with pnp " - "specifications."); + dev_err(&dev->dev, "too many DMA resources\n"); return; } @@ -442,8 +438,7 @@ int pnp_auto_config_dev(struct pnp_dev *dev) int i = 1; if (!pnp_can_configure(dev)) { - pnp_dbg("Device %s does not support resource configuration.", - dev->dev.bus_id); + dev_dbg(&dev->dev, "configuration not supported\n"); return -ENODEV; } @@ -460,7 +455,7 @@ int pnp_auto_config_dev(struct pnp_dev *dev) } while (dep); } - pnp_err("Unable to assign resources to device %s.", dev->dev.bus_id); + dev_err(&dev->dev, "unable to assign resources\n"); return -EBUSY; } @@ -473,17 +468,16 @@ int pnp_auto_config_dev(struct pnp_dev *dev) int pnp_start_dev(struct pnp_dev *dev) { if (!pnp_can_write(dev)) { - pnp_dbg("Device %s does not support activation.", - dev->dev.bus_id); + dev_dbg(&dev->dev, "activation not supported\n"); return -EINVAL; } if (dev->protocol->set(dev, &dev->res) < 0) { - pnp_err("Failed to activate device %s.", dev->dev.bus_id); + dev_err(&dev->dev, "activation failed\n"); return -EIO; } - pnp_info("Device %s activated.", dev->dev.bus_id); + dev_info(&dev->dev, "activated\n"); return 0; } @@ -496,16 +490,15 @@ int pnp_start_dev(struct pnp_dev *dev) int pnp_stop_dev(struct pnp_dev *dev) { if (!pnp_can_disable(dev)) { - pnp_dbg("Device %s does not support disabling.", - dev->dev.bus_id); + dev_dbg(&dev->dev, "disabling not supported\n"); return -EINVAL; } if (dev->protocol->disable(dev) < 0) { - pnp_err("Failed to disable device %s.", dev->dev.bus_id); + dev_err(&dev->dev, "disable failed\n"); return -EIO; } - pnp_info("Device %s disabled.", dev->dev.bus_id); + dev_info(&dev->dev, "disabled\n"); return 0; } diff --git a/drivers/pnp/quirks.c b/drivers/pnp/quirks.c index 6b0cf0c2a08..e903b8c2b1f 100644 --- a/drivers/pnp/quirks.c +++ b/drivers/pnp/quirks.c @@ -17,6 +17,7 @@ #include #include #include +#include #include "base.h" static void quirk_awe32_resources(struct pnp_dev *dev) @@ -133,11 +134,18 @@ static struct pnp_fixup pnp_fixups[] = { void pnp_fixup_device(struct pnp_dev *dev) { int i = 0; + void (*quirk)(struct pnp_dev *); while (*pnp_fixups[i].id) { if (compare_pnp_id(dev->id, pnp_fixups[i].id)) { - pnp_dbg("Calling quirk for %s", dev->dev.bus_id); - pnp_fixups[i].quirk_function(dev); + quirk = pnp_fixups[i].quirk_function; + +#ifdef DEBUG + dev_dbg(&dev->dev, "calling quirk 0x%p", quirk); + print_fn_descriptor_symbol(": %s()\n", + (unsigned long) *quirk); +#endif + (*quirk)(dev); } i++; } diff --git a/drivers/pnp/resource.c b/drivers/pnp/resource.c index 087fed18628..41d73a5e931 100644 --- a/drivers/pnp/resource.c +++ b/drivers/pnp/resource.c @@ -51,7 +51,7 @@ struct pnp_option *pnp_register_independent_option(struct pnp_dev *dev) /* this should never happen but if it does we'll try to continue */ if (dev->independent) - pnp_err("independent resource already registered"); + dev_err(&dev->dev, "independent resource already registered\n"); dev->independent = option; return option; }