aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-09-09 18:17:00 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2005-09-09 18:17:00 -0400
commit41d0ab2a7dfe9e25504169c98eac5e84e5509e3d (patch)
treecb4e957b0c03494f4e0cc6a3f0f468e4b608dbf1 /include/linux
parenta4531edd75522804dd2b268d8ccc5eaa70748011 (diff)
parentcdb9b9f730eac4f947a2c552806a3a550bf019ef (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.h23
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}
318struct pci_bus *pci_create_bus(struct device *parent, int bus, struct pci_ops *ops, void *sysdata);
319struct pci_bus * pci_add_new_bus(struct pci_bus *parent, struct pci_dev *dev, int busnr);
318int pci_scan_slot(struct pci_bus *bus, int devfn); 320int pci_scan_slot(struct pci_bus *bus, int devfn);
319struct pci_dev * pci_scan_single_device(struct pci_bus *bus, int devfn); 321struct pci_dev * pci_scan_single_device(struct pci_bus *bus, int devfn);
322void pci_device_add(struct pci_dev *dev, struct pci_bus *bus);
320unsigned int pci_scan_child_bus(struct pci_bus *bus); 323unsigned int pci_scan_child_bus(struct pci_bus *bus);
321void pci_bus_add_device(struct pci_dev *dev); 324void pci_bus_add_device(struct pci_dev *dev);
322void pci_read_bridge_bases(struct pci_bus *child); 325void 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
380int pci_enable_device(struct pci_dev *dev); 383int __must_check pci_enable_device(struct pci_dev *dev);
381int pci_enable_device_bars(struct pci_dev *dev, int mask); 384int __must_check pci_enable_device_bars(struct pci_dev *dev, int mask);
382void pci_disable_device(struct pci_dev *dev); 385void pci_disable_device(struct pci_dev *dev);
383void pci_set_master(struct pci_dev *dev); 386void pci_set_master(struct pci_dev *dev);
384#define HAVE_PCI_SET_MWI 387#define HAVE_PCI_SET_MWI
385int pci_set_mwi(struct pci_dev *dev); 388int __must_check pci_set_mwi(struct pci_dev *dev);
386void pci_clear_mwi(struct pci_dev *dev); 389void pci_clear_mwi(struct pci_dev *dev);
387void pci_intx(struct pci_dev *dev, int enable); 390void pci_intx(struct pci_dev *dev, int enable);
388int pci_set_dma_mask(struct pci_dev *dev, u64 mask); 391int __must_check pci_set_dma_mask(struct pci_dev *dev, u64 mask);
389int pci_set_consistent_dma_mask(struct pci_dev *dev, u64 mask); 392int __must_check pci_set_consistent_dma_mask(struct pci_dev *dev, u64 mask);
390void pci_update_resource(struct pci_dev *dev, struct resource *res, int resno); 393void pci_update_resource(struct pci_dev *dev, struct resource *res, int resno);
391int pci_assign_resource(struct pci_dev *dev, int i); 394int pci_assign_resource(struct pci_dev *dev, int i);
392void pci_restore_bars(struct pci_dev *dev); 395void pci_restore_bars(struct pci_dev *dev);
393 396
394/* ROM control related routines */ 397/* ROM control related routines */
395void __iomem *pci_map_rom(struct pci_dev *pdev, size_t *size); 398void __iomem __must_check *pci_map_rom(struct pci_dev *pdev, size_t *size);
396void __iomem *pci_map_rom_copy(struct pci_dev *pdev, size_t *size); 399void __iomem __must_check *pci_map_rom_copy(struct pci_dev *pdev, size_t *size);
397void pci_unmap_rom(struct pci_dev *pdev, void __iomem *rom); 400void pci_unmap_rom(struct pci_dev *pdev, void __iomem *rom);
398void pci_remove_rom(struct pci_dev *pdev); 401void pci_remove_rom(struct pci_dev *pdev);
399 402
400/* Power management related routines */ 403/* Power management related routines */
401int pci_save_state(struct pci_dev *dev); 404int pci_save_state(struct pci_dev *dev);
402int pci_restore_state(struct pci_dev *dev); 405int pci_restore_state(struct pci_dev *dev);
403int pci_set_power_state(struct pci_dev *dev, pci_power_t state); 406int __must_check pci_set_power_state(struct pci_dev *dev, pci_power_t state);
404pci_power_t pci_choose_state(struct pci_dev *dev, pm_message_t state); 407pci_power_t __must_check pci_choose_state(struct pci_dev *dev, pm_message_t state);
405int pci_enable_wake(struct pci_dev *dev, pci_power_t state, int enable); 408int __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) */
408void pci_bus_assign_resources(struct pci_bus *bus); 411void pci_bus_assign_resources(struct pci_bus *bus);