PCI: Drop warning about drivers that don't use pci_set_master()
authorBjorn Helgaas <bhelgaas@google.com>
Tue, 5 Nov 2013 20:34:51 +0000 (13:34 -0700)
committerBjorn Helgaas <bhelgaas@google.com>
Tue, 5 Nov 2013 23:36:06 +0000 (16:36 -0700)
f41f064cf4 ("PCI: Workaround missing pci_set_master in pci drivers") made
pci_enable_bridge() turn on bus mastering if the driver hadn't done so
already.  It also added a warning in this case.  But there's no reason to
warn about it unless it's actually a problem to enable bus mastering here.

This patch drops the warning because I'm not aware of any such problem.

Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
CC: Paul Bolle <pebolle@tiscali.nl>
drivers/pci/pci.c

index 7a92d81c28e03e0582dc8068814434a49fbdbe04..ac40f90cfd5f7f1965ca62b80700593f4f83ba84 100644 (file)
@@ -1156,10 +1156,8 @@ static void pci_enable_bridge(struct pci_dev *dev)
        pci_enable_bridge(dev->bus->self);
 
        if (pci_is_enabled(dev)) {
-               if (!dev->is_busmaster) {
-                       dev_warn(&dev->dev, "driver skip pci_set_master, fix it!\n");
+               if (!dev->is_busmaster)
                        pci_set_master(dev);
-               }
                return;
        }