diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2013-11-05 21:34:51 +0100 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2013-11-06 00:36:06 +0100 |
commit | fbeeb822f6f45cadf154d7b7cff1c13537cd799d (patch) | |
tree | b88cbc5b7c1d0d9414185002ba4f9b583c3912c6 /drivers/pci/pci.c | |
parent | PCI: Workaround missing pci_set_master in pci drivers (diff) | |
download | linux-fbeeb822f6f45cadf154d7b7cff1c13537cd799d.tar.xz linux-fbeeb822f6f45cadf154d7b7cff1c13537cd799d.zip |
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/pci.c')
-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) 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; } |