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

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

shpchp: cleanup struct controller 



This patch removes unused/unnecessary members from struct controller.

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 0abe68ce

drivers/pci/hotplug/shpchp.h

+0 −6
Original line number Diff line number Diff line
@@ -89,15 +89,9 @@ struct controller { 
	struct list_head slot_list;

	struct hpc_ops *hpc_ops;

	wait_queue_head_t queue;	/* sleep & wake process */

	u8 bus;

	u8 device;

	u8 function;

	u8 slot_device_offset;

	u8 add_support;

	u32 pcix_misc2_reg;	/* for amd pogo errata */

	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;

drivers/pci/hotplug/shpchp_core.c

+1 −25
Original line number Diff line number Diff line
@@ -149,7 +149,7 @@ static int init_slots(struct controller *ctrl) 


		slot->hp_slot = i;

		slot->ctrl = ctrl;

		slot->bus = ctrl->slot_bus;

		slot->bus = ctrl->pci_dev->subordinate->number;

		slot->device = ctrl->slot_device_offset + i;

		slot->hpc_ops = ctrl->hpc_ops;

		mutex_init(&slot->lock);
@@ -355,7 +355,6 @@ static int shpc_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
{

	int rc;

	struct controller *ctrl;

	struct slot *t_slot;



	if (!is_shpc_capable(pdev))

		return -ENODEV;
@@ -376,16 +375,6 @@ static int shpc_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 


	pci_set_drvdata(pdev, ctrl);



	ctrl->bus = pdev->bus->number;

	ctrl->slot_bus = pdev->subordinate->number;

	ctrl->device = PCI_SLOT(pdev->devfn);

	ctrl->function = PCI_FUNC(pdev->devfn);



	dbg("ctrl bus=0x%x, device=%x, function=%x, irq=%x\n",

	    ctrl->bus, ctrl->device, ctrl->function, pdev->irq);



	ctrl->add_support = 1;



	/* Setup the slot information structures */

	rc = init_slots(ctrl);

	if (rc) {
@@ -393,19 +382,6 @@ static int shpc_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
		goto err_out_release_ctlr;

	}



	/* Now hpc_functions (slot->hpc_ops->functions) are ready  */

	t_slot = shpchp_find_slot(ctrl, ctrl->slot_device_offset);



	/* Check for operation bus speed */

	rc = t_slot->hpc_ops->get_cur_bus_speed(t_slot, &ctrl->speed);

	dbg("%s: t_slot->hp_slot %x\n", __FUNCTION__,t_slot->hp_slot);



	if (rc || ctrl->speed == PCI_SPEED_UNKNOWN) {

		err(SHPC_MODULE_NAME ": Can't get current bus speed. "

		    "Set to 33MHz PCI.\n");

		ctrl->speed = PCI_SPEED_33MHz;

	}



	rc = shpchp_create_ctrl_files(ctrl);

	if (rc)

		goto err_cleanup_slots;