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

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

pciehp: remove unused pci_bus from struct controller 



This patch removes unused pci_bus member 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 48fe3915

drivers/pci/hotplug/pciehp.h

+0 −1
Original line number Diff line number Diff line
@@ -78,7 +78,6 @@ struct controller { 
	int num_slots;			/* Number of slots on ctlr */

	int slot_num_inc;		/* 1 or -1 */

	struct pci_dev *pci_dev;

	struct pci_bus *pci_bus;

	struct list_head slot_list;

	struct event_info event_queue[MAX_EVENTS];

	struct slot *slot;

drivers/pci/hotplug/pciehp_core.c

+2 −12
Original line number Diff line number Diff line
@@ -346,13 +346,6 @@ static int pciehp_probe(struct pcie_device *dev, const struct pcie_port_service_ 


	pci_set_drvdata(pdev, ctrl);



	ctrl->pci_bus = kmalloc(sizeof(*ctrl->pci_bus), GFP_KERNEL);

	if (!ctrl->pci_bus) {

		err("%s: out of memory\n", __FUNCTION__);

		rc = -ENOMEM;

		goto err_out_unmap_mmio_region;

	}

	memcpy (ctrl->pci_bus, pdev->bus, sizeof (*ctrl->pci_bus));

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

	ctrl->slot_bus = pdev->subordinate->number;  /* bus controlled by this HPC */
@@ -365,7 +358,7 @@ static int pciehp_probe(struct pcie_device *dev, const struct pcie_port_service_ 
	rc = init_slots(ctrl);

	if (rc) {

		err(msg_initialization_err, 6);

		goto err_out_free_ctrl_slot;

		goto err_out_release_ctlr;

	}



	t_slot = pciehp_find_slot(ctrl, ctrl->slot_device_offset);
@@ -404,8 +397,7 @@ static int pciehp_probe(struct pcie_device *dev, const struct pcie_port_service_ 


err_out_free_ctrl_slot:

	cleanup_slots(ctrl);

	kfree(ctrl->pci_bus);

err_out_unmap_mmio_region:

err_out_release_ctlr:

	ctrl->hpc_ops->release_ctlr(ctrl);

err_out_free_ctrl:

	kfree(ctrl);
@@ -439,8 +431,6 @@ static void __exit unload_pciehpd(void) 
	while (ctrl) {

		cleanup_slots(ctrl);



		kfree (ctrl->pci_bus);



		ctrl->hpc_ops->release_ctlr(ctrl);



		tctrl = ctrl;