This commit was manufactured by cvs2svn to create tag

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

diff --git a/drivers/pci/hotplug/rpaphp.h b/drivers/pci/hotplug/rpaphp.h
index e155c4c..3c860e1 100644 (file)
--- a/drivers/pci/hotplug/rpaphp.h
+++ b/drivers/pci/hotplug/rpaphp.h
@@ -30,9 +30,6 @@
 #include <linux/pci.h>
 #include "pci_hotplug.h"
 
-#define        HOTPLUG 1
-#define        EMBEDDED 0
-
 #define DR_INDICATOR 9002
 #define DR_ENTITY_SENSE 9003
 
@@ -76,45 +73,34 @@ extern int debug;
 #define        CONFIGURED      1
 #define        EMPTY           0
 
-struct rpaphp_pci_func {
-       struct pci_dev *pci_dev;
-       struct list_head sibling;
-};
-
 /*
  * struct slot - slot information for each *physical* slot
  */
 struct slot {
-       struct list_head rpaphp_slot_list;
        int state;
        u32 index;
        u32 type;
        u32 power_domain;
        char *name;
        char *location;
-       u8 removable;
-       u8 dev_type;            /* VIO or PCI */
        struct device_node *dn; /* slot's device_node in OFDT */
-                               /* dn has phb info */
+       /* dn has phb info */
        struct pci_dev *bridge; /* slot's pci_dev in pci_devices */
        union {
-               struct list_head pci_funcs; /* pci_devs in PCI slot */ 
-               struct vio_dev *vio_dev; /* vio_dev in VIO slot */
+               struct pci_dev *pci_dev;        /* pci_dev of device in this slot */
+               /* it will be used for unconfig */
+               /* NULL if slot is empty */
+               struct vio_dev *vio_dev;        /* vio_dev of the device in this slot */
        } dev;
+       u8 dev_type;            /* VIO or PCI */
        struct hotplug_slot *hotplug_slot;
+       struct list_head rpaphp_slot_list;
 };
 
 extern struct hotplug_slot_ops rpaphp_hotplug_slot_ops;
 extern struct list_head rpaphp_slot_head;
 extern int num_slots;
 
-static inline int is_hotplug_capable(struct device_node *dn)
-{
-       unsigned char *ptr = get_property(dn, "ibm,fw-pci-hot-plug-ctrl", NULL);
-
-       return (int) (ptr != NULL);
-}
-
 /* function prototypes */
 
 /* rpaphp_pci.c */
@@ -124,12 +110,10 @@ 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_get_pci_adapter_status(struct slot *slot, int is_init, u8 * value);
-extern struct hotplug_slot *rpaphp_find_hotplug_slot(struct pci_dev *dev);
 
 /* rpaphp_core.c */
 extern int rpaphp_add_slot(struct device_node *dn);
 extern int rpaphp_remove_slot(struct slot *slot);
-extern char *rpaphp_get_drc_name(struct device_node *dn);
 
 /* rpaphp_vio.c */
 extern int rpaphp_get_vio_adapter_status(struct slot *slot, int is_init, u8 * value);
@@ -141,8 +125,8 @@ extern int rpaphp_enable_vio_slot(struct slot *slot);
 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_get_power_status(struct slot *slot, u8 * value);
 extern int rpaphp_set_attention_status(struct slot *slot, u8 status);
+extern void rpaphp_sysfs_remove_attr_location(struct hotplug_slot *slot);
        
 #endif                         /* _PPC64PHP_H */