diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2016-02-24 13:43:54 -0600 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2016-04-11 14:34:27 -0500 |
commit | 48c830809ce6e143781172c03a9794cb66802b31 (patch) | |
tree | ad4fde82f73a11007164936c42f9242c885e68b6 | |
parent | f0af9593372abfde34460aa1250e670cc535a7d8 (diff) | |
download | linux-stable-48c830809ce6e143781172c03a9794cb66802b31.tar.gz linux-stable-48c830809ce6e143781172c03a9794cb66802b31.tar.bz2 linux-stable-48c830809ce6e143781172c03a9794cb66802b31.zip |
PCI: Move informational printk to pci_add_dma_alias()
One of the quirks that adds DMA aliases logs an informational message in
dmesg. Move that to pci_add_dma_alias() so all users log the message
consistently. No functional change intended (except extra message).
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Alex Williamson <alex.williamson@redhat.com>
-rw-r--r-- | drivers/pci/pci.c | 2 | ||||
-rw-r--r-- | drivers/pci/quirks.c | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 1162118d1093..c82ebd0f6982 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -4590,6 +4590,8 @@ void pci_add_dma_alias(struct pci_dev *dev, u8 devfn) { dev->dma_alias_devfn = devfn; dev->dev_flags |= PCI_DEV_FLAGS_DMA_ALIAS_DEVFN; + dev_info(&dev->dev, "Enabling fixed DMA alias to %02x.%d\n", + PCI_SLOT(devfn), PCI_FUNC(devfn)); } bool pci_device_is_present(struct pci_dev *pdev) diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c index e45a7a8338bb..7559e4024447 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -3691,12 +3691,8 @@ static void quirk_fixed_dma_alias(struct pci_dev *dev) const struct pci_device_id *id; id = pci_match_id(fixed_dma_alias_tbl, dev); - if (id) { + if (id) pci_add_dma_alias(dev, id->driver_data); - dev_info(&dev->dev, "Enabling fixed DMA alias to %02x.%d\n", - PCI_SLOT(id->driver_data), - PCI_FUNC(id->driver_data)); - } } DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_ADAPTEC2, 0x0285, quirk_fixed_dma_alias); |