linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / drivers / pci / pci.h

diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
index 08d58fc..a6dfee2 100644 (file)
--- a/drivers/pci/pci.h
+++ b/drivers/pci/pci.h
@@ -6,10 +6,10 @@ 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,
+                                 unsigned long size, unsigned long align,
+                                 unsigned long min, unsigned int type_mask,
                                  void (*alignf)(void *, struct resource *,
-                                             resource_size_t, resource_size_t),
+                                                unsigned long, unsigned long),
                                  void *alignf_data);
 /* Firmware callbacks */
 extern int (*platform_pci_choose_state)(struct pci_dev *dev, pm_message_t state);
@@ -40,41 +40,20 @@ extern int pci_bus_find_capability (struct pci_bus *bus, unsigned int devfn, int
 extern void pci_remove_legacy_files(struct pci_bus *bus);
 
 /* Lock for read/write access to pci device and bus lists */
-extern struct rw_semaphore pci_bus_sem;
+extern spinlock_t pci_bus_lock;
 
 #ifdef CONFIG_X86_IO_APIC
 extern int pci_msi_quirk;
 #else
 #define pci_msi_quirk 0
 #endif
-extern unsigned int pci_pm_d3_delay;
+
 #ifdef CONFIG_PCI_MSI
 void disable_msi_mode(struct pci_dev *dev, int pos, int type);
-void pci_no_msi(void);
 #else
 static inline void disable_msi_mode(struct pci_dev *dev, int pos, int type) { }
-static inline void pci_no_msi(void) { }
-#endif
-#if defined(CONFIG_PCI_MSI) && defined(CONFIG_PM)
-int pci_save_msi_state(struct pci_dev *dev);
-int pci_save_msix_state(struct pci_dev *dev);
-void pci_restore_msi_state(struct pci_dev *dev);
-void pci_restore_msix_state(struct pci_dev *dev);
-#else
-static inline int pci_save_msi_state(struct pci_dev *dev) { return 0; }
-static inline int pci_save_msix_state(struct pci_dev *dev) { return 0; }
-static inline void pci_restore_msi_state(struct pci_dev *dev) {}
-static inline void pci_restore_msix_state(struct pci_dev *dev) {}
 #endif
-static inline int pci_no_d1d2(struct pci_dev *dev)
-{
-       unsigned int parent_dstates = 0;
-
-       if (dev->bus->self)
-               parent_dstates = dev->bus->self->no_d1d2;
-       return (dev->no_d1d2 || parent_dstates);
 
-}
 extern int pcie_mch_quirk;
 extern struct device_attribute pci_dev_attrs[];
 extern struct class_device_attribute class_device_attr_cpuaffinity;