diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-09 18:17:00 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-09 18:17:00 -0400 |
commit | 41d0ab2a7dfe9e25504169c98eac5e84e5509e3d (patch) | |
tree | cb4e957b0c03494f4e0cc6a3f0f468e4b608dbf1 /include/linux | |
parent | a4531edd75522804dd2b268d8ccc5eaa70748011 (diff) | |
parent | cdb9b9f730eac4f947a2c552806a3a550bf019ef (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/pci.h | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/include/linux/pci.h b/include/linux/pci.h index c62e89270237..e5e24e13a114 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h | |||
@@ -315,8 +315,11 @@ static inline struct pci_bus *pci_scan_bus(int bus, struct pci_ops *ops, void *s | |||
315 | pci_bus_add_devices(root_bus); | 315 | pci_bus_add_devices(root_bus); |
316 | return root_bus; | 316 | return root_bus; |
317 | } | 317 | } |
318 | struct pci_bus *pci_create_bus(struct device *parent, int bus, struct pci_ops *ops, void *sysdata); | ||
319 | struct pci_bus * pci_add_new_bus(struct pci_bus *parent, struct pci_dev *dev, int busnr); | ||
318 | int pci_scan_slot(struct pci_bus *bus, int devfn); | 320 | int pci_scan_slot(struct pci_bus *bus, int devfn); |
319 | struct pci_dev * pci_scan_single_device(struct pci_bus *bus, int devfn); | 321 | struct pci_dev * pci_scan_single_device(struct pci_bus *bus, int devfn); |
322 | void pci_device_add(struct pci_dev *dev, struct pci_bus *bus); | ||
320 | unsigned int pci_scan_child_bus(struct pci_bus *bus); | 323 | unsigned int pci_scan_child_bus(struct pci_bus *bus); |
321 | void pci_bus_add_device(struct pci_dev *dev); | 324 | void pci_bus_add_device(struct pci_dev *dev); |
322 | void pci_read_bridge_bases(struct pci_bus *child); | 325 | void pci_read_bridge_bases(struct pci_bus *child); |
@@ -377,32 +380,32 @@ static inline int pci_write_config_dword(struct pci_dev *dev, int where, u32 val | |||
377 | return pci_bus_write_config_dword (dev->bus, dev->devfn, where, val); | 380 | return pci_bus_write_config_dword (dev->bus, dev->devfn, where, val); |
378 | } | 381 | } |
379 | 382 | ||
380 | int pci_enable_device(struct pci_dev *dev); | 383 | int __must_check pci_enable_device(struct pci_dev *dev); |
381 | int pci_enable_device_bars(struct pci_dev *dev, int mask); | 384 | int __must_check pci_enable_device_bars(struct pci_dev *dev, int mask); |
382 | void pci_disable_device(struct pci_dev *dev); | 385 | void pci_disable_device(struct pci_dev *dev); |
383 | void pci_set_master(struct pci_dev *dev); | 386 | void pci_set_master(struct pci_dev *dev); |
384 | #define HAVE_PCI_SET_MWI | 387 | #define HAVE_PCI_SET_MWI |
385 | int pci_set_mwi(struct pci_dev *dev); | 388 | int __must_check pci_set_mwi(struct pci_dev *dev); |
386 | void pci_clear_mwi(struct pci_dev *dev); | 389 | void pci_clear_mwi(struct pci_dev *dev); |
387 | void pci_intx(struct pci_dev *dev, int enable); | 390 | void pci_intx(struct pci_dev *dev, int enable); |
388 | int pci_set_dma_mask(struct pci_dev *dev, u64 mask); | 391 | int __must_check pci_set_dma_mask(struct pci_dev *dev, u64 mask); |
389 | int pci_set_consistent_dma_mask(struct pci_dev *dev, u64 mask); | 392 | int __must_check pci_set_consistent_dma_mask(struct pci_dev *dev, u64 mask); |
390 | void pci_update_resource(struct pci_dev *dev, struct resource *res, int resno); | 393 | void pci_update_resource(struct pci_dev *dev, struct resource *res, int resno); |
391 | int pci_assign_resource(struct pci_dev *dev, int i); | 394 | int pci_assign_resource(struct pci_dev *dev, int i); |
392 | void pci_restore_bars(struct pci_dev *dev); | 395 | void pci_restore_bars(struct pci_dev *dev); |
393 | 396 | ||
394 | /* ROM control related routines */ | 397 | /* ROM control related routines */ |
395 | void __iomem *pci_map_rom(struct pci_dev *pdev, size_t *size); | 398 | void __iomem __must_check *pci_map_rom(struct pci_dev *pdev, size_t *size); |
396 | void __iomem *pci_map_rom_copy(struct pci_dev *pdev, size_t *size); | 399 | void __iomem __must_check *pci_map_rom_copy(struct pci_dev *pdev, size_t *size); |
397 | void pci_unmap_rom(struct pci_dev *pdev, void __iomem *rom); | 400 | void pci_unmap_rom(struct pci_dev *pdev, void __iomem *rom); |
398 | void pci_remove_rom(struct pci_dev *pdev); | 401 | void pci_remove_rom(struct pci_dev *pdev); |
399 | 402 | ||
400 | /* Power management related routines */ | 403 | /* Power management related routines */ |
401 | int pci_save_state(struct pci_dev *dev); | 404 | int pci_save_state(struct pci_dev *dev); |
402 | int pci_restore_state(struct pci_dev *dev); | 405 | int pci_restore_state(struct pci_dev *dev); |
403 | int pci_set_power_state(struct pci_dev *dev, pci_power_t state); | 406 | int __must_check pci_set_power_state(struct pci_dev *dev, pci_power_t state); |
404 | pci_power_t pci_choose_state(struct pci_dev *dev, pm_message_t state); | 407 | pci_power_t __must_check pci_choose_state(struct pci_dev *dev, pm_message_t state); |
405 | int pci_enable_wake(struct pci_dev *dev, pci_power_t state, int enable); | 408 | int __must_check pci_enable_wake(struct pci_dev *dev, pci_power_t state, int enable); |
406 | 409 | ||
407 | /* Helper functions for low-level code (drivers/pci/setup-[bus,res].c) */ | 410 | /* Helper functions for low-level code (drivers/pci/setup-[bus,res].c) */ |
408 | void pci_bus_assign_resources(struct pci_bus *bus); | 411 | void pci_bus_assign_resources(struct pci_bus *bus); |