Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ce5ccdef authored by Kumar Gala's avatar Kumar Gala Committed by Greg Kroah-Hartman
Browse files

PCI: Move prototypes for pci_bus_find_capability to include/linux/pci.h 



We need pci_bus_find_capability() in some arch/powerpc code so move
the prototype into a header accessible to it.

Also kill the duplicate prototype for pci_bus_alloc_resource().

Signed-off-by: default avatarKumar Gala <galak@kernel.crashing.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 74e8f346

drivers/pci/pci.h

+1 −7
Original line number Diff line number Diff line
@@ -5,12 +5,7 @@ extern int pci_uevent(struct device *dev, char **envp, int num_envp, 
extern int pci_create_sysfs_dev_files(struct pci_dev *pdev);

extern void pci_remove_sysfs_dev_files(struct pci_dev *pdev);

extern void pci_cleanup_rom(struct pci_dev *dev);

extern int pci_bus_alloc_resource(struct pci_bus *bus, struct resource *res,

				  resource_size_t size, resource_size_t align,

				  resource_size_t min, unsigned int type_mask,

				  void (*alignf)(void *, struct resource *,

					      resource_size_t, resource_size_t),

				  void *alignf_data);



/* Firmware callbacks */

extern pci_power_t (*platform_pci_choose_state)(struct pci_dev *dev, pm_message_t state);

extern int (*platform_pci_set_power_state)(struct pci_dev *dev, pci_power_t state);
@@ -35,7 +30,6 @@ static inline int pci_proc_detach_bus(struct pci_bus *bus) { return 0; } 


/* Functions for PCI Hotplug drivers to use */

extern unsigned int pci_do_scan_bus(struct pci_bus *bus);

extern int pci_bus_find_capability (struct pci_bus *bus, unsigned int devfn, int cap);



extern void pci_remove_legacy_files(struct pci_bus *bus);

include/linux/pci.h

+3 −0
Original line number Diff line number Diff line
@@ -578,6 +578,9 @@ int pci_set_power_state(struct pci_dev *dev, pci_power_t state); 
pci_power_t pci_choose_state(struct pci_dev *dev, pm_message_t state);

int pci_enable_wake(struct pci_dev *dev, pci_power_t state, int enable);



/* Functions for PCI Hotplug drivers to use */

int pci_bus_find_capability (struct pci_bus *bus, unsigned int devfn, int cap);



/* Helper functions for low-level code (drivers/pci/setup-[bus,res].c) */

void pci_bus_assign_resources(struct pci_bus *bus);

void pci_bus_size_bridges(struct pci_bus *bus);