Merge branch 'lro'

[linux-2.6] / drivers / pci / hotplug / rpaphp.h

diff --git a/drivers/pci/hotplug/rpaphp.h b/drivers/pci/hotplug/rpaphp.h
index 2d9f420dfa4f5b8580c8d5c8ded1aadf8d8c1616..310b6186c0e5f45aa19f11654a49c38fcb839458 100644 (file)
--- a/drivers/pci/hotplug/rpaphp.h
+++ b/drivers/pci/hotplug/rpaphp.h
@@ -30,10 +30,6 @@
 #include <linux/pci.h>
 #include "pci_hotplug.h"
 
-#define        PHB     2
-#define        HOTPLUG 1
-#define        EMBEDDED 0
-
 #define DR_INDICATOR 9002
 #define DR_ENTITY_SENSE 9003
 
@@ -79,11 +75,9 @@ struct slot {
        u32 power_domain;
        char *name;
        char *location;
-       u8 removable;
-       struct device_node *dn; /* slot's device_node in OFDT */
-                               /* dn has phb info */
-       struct pci_dev *bridge; /* slot's pci_dev in pci_devices */
-       struct list_head *pci_devs; /* pci_devs in PCI slot */
+       struct device_node *dn;
+       struct pci_bus *bus;
+       struct list_head *pci_devs;
        struct hotplug_slot *hotplug_slot;
 };
 
@@ -94,12 +88,10 @@ extern int num_slots;
 /* function prototypes */
 
 /* rpaphp_pci.c */
-extern struct pci_dev *rpaphp_find_pci_dev(struct device_node *dn);
-extern int rpaphp_claim_resource(struct pci_dev *dev, int resource);
 extern int rpaphp_enable_pci_slot(struct slot *slot);
-extern int register_pci_slot(struct slot *slot);
-extern int rpaphp_unconfig_pci_adapter(struct slot *slot);
+extern int rpaphp_register_pci_slot(struct slot *slot);
 extern int rpaphp_get_pci_adapter_status(struct slot *slot, int is_init, u8 * value);
+extern int rpaphp_get_sensor_state(struct slot *slot, int *state);
 
 /* rpaphp_core.c */
 extern int rpaphp_add_slot(struct device_node *dn);
@@ -110,8 +102,8 @@ extern int rpaphp_get_drc_props(struct device_node *dn, int *drc_index,
 /* rpaphp_slot.c */
 extern void dealloc_slot_struct(struct slot *slot);
 extern struct slot *alloc_slot_struct(struct device_node *dn, int drc_index, char *drc_name, int power_domain);
-extern int register_slot(struct slot *slot);
-extern int deregister_slot(struct slot *slot);
+extern int rpaphp_register_slot(struct slot *slot);
+extern int rpaphp_deregister_slot(struct slot *slot);
 extern int rpaphp_get_power_status(struct slot *slot, u8 * value);
 extern int rpaphp_set_attention_status(struct slot *slot, u8 status);