Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 92333526 authored by Kenji Kaneshige's avatar Kenji Kaneshige Committed by Greg Kroah-Hartman
Browse files

pciehp: Adapt to device driver model 



This patch adapts PCIEHP driver to PCI device driver model.

Signed-off-by: default avatarKenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Signed-off-by: default avatarKristen Carlson Accardi <kristen.c.accardi@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 5d386e1a

drivers/pci/hotplug/pciehp.h

+0 −3
Original line number Diff line number Diff line
@@ -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;

drivers/pci/hotplug/pciehp_core.c

+6 −32
Original line number Diff line number Diff line
@@ -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 <dan.zink@compaq.com>, Greg Kroah-Hartman <greg@kroah.com>, Dely Sy <dely.l.sy@intel.com>"
@@ -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;

	struct pci_dev *pdev = dev->port;

	struct controller *ctrl = pci_get_drvdata(pdev);



	while (ctrl) {

	cleanup_slots(ctrl);



	ctrl->hpc_ops->release_ctlr(ctrl);



		tctrl = ctrl;

		ctrl = ctrl->next;



		kfree(tctrl);

	}

}



static void pciehp_remove (struct pcie_device *device)

{

	/* XXX - Needs to be adapted to device driver model */

	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");

}