On Wed, 2014-04-16 at 17:12 -0700, Frank Rowand wrote: > pr_debug() parameters are reverse order of format string
Another way to do this might be to change all the printks/pr_debugs to dev_<level> Something like: --- drivers/base/dd.c | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/drivers/base/dd.c b/drivers/base/dd.c index 0605176..454df77 100644 --- a/drivers/base/dd.c +++ b/drivers/base/dd.c @@ -182,13 +182,12 @@ late_initcall(deferred_probe_initcall); static void driver_bound(struct device *dev) { if (klist_node_attached(&dev->p->knode_driver)) { - printk(KERN_WARNING "%s: device %s already bound\n", - __func__, kobject_name(&dev->kobj)); + dev_warn(dev, "%s: device already bound\n", __func__); return; } - pr_debug("driver: '%s': %s: bound to device '%s'\n", dev_name(dev), - __func__, dev->driver->name); + dev_dbg(dev, "%s: driver '%s' bound to device\n", + __func__, dev->driver->name); klist_add_tail(&dev->p->knode_driver, &dev->driver->p->klist_devices); @@ -267,8 +266,8 @@ static int really_probe(struct device *dev, struct device_driver *drv) int ret = 0; atomic_inc(&probe_count); - pr_debug("bus: '%s': %s: probing driver %s with device %s\n", - drv->bus->name, __func__, drv->name, dev_name(dev)); + dev_dbg(dev, "%s: bus: '%s': probing driver '%s'\n", + __func__, drv->bus->name, drv->name); WARN_ON(!list_empty(&dev->devres_head)); dev->driver = drv; @@ -279,8 +278,8 @@ static int really_probe(struct device *dev, struct device_driver *drv) goto probe_failed; if (driver_sysfs_add(dev)) { - printk(KERN_ERR "%s: driver_sysfs_add(%s) failed\n", - __func__, dev_name(dev)); + dev_err(dev, "%s: driver '%s' - driver_sysfs_add failed\n", + __func__, drv->name); goto probe_failed; } @@ -296,8 +295,8 @@ static int really_probe(struct device *dev, struct device_driver *drv) driver_bound(dev); ret = 1; - pr_debug("bus: '%s': %s: bound device %s to driver %s\n", - drv->bus->name, __func__, dev_name(dev), drv->name); + dev_dbg(dev, "%s: bus: '%s' - bound to driver '%s'\n", + __func__, drv->bus->name, drv->name); goto done; probe_failed: @@ -308,16 +307,16 @@ probe_failed: if (ret == -EPROBE_DEFER) { /* Driver requested deferred probing */ - dev_info(dev, "Driver %s requests probe deferral\n", drv->name); + dev_info(dev, "driver '%s' requests probe deferral\n", + drv->name); driver_deferred_probe_add(dev); } else if (ret != -ENODEV && ret != -ENXIO) { /* driver matched but the probe failed */ - printk(KERN_WARNING - "%s: probe of %s failed with error %d\n", - drv->name, dev_name(dev), ret); + dev_warn(dev, "probe of driver '%s' failed with error %d\n", + drv->name, ret); } else { - pr_debug("%s: probe of %s rejects match %d\n", - drv->name, dev_name(dev), ret); + dev_dbg(dev, "probe of driver '%s' rejects match %d\n", + drv->name, ret); } /* * Ignore errors returned by ->probe so that the next driver can try @@ -375,8 +374,8 @@ int driver_probe_device(struct device_driver *drv, struct device *dev) if (!device_is_registered(dev)) return -ENODEV; - pr_debug("bus: '%s': %s: matched device %s with driver %s\n", - drv->bus->name, __func__, dev_name(dev), drv->name); + dev_dbg(dev, "%s: bus: '%s' - matched with driver '%s'\n", + __func__, drv->bus->name, drv->name); pm_runtime_barrier(dev); ret = really_probe(dev, drv); -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/