On Wed, Mar 27, 2024 at 01:02:34PM -0500, Bjorn Helgaas wrote: > From: Bjorn Helgaas <bhelgaas@xxxxxxxxxx> > > f646c2a0a668 ("PCI: Return u8 from pci_find_capability() and similar") and > ee8b1c478a9f ("PCI: Return u16 from pci_find_ext_capability() and similar") > updated the return type of the extern declarations, but neglected to update > the type of the stubs used CONFIG_PCI is not enabled. > > Update them to match the extern declarations. > > Signed-off-by: Bjorn Helgaas <bhelgaas@xxxxxxxxxx> Provisionally applied to pci/enumeration for v6.10, let me know if you see any issues. > --- > include/linux/pci.h | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/include/linux/pci.h b/include/linux/pci.h > index b19992a5dfaf..6a09bd9636d5 100644 > --- a/include/linux/pci.h > +++ b/include/linux/pci.h > @@ -2011,10 +2011,9 @@ static inline int pci_register_driver(struct pci_driver *drv) > static inline void pci_unregister_driver(struct pci_driver *drv) { } > static inline u8 pci_find_capability(struct pci_dev *dev, int cap) > { return 0; } > -static inline int pci_find_next_capability(struct pci_dev *dev, u8 post, > - int cap) > +static inline u8 pci_find_next_capability(struct pci_dev *dev, u8 post, int cap) > { return 0; } > -static inline int pci_find_ext_capability(struct pci_dev *dev, int cap) > +static inline u16 pci_find_ext_capability(struct pci_dev *dev, int cap) > { return 0; } > > static inline u64 pci_get_dsn(struct pci_dev *dev) > -- > 2.34.1 >