aboutsummaryrefslogtreecommitdiff
path: root/drivers/pci
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2013-11-05 13:34:51 -0700
committerJiri Slaby <jslaby@suse.cz>2014-03-12 13:25:35 +0100
commit6dc265bdd04069ee1b1deda71b5bdfa4cb280e1b (patch)
tree476ab10047fa41099fc3de1577ac55e68afee46c /drivers/pci
parent9321256a6cdb293512c1c723eecc54305545619e (diff)
PCI: Drop warning about drivers that don't use pci_set_master()
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>
Diffstat (limited to 'drivers/pci')
-rw-r--r--drivers/pci/pci.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 863bc4bb480..532991bd1dc 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -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;
}