Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

xenbus: Use dev_printk() when possible

Use dev_printk() when possible to include device and driver information in
the conventional format.

Add "#define dev_fmt" to preserve KBUILD_MODNAME in messages.

No functional change intended.

Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Link: https://lore.kernel.org/r/20200527174326.254329-3-helgaas@kernel.org
Reviewed-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>

authored by

Bjorn Helgaas and committed by
Boris Ostrovsky
64b3eaf3 69049454

+5 -6
+5 -6
drivers/xen/xenbus/xenbus_probe.c
··· 31 31 */ 32 32 33 33 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt 34 + #define dev_fmt pr_fmt 34 35 35 36 #define DPRINTK(fmt, args...) \ 36 37 pr_debug("xenbus_probe (%s:%d) " fmt ".\n", \ ··· 609 608 if (drv->suspend) 610 609 err = drv->suspend(xdev); 611 610 if (err) 612 - pr_warn("suspend %s failed: %i\n", dev_name(dev), err); 611 + dev_warn(dev, "suspend failed: %i\n", err); 613 612 return 0; 614 613 } 615 614 EXPORT_SYMBOL_GPL(xenbus_dev_suspend); ··· 628 627 drv = to_xenbus_driver(dev->driver); 629 628 err = talk_to_otherend(xdev); 630 629 if (err) { 631 - pr_warn("resume (talk_to_otherend) %s failed: %i\n", 632 - dev_name(dev), err); 630 + dev_warn(dev, "resume (talk_to_otherend) failed: %i\n", err); 633 631 return err; 634 632 } 635 633 ··· 637 637 if (drv->resume) { 638 638 err = drv->resume(xdev); 639 639 if (err) { 640 - pr_warn("resume %s failed: %i\n", dev_name(dev), err); 640 + dev_warn(dev, "resume failed: %i\n", err); 641 641 return err; 642 642 } 643 643 } 644 644 645 645 err = watch_otherend(xdev); 646 646 if (err) { 647 - pr_warn("resume (watch_otherend) %s failed: %d.\n", 648 - dev_name(dev), err); 647 + dev_warn(dev, "resume (watch_otherend) failed: %d\n", err); 649 648 return err; 650 649 } 651 650