Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=9233352628bc8e284f66fc90c4dc74473db1fbc1
Commit:     9233352628bc8e284f66fc90c4dc74473db1fbc1
Parent:     5d386e1ac4025b4bcc6bad6811e771cb76064dfe
Author:     Kenji Kaneshige <[EMAIL PROTECTED]>
AuthorDate: Tue Mar 6 15:02:32 2007 -0800
Committer:  Greg Kroah-Hartman <[EMAIL PROTECTED]>
CommitDate: Wed May 2 19:02:34 2007 -0700

    pciehp: Adapt to device driver model
    
    This patch adapts PCIEHP driver to PCI device driver model.
    
    Signed-off-by: Kenji Kaneshige <[EMAIL PROTECTED]>
    Signed-off-by: Kristen Carlson Accardi <[EMAIL PROTECTED]>
    Signed-off-by: Greg Kroah-Hartman <[EMAIL PROTECTED]>
---
 drivers/pci/hotplug/pciehp.h      |    3 --
 drivers/pci/hotplug/pciehp_core.c |   38 +++++-------------------------------
 2 files changed, 6 insertions(+), 35 deletions(-)

diff --git a/drivers/pci/hotplug/pciehp.h b/drivers/pci/hotplug/pciehp.h
index c98e271..74d0bf6 100644
--- a/drivers/pci/hotplug/pciehp.h
+++ b/drivers/pci/hotplug/pciehp.h
@@ -161,9 +161,6 @@ extern int pciehp_unconfigure_device(struct slot *p_slot);
 extern void queue_pushbutton_work(struct work_struct *work);
 int pcie_init(struct controller *ctrl, struct pcie_device *dev);
 
-/* Global variables */
-extern struct controller *pciehp_ctrl_list;
-
 static inline struct slot *pciehp_find_slot(struct controller *ctrl, u8 device)
 {
        struct slot *slot;
diff --git a/drivers/pci/hotplug/pciehp_core.c 
b/drivers/pci/hotplug/pciehp_core.c
index 749227e..0550edf 100644
--- a/drivers/pci/hotplug/pciehp_core.c
+++ b/drivers/pci/hotplug/pciehp_core.c
@@ -42,7 +42,6 @@ int pciehp_poll_mode;
 int pciehp_poll_time;
 int pciehp_force;
 struct workqueue_struct *pciehp_wq;
-struct controller *pciehp_ctrl_list;
 
 #define DRIVER_VERSION "0.4"
 #define DRIVER_AUTHOR  "Dan Zink <[EMAIL PROTECTED]>, Greg Kroah-Hartman 
<[EMAIL PROTECTED]>, Dely Sy <[EMAIL PROTECTED]>"
@@ -471,14 +470,6 @@ static int pciehp_probe(struct pcie_device *dev, const 
struct pcie_port_service_
 
        t_slot = pciehp_find_slot(ctrl, ctrl->slot_device_offset);
 
-       if (!pciehp_ctrl_list) {
-               pciehp_ctrl_list = ctrl;
-               ctrl->next = NULL;
-       } else {
-               ctrl->next = pciehp_ctrl_list;
-               pciehp_ctrl_list = ctrl;
-       }
-
        t_slot->hpc_ops->get_adapter_status(t_slot, &value); /* Check if slot 
is occupied */
        if ((POWER_CTRL(ctrl->ctrlcap)) && !value) {
                rc = t_slot->hpc_ops->power_off_slot(t_slot); /* Power off slot 
if not occupied*/
@@ -498,28 +489,14 @@ err_out_none:
        return -ENODEV;
 }
 
-static void __exit unload_pciehpd(void)
+static void pciehp_remove (struct pcie_device *dev)
 {
-       struct controller *ctrl;
-       struct controller *tctrl;
-
-       ctrl = pciehp_ctrl_list;
-
-       while (ctrl) {
-               cleanup_slots(ctrl);
-
-               ctrl->hpc_ops->release_ctlr(ctrl);
-
-               tctrl = ctrl;
-               ctrl = ctrl->next;
-
-               kfree(tctrl);
-       }
-}
+       struct pci_dev *pdev = dev->port;
+       struct controller *ctrl = pci_get_drvdata(pdev);
 
-static void pciehp_remove (struct pcie_device *device)
-{
-       /* XXX - Needs to be adapted to device driver model */
+       cleanup_slots(ctrl);
+       ctrl->hpc_ops->release_ctlr(ctrl);
+       kfree(ctrl);
 }
 
 #ifdef CONFIG_PM
@@ -578,10 +555,7 @@ static int __init pcied_init(void)
 static void __exit pcied_cleanup(void)
 {
        dbg("unload_pciehpd()\n");
-       unload_pciehpd();
-
        pcie_port_service_unregister(&hpdriver_portdrv);
-
        info(DRIVER_DESC " version: " DRIVER_VERSION " unloaded\n");
 }
 
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to