[PATCH] shpchp: fix improper write to Command Completion Detect bit

[powerpc.git] / drivers / pci / hotplug / shpchp.h

diff --git a/drivers/pci/hotplug/shpchp.h b/drivers/pci/hotplug/shpchp.h
index ade8ec1..55b0cd1 100644 (file)
--- a/drivers/pci/hotplug/shpchp.h
+++ b/drivers/pci/hotplug/shpchp.h
@@ -32,6 +32,8 @@
 #include <linux/types.h>
 #include <linux/pci.h>
 #include <linux/delay.h>
+#include <linux/sched.h>       /* signal_pending(), struct timer_list */
+
 #include "pci_hotplug.h"
 
 #if !defined(MODULE)
@@ -96,6 +98,9 @@ struct controller {
        enum pci_bus_speed speed;
        u32 first_slot;         /* First physical slot number */
        u8 slot_bus;            /* Bus where the slots handled by this controller sit */
+       u32 cap_offset;
+       unsigned long mmio_base;
+       unsigned long mmio_size;
 };
 
 struct hotplug_params {
@@ -173,6 +178,7 @@ extern void get_hp_params_from_firmware(struct pci_dev *dev,
                struct hotplug_params *hpp);
 extern int     shpchprm_get_physical_slot_number(struct controller *ctrl,
                u32 *sun, u8 busnum, u8 devnum);
+extern void    shpchp_remove_ctrl_files(struct controller *ctrl);
 
 
 /* Global variables */
@@ -293,12 +299,9 @@ static inline struct slot *shpchp_find_slot (struct controller *ctrl, u8 device)
 
        p_slot = ctrl->slot;
 
-       dbg("p_slot = %p\n", p_slot);
-
        while (p_slot && (p_slot->device != device)) {
                tmp_slot = p_slot;
                p_slot = p_slot->next;
-               dbg("In while loop, p_slot = %p\n", p_slot);
        }
        if (p_slot == NULL) {
                err("ERROR: shpchp_find_slot device=0x%x\n", device);
@@ -313,8 +316,6 @@ static inline int wait_for_ctrl_irq (struct controller *ctrl)
     DECLARE_WAITQUEUE(wait, current);
        int retval = 0;
 
-       dbg("%s : start\n",__FUNCTION__);
-
        add_wait_queue(&ctrl->queue, &wait);
 
        if (!shpchp_poll_mode) {
@@ -328,7 +329,6 @@ static inline int wait_for_ctrl_irq (struct controller *ctrl)
        if (signal_pending(current))
                retval =  -EINTR;
 
-       dbg("%s : end\n", __FUNCTION__);
        return retval;
 }