| Message ID | 1595833615-8049-1-git-send-email-yangtiezhu@loongson.cn (mailing list archive) |
|---|---|
| State | Mainlined, archived |
| Commit | b7360f609f5fa0537667dc1b8036c96bf7e03023 |
| Delegated to: | Bjorn Helgaas |
| Headers | show |
| Series | PCI: Move pci_info() after pci_fixup_device() in pci_setup_device() | expand |
On Mon, Jul 27, 2020 at 03:06:55PM +0800, Tiezhu Yang wrote: > In the current code, we can not see the PCI info after fixup which is > correct to reflect the reality, it is better to move pci_info() after > pci_fixup_device() in pci_setup_device(). > > Signed-off-by: Tiezhu Yang <yangtiezhu@loongson.cn> Applied to pci/enumeration for v5.9, thanks! > --- > drivers/pci/probe.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c > index 2f66988..7c046aed 100644 > --- a/drivers/pci/probe.c > +++ b/drivers/pci/probe.c > @@ -1802,9 +1802,6 @@ int pci_setup_device(struct pci_dev *dev) > dev->revision = class & 0xff; > dev->class = class >> 8; /* upper 3 bytes */ > > - pci_info(dev, "[%04x:%04x] type %02x class %#08x\n", > - dev->vendor, dev->device, dev->hdr_type, dev->class); > - > if (pci_early_dump) > early_dump_pci_device(dev); > > @@ -1822,6 +1819,9 @@ int pci_setup_device(struct pci_dev *dev) > /* Early fixups, before probing the BARs */ > pci_fixup_device(pci_fixup_early, dev); > > + pci_info(dev, "[%04x:%04x] type %02x class %#08x\n", > + dev->vendor, dev->device, dev->hdr_type, dev->class); > + > /* Device class may be changed after fixup */ > class = dev->class >> 8; > > -- > 2.1.0 >
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 2f66988..7c046aed 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -1802,9 +1802,6 @@ int pci_setup_device(struct pci_dev *dev) dev->revision = class & 0xff; dev->class = class >> 8; /* upper 3 bytes */ - pci_info(dev, "[%04x:%04x] type %02x class %#08x\n", - dev->vendor, dev->device, dev->hdr_type, dev->class); - if (pci_early_dump) early_dump_pci_device(dev); @@ -1822,6 +1819,9 @@ int pci_setup_device(struct pci_dev *dev) /* Early fixups, before probing the BARs */ pci_fixup_device(pci_fixup_early, dev); + pci_info(dev, "[%04x:%04x] type %02x class %#08x\n", + dev->vendor, dev->device, dev->hdr_type, dev->class); + /* Device class may be changed after fixup */ class = dev->class >> 8;
In the current code, we can not see the PCI info after fixup which is correct to reflect the reality, it is better to move pci_info() after pci_fixup_device() in pci_setup_device(). Signed-off-by: Tiezhu Yang <yangtiezhu@loongson.cn> --- drivers/pci/probe.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)