Skip to content

Commit

Permalink
PCI: Drop warning about drivers that don't use pci_set_master()
Browse files Browse the repository at this point in the history
f41f064 ("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>
  • Loading branch information
Bjorn Helgaas committed Nov 5, 2013
1 parent cf3e1fe commit fbeeb82
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions drivers/pci/pci.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down

0 comments on commit fbeeb82

Please sign in to comment.