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

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

PCI: pciehp: remove number field 



Since slot_cap field in struct controller contains physical slot
number informationq, we don't need number field in struct 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 82a9e79e

drivers/pci/hotplug/pciehp.h

+0 −1
Original line number Diff line number Diff line
@@ -73,7 +73,6 @@ do { \ 
#define SLOT_NAME_SIZE 10

struct slot {

	u8 state;

	u32 number;

	struct controller *ctrl;

	struct hotplug_slot *hotplug_slot;

	struct delayed_work work;	/* work for button event */

drivers/pci/hotplug/pciehp_core.c

+2 −2
Original line number Diff line number Diff line
@@ -121,11 +121,11 @@ static int init_slot(struct controller *ctrl) 
	hotplug->release = &release_slot;

	hotplug->ops = &pciehp_hotplug_slot_ops;

	slot->hotplug_slot = hotplug;

	snprintf(name, SLOT_NAME_SIZE, "%u", slot->number);

	snprintf(name, SLOT_NAME_SIZE, "%u", PSN(ctrl));



	ctrl_dbg(ctrl, "Registering domain:bus:dev=%04x:%02x:00 sun=%x\n",

		 pci_domain_nr(ctrl->pcie->port->subordinate),

		 ctrl->pcie->port->subordinate->number, slot->number);

		 ctrl->pcie->port->subordinate->number, PSN(ctrl));

	retval = pci_hp_register(hotplug,

				 ctrl->pcie->port->subordinate, 0, name);

	if (retval) {

drivers/pci/hotplug/pciehp_hpc.c

+0 −1
Original line number Diff line number Diff line
@@ -901,7 +901,6 @@ static int pcie_init_slot(struct controller *ctrl) 
		return -ENOMEM;



	slot->ctrl = ctrl;

	slot->number = PSN(ctrl);

	mutex_init(&slot->lock);

	INIT_DELAYED_WORK(&slot->work, pciehp_queue_pushbutton_work);

	ctrl->slot = slot;