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

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

shpchp: remove shpchprm_get_physical_slot_number 



This patch removes unnecessary shpchprm_get_physical_slot_number()
function.

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 227b84c7

drivers/pci/hotplug/shpchp_core.c

+1 −24
Original line number Diff line number Diff line
@@ -104,23 +104,6 @@ static void make_slot_name(struct slot *slot) 
		 slot->bus, slot->number);

}









static int

shpchprm_get_physical_slot_number(struct controller *ctrl, u32 *sun,

				u8 busnum, u8 devnum)

{

	int offset = devnum - ctrl->slot_device_offset;



	dbg("%s: ctrl->slot_num_inc %d, offset %d\n", __FUNCTION__,

			ctrl->slot_num_inc, offset);

	*sun = (u8) (ctrl->first_slot + ctrl->slot_num_inc *offset);

	return 0;

}







static int init_slots(struct controller *ctrl)

{

	struct slot *slot;
@@ -128,7 +111,6 @@ static int init_slots(struct controller *ctrl) 
	struct hotplug_slot_info *info;

	int retval = -ENOMEM;

	int i;

	u32 sun;



	for (i = 0; i < ctrl->num_slots; i++) {

		slot = kzalloc(sizeof(*slot), GFP_KERNEL);
@@ -152,13 +134,8 @@ static int init_slots(struct controller *ctrl) 
		slot->bus = ctrl->pci_dev->subordinate->number;

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

		slot->hpc_ops = ctrl->hpc_ops;

		slot->number = ctrl->first_slot + (ctrl->slot_num_inc * i);

		mutex_init(&slot->lock);



		if (shpchprm_get_physical_slot_number(ctrl, &sun,

						      slot->bus, slot->device))

			goto error_info;



		slot->number = sun;

		INIT_DELAYED_WORK(&slot->work, queue_pushbutton_work);



		/* register this slot with the hotplug pci core */