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

Commit e23727da authored by Kenji Kaneshige's avatar Kenji Kaneshige Committed by Jesse Barnes
Browse files

PCI: pciehp: remove num_slots field 



Since PCIe downstream port has only one slot at most, we don't need
num_slots field in struct controller. Note that struct controller
itself doesn't exist if PCIe downstream port has no slot.

Acked-by: default avatarAlex Chiang <achiang@hp.com>
Signed-off-by: default avatarKenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
parent 8720d27d

drivers/pci/hotplug/pciehp.h

+0 −1
Original line number Diff line number Diff line
@@ -93,7 +93,6 @@ struct event_info { 
struct controller {

	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 pcie_device *pcie;	/* PCI Express port service */

drivers/pci/hotplug/pciehp_hpc.c

+0 −1
Original line number Diff line number Diff line
@@ -1025,7 +1025,6 @@ struct controller *pcie_init(struct pcie_device *dev) 
	ctrl->slot_cap = slot_cap;

	ctrl->first_slot = slot_cap >> 19;

	ctrl->slot_device_offset = 0;

	ctrl->num_slots = 1;

	ctrl->hpc_ops = &pciehp_hpc_ops;

	mutex_init(&ctrl->crit_sect);

	mutex_init(&ctrl->ctrl_lock);