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)
committerJiri Slaby <jslaby@suse.cz>
Wed, 12 Mar 2014 12:25:35 +0000 (13:25 +0100)
commit fbeeb822f6f45cadf154d7b7cff1c13537cd799d upstream.

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>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
drivers/pci/pci.c

index 863bc4bb4806cac5459d64bcd76607410324a039..532991bd1dc2b1a3e8946ae9e56cbfe3ef311fbb 100644 (file)
@@ -1166,10 +1166,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;
        }