diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2013-11-05 15:34:51 -0500 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2013-11-05 18:36:06 -0500 |
commit | fbeeb822f6f45cadf154d7b7cff1c13537cd799d (patch) | |
tree | b88cbc5b7c1d0d9414185002ba4f9b583c3912c6 /drivers/pci | |
parent | cf3e1feba7f906f233790f1806592730a88f584d (diff) |
PCI: Drop warning about drivers that don't use pci_set_master()
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>
Diffstat (limited to 'drivers/pci')
-rw-r--r-- | drivers/pci/pci.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 7a92d81c28e0..ac40f90cfd5f 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c | |||
@@ -1156,10 +1156,8 @@ static void pci_enable_bridge(struct pci_dev *dev) | |||
1156 | pci_enable_bridge(dev->bus->self); | 1156 | pci_enable_bridge(dev->bus->self); |
1157 | 1157 | ||
1158 | if (pci_is_enabled(dev)) { | 1158 | if (pci_is_enabled(dev)) { |
1159 | if (!dev->is_busmaster) { | 1159 | if (!dev->is_busmaster) |
1160 | dev_warn(&dev->dev, "driver skip pci_set_master, fix it!\n"); | ||
1161 | pci_set_master(dev); | 1160 | pci_set_master(dev); |
1162 | } | ||
1163 | return; | 1161 | return; |
1164 | } | 1162 | } |
1165 | 1163 | ||