From: Bjorn Helgaas <bhelgaas@google.com>
Date: Thu, 2 Sep 2021 19:56:44 +0000 (-0500)
Subject: Merge branch 'pci/misc'
X-Git-Tag: v5.15.73~11163^2~19
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=739c4747a25af3a2571f69e4709f2b476a17d5d4;p=platform%2Fkernel%2Flinux-rpi.git

Merge branch 'pci/misc'

- Add pci_numachip_init() declaration (Krzysztof Wilczyński)

- Allocate pci_dev_str_match_path() string atomically (Dan Carpenter)

- Drop error message when Precision Time Measurement supported but not
  enabled (Jakub Kicinski)

- Correct the pci_iomap.h header guard #endif comment (Jonathan Cameron)

- Add schedule point in proc_bus_pci_read() (Krzysztof Wilczyński)

- Make saved capability state private to core (Bjorn Helgaas)

- Sync __pci_register_driver() stub for CONFIG_PCI=n (Andy Shevchenko)

- Convert sta2x11 from PCI-DMA-API to generic DMA-API (Christophe JAILLET)

* pci/misc:
  x86/PCI: sta2x11: switch from 'pci_' to 'dma_' API
  PCI: Sync __pci_register_driver() stub for CONFIG_PCI=n
  PCI: Make saved capability state private to core
  PCI: Add schedule point in proc_bus_pci_read()
  PCI: Correct the pci_iomap.h header guard #endif comment
  PCI/PTM: Remove error message at boot
  PCI: Fix pci_dev_str_match_path() alloc while atomic bug
  x86/PCI: Add pci_numachip_init() declaration

# Conflicts:
#	include/linux/pci.h
---

739c4747a25af3a2571f69e4709f2b476a17d5d4
diff --cc include/linux/pci.h
index bd310ea53f3b,a662f6c1f120..0e29a36accb6
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@@ -294,26 -288,9 +294,14 @@@ enum pci_bus_speed 
  enum pci_bus_speed pcie_get_speed_cap(struct pci_dev *dev);
  enum pcie_link_width pcie_get_width_cap(struct pci_dev *dev);
  
- struct pci_cap_saved_data {
- 	u16		cap_nr;
- 	bool		cap_extended;
- 	unsigned int	size;
- 	u32		data[];
- };
- 
- struct pci_cap_saved_state {
- 	struct hlist_node		next;
- 	struct pci_cap_saved_data	cap;
- };
- 
 +struct pci_vpd {
 +	struct mutex	lock;
 +	unsigned int	len;
 +	u8		cap;
 +};
 +
  struct irq_affinity;
  struct pcie_link_state;
 -struct pci_vpd;
  struct pci_sriov;
  struct pci_p2pdma;
  struct rcec_ea;