xen/pci: Get rid of verbose_request and use dev_dbg() instead

Information printed under verbose_request is clearly used for debugging
only. Remove it and use dev_dbg() instead.

Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Link: https://lore.kernel.org/r/1590719092-8578-1-git-send-email-boris.ostrovsky@oracle.com
Reviewed-by: Juergen Gross <jgross@suse.com>
Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>

diff --git a/drivers/pci/xen-pcifront.c b/drivers/pci/xen-pcifront.c
index d1b16cf3403f45c0819704551ecb6d3e75b7d8ab..fab267e359e74004c3881ede7b32780893bc8d35 100644 (file)
--- a/drivers/pci/xen-pcifront.c
+++ b/drivers/pci/xen-pcifront.c
@@ -77,9 +77,6 @@ static inline void pcifront_init_sd(struct pcifront_sd *sd,
 static DEFINE_SPINLOCK(pcifront_dev_lock);
 static struct pcifront_device *pcifront_dev;
 
-static int verbose_request;
-module_param(verbose_request, int, 0644);
-
 static int errno_to_pcibios_err(int errno)
 {
        switch (errno) {
@@ -190,18 +187,16 @@ static int pcifront_bus_read(struct pci_bus *bus, unsigned int devfn,
        struct pcifront_sd *sd = bus->sysdata;
        struct pcifront_device *pdev = pcifront_get_pdev(sd);
 
-       if (verbose_request)
-               dev_info(&pdev->xdev->dev,
-                        "read dev=%04x:%02x:%02x.%d - offset %x size %d\n",
-                        pci_domain_nr(bus), bus->number, PCI_SLOT(devfn),
-                        PCI_FUNC(devfn), where, size);
+       dev_dbg(&pdev->xdev->dev,
+               "read dev=%04x:%02x:%02x.%d - offset %x size %d\n",
+               pci_domain_nr(bus), bus->number, PCI_SLOT(devfn),
+               PCI_FUNC(devfn), where, size);
 
        err = do_pci_op(pdev, &op);
 
        if (likely(!err)) {
-               if (verbose_request)
-                       dev_info(&pdev->xdev->dev, "read got back value %x\n",
-                                op.value);
+               dev_dbg(&pdev->xdev->dev, "read got back value %x\n",
+                       op.value);
 
                *val = op.value;
        } else if (err == -ENODEV) {
@@ -229,12 +224,10 @@ static int pcifront_bus_write(struct pci_bus *bus, unsigned int devfn,
        struct pcifront_sd *sd = bus->sysdata;
        struct pcifront_device *pdev = pcifront_get_pdev(sd);
 
-       if (verbose_request)
-               dev_info(&pdev->xdev->dev,
-                        "write dev=%04x:%02x:%02x.%d - "
-                        "offset %x size %d val %x\n",
-                        pci_domain_nr(bus), bus->number,
-                        PCI_SLOT(devfn), PCI_FUNC(devfn), where, size, val);
+       dev_dbg(&pdev->xdev->dev,
+               "write dev=%04x:%02x:%02x.%d - offset %x size %d val %x\n",
+               pci_domain_nr(bus), bus->number,
+               PCI_SLOT(devfn), PCI_FUNC(devfn), where, size, val);
 
        return errno_to_pcibios_err(do_pci_op(pdev, &op));
 }

diff --git a/drivers/xen/xen-pciback/conf_space.c b/drivers/xen/xen-pciback/conf_space.c
index f2df4e55fc1beae8d14227e4bcf67a3b827ff16c..059de92aea7d0fd1c83abcf0a80d9edd7ee10835 100644 (file)
--- a/drivers/xen/xen-pciback/conf_space.c
+++ b/drivers/xen/xen-pciback/conf_space.c
@@ -156,9 +156,7 @@ int xen_pcibk_config_read(struct pci_dev *dev, int offset, int size,
         * (as if device didn't respond) */
        u32 value = 0, tmp_val;
 
-       if (unlikely(verbose_request))
-               dev_printk(KERN_DEBUG, &dev->dev, "read %d bytes at 0x%x\n",
-                          size, offset);
+       dev_dbg(&dev->dev, "read %d bytes at 0x%x\n", size, offset);
 
        if (!valid_request(offset, size)) {
                err = XEN_PCI_ERR_invalid_offset;
@@ -197,9 +195,7 @@ int xen_pcibk_config_read(struct pci_dev *dev, int offset, int size,
        }
 
 out:
-       if (unlikely(verbose_request))
-               dev_printk(KERN_DEBUG, &dev->dev,
-                          "read %d bytes at 0x%x = %x\n", size, offset, value);
+       dev_dbg(&dev->dev, "read %d bytes at 0x%x = %x\n", size, offset, value);
 
        *ret_val = value;
        return xen_pcibios_err_to_errno(err);
@@ -214,10 +210,8 @@ int xen_pcibk_config_write(struct pci_dev *dev, int offset, int size, u32 value)
        u32 tmp_val;
        int field_start, field_end;
 
-       if (unlikely(verbose_request))
-               dev_printk(KERN_DEBUG, &dev->dev,
-                          "write request %d bytes at 0x%x = %x\n", size,
-                          offset, value);
+       dev_dbg(&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;

diff --git a/drivers/xen/xen-pciback/conf_space_header.c b/drivers/xen/xen-pciback/conf_space_header.c
index b277b689f2576de877ecd100d819fcb7eba799be..ac45cdc38e8597484dcd9e650325194ef198f82e 100644 (file)
--- a/drivers/xen/xen-pciback/conf_space_header.c
+++ b/drivers/xen/xen-pciback/conf_space_header.c
@@ -68,36 +68,30 @@ static int command_write(struct pci_dev *dev, int offset, u16 value, void *data)
 
        dev_data = pci_get_drvdata(dev);
        if (!pci_is_enabled(dev) && is_enable_cmd(value)) {
-               if (unlikely(verbose_request))
-                       dev_printk(KERN_DEBUG, &dev->dev, "enable\n");
+               dev_dbg(&dev->dev, "enable\n");
                err = pci_enable_device(dev);
                if (err)
                        return err;
                if (dev_data)
                        dev_data->enable_intx = 1;
        } else if (pci_is_enabled(dev) && !is_enable_cmd(value)) {
-               if (unlikely(verbose_request))
-                       dev_printk(KERN_DEBUG, &dev->dev, "disable\n");
+               dev_dbg(&dev->dev, "disable\n");
                pci_disable_device(dev);
                if (dev_data)
                        dev_data->enable_intx = 0;
        }
 
        if (!dev->is_busmaster && is_master_cmd(value)) {
-               if (unlikely(verbose_request))
-                       dev_printk(KERN_DEBUG, &dev->dev, "set bus master\n");
+               dev_dbg(&dev->dev, "set bus master\n");
                pci_set_master(dev);
        } else if (dev->is_busmaster && !is_master_cmd(value)) {
-               if (unlikely(verbose_request))
-                       dev_printk(KERN_DEBUG, &dev->dev, "clear bus master\n");
+               dev_dbg(&dev->dev, "clear bus master\n");
                pci_clear_master(dev);
        }
 
        if (!(cmd->val & PCI_COMMAND_INVALIDATE) &&
            (value & PCI_COMMAND_INVALIDATE)) {
-               if (unlikely(verbose_request))
-                       dev_printk(KERN_DEBUG, &dev->dev,
-                                  "enable memory-write-invalidate\n");
+               dev_dbg(&dev->dev, "enable memory-write-invalidate\n");
                err = pci_set_mwi(dev);
                if (err) {
                        dev_warn(&dev->dev, "cannot enable memory-write-invalidate (%d)\n",
@@ -106,9 +100,7 @@ static int command_write(struct pci_dev *dev, int offset, u16 value, void *data)
                }
        } else if ((cmd->val & PCI_COMMAND_INVALIDATE) &&
                   !(value & PCI_COMMAND_INVALIDATE)) {
-               if (unlikely(verbose_request))
-                       dev_printk(KERN_DEBUG, &dev->dev,
-                                  "disable memory-write-invalidate\n");
+               dev_dbg(&dev->dev, "disable memory-write-invalidate\n");
                pci_clear_mwi(dev);
        }
 

diff --git a/drivers/xen/xen-pciback/pciback.h b/drivers/xen/xen-pciback/pciback.h
index 7c95516a860fa31de6e3ccccc751183550b1c92c..f1ed2dbf685cb0eab6b540a8872d9d266d07606d 100644 (file)
--- a/drivers/xen/xen-pciback/pciback.h
+++ b/drivers/xen/xen-pciback/pciback.h
@@ -186,8 +186,6 @@ void xen_pcibk_do_op(struct work_struct *data);
 int xen_pcibk_xenbus_register(void);
 void xen_pcibk_xenbus_unregister(void);
 
-extern int verbose_request;
-
 void xen_pcibk_test_and_schedule_op(struct xen_pcibk_device *pdev);
 #endif
 

diff --git a/drivers/xen/xen-pciback/pciback_ops.c b/drivers/xen/xen-pciback/pciback_ops.c
index 8545ca78c4f1d362c244df06b43932afc39b5952..e11a7438e1a255838d0100041b73b14e702837be 100644 (file)
--- a/drivers/xen/xen-pciback/pciback_ops.c
+++ b/drivers/xen/xen-pciback/pciback_ops.c
@@ -15,9 +15,6 @@
 #include <linux/sched.h>
 #include "pciback.h"
 
-int verbose_request;
-module_param(verbose_request, int, 0644);
-
 static irqreturn_t xen_pcibk_guest_interrupt(int irq, void *dev_id);
 
 /* Ensure a device is has the fake IRQ handler "turned on/off" and is
@@ -148,9 +145,6 @@ int xen_pcibk_enable_msi(struct xen_pcibk_device *pdev,
        struct xen_pcibk_dev_data *dev_data;
        int status;
 
-       if (unlikely(verbose_request))
-               dev_printk(KERN_DEBUG, &dev->dev, "enable MSI\n");
-
        if (dev->msi_enabled)
                status = -EALREADY;
        else if (dev->msix_enabled)
@@ -169,8 +163,8 @@ int xen_pcibk_enable_msi(struct xen_pcibk_device *pdev,
         * the local domain's IRQ number. */
 
        op->value = dev->irq ? xen_pirq_from_irq(dev->irq) : 0;
-       if (unlikely(verbose_request))
-               dev_printk(KERN_DEBUG, &dev->dev, "MSI: %d\n", op->value);
+
+       dev_dbg(&dev->dev, "MSI: %d\n", op->value);
 
        dev_data = pci_get_drvdata(dev);
        if (dev_data)
@@ -183,9 +177,6 @@ static
 int xen_pcibk_disable_msi(struct xen_pcibk_device *pdev,
                          struct pci_dev *dev, struct xen_pci_op *op)
 {
-       if (unlikely(verbose_request))
-               dev_printk(KERN_DEBUG, &dev->dev, "disable MSI\n");
-
        if (dev->msi_enabled) {
                struct xen_pcibk_dev_data *dev_data;
 
@@ -196,8 +187,9 @@ int xen_pcibk_disable_msi(struct xen_pcibk_device *pdev,
                        dev_data->ack_intr = 1;
        }
        op->value = dev->irq ? xen_pirq_from_irq(dev->irq) : 0;
-       if (unlikely(verbose_request))
-               dev_printk(KERN_DEBUG, &dev->dev, "MSI: %d\n", op->value);
+
+       dev_dbg(&dev->dev, "MSI: %d\n", op->value);
+
        return 0;
 }
 
@@ -210,8 +202,7 @@ int xen_pcibk_enable_msix(struct xen_pcibk_device *pdev,
        struct msix_entry *entries;
        u16 cmd;
 
-       if (unlikely(verbose_request))
-               dev_printk(KERN_DEBUG, &dev->dev, "enable MSI-X\n");
+       dev_dbg(&dev->dev, "enable MSI-X\n");
 
        if (op->value > SH_INFO_MAX_VEC)
                return -EINVAL;
@@ -244,10 +235,8 @@ int xen_pcibk_enable_msix(struct xen_pcibk_device *pdev,
                        if (entries[i].vector) {
                                op->msix_entries[i].vector =
                                        xen_pirq_from_irq(entries[i].vector);
-                               if (unlikely(verbose_request))
-                                       dev_printk(KERN_DEBUG, &dev->dev,
-                                               "MSI-X[%d]: %d\n", i,
-                                               op->msix_entries[i].vector);
+                               dev_dbg(&dev->dev, "MSI-X[%d]: %d\n", i,
+                                       op->msix_entries[i].vector);
                        }
                }
        } else
@@ -267,9 +256,6 @@ static
 int xen_pcibk_disable_msix(struct xen_pcibk_device *pdev,
                           struct pci_dev *dev, struct xen_pci_op *op)
 {
-       if (unlikely(verbose_request))
-               dev_printk(KERN_DEBUG, &dev->dev, "disable MSI-X\n");
-
        if (dev->msix_enabled) {
                struct xen_pcibk_dev_data *dev_data;
 
@@ -284,8 +270,9 @@ int xen_pcibk_disable_msix(struct xen_pcibk_device *pdev,
         * an undefined IRQ value of zero.
         */
        op->value = dev->irq ? xen_pirq_from_irq(dev->irq) : 0;
-       if (unlikely(verbose_request))
-               dev_printk(KERN_DEBUG, &dev->dev, "MSI-X: %d\n", op->value);
+
+       dev_dbg(&dev->dev, "MSI-X: %d\n", op->value);
+
        return 0;
 }
 #endif