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

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

PCI Hotplug: pciehp: remove needless members from struct controller 



Remove needless members from struct controller. This has no functional
changes.

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 25d6ddcd

drivers/pci/hotplug/pciehp.h

+0 −6
Original line number Diff line number Diff line
@@ -82,24 +82,18 @@ struct event_info { 
};



struct controller {

	struct controller *next;

	struct mutex crit_sect;		/* critical section mutex */

	struct mutex ctrl_lock;		/* controller lock */

	int num_slots;			/* Number of slots on ctlr */

	int slot_num_inc;		/* 1 or -1 */

	struct pci_dev *pci_dev;

	struct list_head slot_list;

	struct slot *slot;

	struct hpc_ops *hpc_ops;

	wait_queue_head_t queue;	/* sleep & wake process */

	u8 bus;

	u8 device;

	u8 function;

	u8 slot_device_offset;

	u32 first_slot;		/* First physical slot number */  /* PCIE only has 1 slot */

	u8 slot_bus;		/* Bus where the slots handled by this controller sit */

	u8 ctrlcap;

	u16 vendor_id;

	u8 cap_base;

	struct timer_list poll_timer;

	volatile int cmd_busy;

drivers/pci/hotplug/pciehp_core.c

+3 −7
Original line number Diff line number Diff line
@@ -453,13 +453,9 @@ static int pciehp_probe(struct pcie_device *dev, const struct pcie_port_service_ 


	pci_set_drvdata(pdev, ctrl);



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

	ctrl->slot_bus = pdev->subordinate->number;  /* bus controlled by this HPC */



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

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

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

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

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

	    __FUNCTION__, pdev->bus->number, PCI_SLOT(pdev->devfn),

	    PCI_FUNC(pdev->devfn), pdev->irq);



	/* Setup the slot information structures */

	rc = init_slots(ctrl);