summaryrefslogtreecommitdiffstats
path: root/drivers/xen/xen-pciback/conf_space.c
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2020-05-27 12:43:25 -0500
committerBoris Ostrovsky <boris.ostrovsky@oracle.com>2020-05-27 17:27:37 -0500
commit69049454206ac7f7e6e0683bc7fd43eb61746479 (patch)
treed1d1cfff261c5f5f62282f23ff3c17320870ada8 /drivers/xen/xen-pciback/conf_space.c
parent2abb65a39bcca0629437bb83e583889f9e1ad696 (diff)
downloadlinux-stable-69049454206ac7f7e6e0683bc7fd43eb61746479.tar.gz
linux-stable-69049454206ac7f7e6e0683bc7fd43eb61746479.tar.bz2
linux-stable-69049454206ac7f7e6e0683bc7fd43eb61746479.zip
xen-pciback: Use dev_printk() when possible
Use dev_printk() when possible to include device and driver information in the conventional format. Add "#define dev_fmt" when needed to preserve DRV_NAME or KBUILD_MODNAME in messages. No functional change intended. Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Link: https://lore.kernel.org/r/20200527174326.254329-2-helgaas@kernel.org Reviewed-by: Boris Ostrovsky <boris.ostrovsky@oracle.com> Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Diffstat (limited to 'drivers/xen/xen-pciback/conf_space.c')
-rw-r--r--drivers/xen/xen-pciback/conf_space.c16
1 files changed, 9 insertions, 7 deletions
diff --git a/drivers/xen/xen-pciback/conf_space.c b/drivers/xen/xen-pciback/conf_space.c
index da51a5d34e6e..f2df4e55fc1b 100644
--- a/drivers/xen/xen-pciback/conf_space.c
+++ b/drivers/xen/xen-pciback/conf_space.c
@@ -10,6 +10,8 @@
* Author: Ryan Wilson <hap9@epoch.ncsc.mil>
*/
+#define dev_fmt(fmt) DRV_NAME ": " fmt
+
#include <linux/kernel.h>
#include <linux/moduleparam.h>
#include <linux/pci.h>
@@ -155,8 +157,8 @@ int xen_pcibk_config_read(struct pci_dev *dev, int offset, int size,
u32 value = 0, tmp_val;
if (unlikely(verbose_request))
- printk(KERN_DEBUG DRV_NAME ": %s: read %d bytes at 0x%x\n",
- pci_name(dev), size, offset);
+ dev_printk(KERN_DEBUG, &dev->dev, "read %d bytes at 0x%x\n",
+ size, offset);
if (!valid_request(offset, size)) {
err = XEN_PCI_ERR_invalid_offset;
@@ -196,8 +198,8 @@ int xen_pcibk_config_read(struct pci_dev *dev, int offset, int size,
out:
if (unlikely(verbose_request))
- printk(KERN_DEBUG DRV_NAME ": %s: read %d bytes at 0x%x = %x\n",
- pci_name(dev), size, offset, value);
+ dev_printk(KERN_DEBUG, &dev->dev,
+ "read %d bytes at 0x%x = %x\n", size, offset, value);
*ret_val = value;
return xen_pcibios_err_to_errno(err);
@@ -213,9 +215,9 @@ int xen_pcibk_config_write(struct pci_dev *dev, int offset, int size, u32 value)
int field_start, field_end;
if (unlikely(verbose_request))
- printk(KERN_DEBUG
- DRV_NAME ": %s: write request %d bytes at 0x%x = %x\n",
- pci_name(dev), size, offset, value);
+ dev_printk(KERN_DEBUG, &dev->dev,
+ "write request %d bytes at 0x%x = %x\n", size,
+ offset, value);
if (!valid_request(offset, size))
return XEN_PCI_ERR_invalid_offset;