Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit fbeeb822f6f45cadf154d7b7cff1c13537cd799d

Authored by Bjorn Helgaas
1 parent cf3e1feba7
Exists in smarc-imx_3.14.28_1.0.0_ga and in 1 other branch imx_3.14.28_1.0.0_ga

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>

Showing 1 changed file with 1 additions and 3 deletions Side-by-side Diff

... ... @@ -1156,10 +1156,8 @@
1156 1156 pci_enable_bridge(dev->bus->self);
1157 1157  
1158 1158 if (pci_is_enabled(dev)) {
1159   - if (!dev->is_busmaster) {
1160   - dev_warn(&dev->dev, "driver skip pci_set_master, fix it!\n");
  1159 + if (!dev->is_busmaster)
1161 1160 pci_set_master(dev);
1162   - }
1163 1161 return;
1164 1162 }
1165 1163