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

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

PCI Hotplug: pciehp: remove needless hp_slot calculation 



Remove needless hp_slot calculation. 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 0837974d

drivers/pci/hotplug/pciehp_ctrl.c

+2 −11
Original line number Diff line number Diff line
@@ -213,15 +213,12 @@ static void set_slot_off(struct controller *ctrl, struct slot * pslot) 
 */

static int board_added(struct slot *p_slot)

{

	u8 hp_slot;

	int retval = 0;

	struct controller *ctrl = p_slot->ctrl;



	hp_slot = p_slot->device - ctrl->slot_device_offset;



	dbg("%s: slot device, slot offset, hp slot = %d, %d ,%d\n",

			__FUNCTION__, p_slot->device,

			ctrl->slot_device_offset, hp_slot);

			ctrl->slot_device_offset, p_slot->hp_slot);



	if (POWER_CTRL(ctrl->ctrlcap)) {

		/* Power on slot */
@@ -279,8 +276,6 @@ static int board_added(struct slot *p_slot) 
 */

static int remove_board(struct slot *p_slot)

{

	u8 device;

	u8 hp_slot;

	int retval = 0;

	struct controller *ctrl = p_slot->ctrl;
@@ -288,11 +283,7 @@ static int remove_board(struct slot *p_slot) 
	if (retval)

		return retval;



	device = p_slot->device;

	hp_slot = p_slot->device - ctrl->slot_device_offset;

	p_slot = pciehp_find_slot(ctrl, hp_slot + ctrl->slot_device_offset);



	dbg("In %s, hp_slot = %d\n", __FUNCTION__, hp_slot);

	dbg("In %s, hp_slot = %d\n", __FUNCTION__, p_slot->hp_slot);



	if (POWER_CTRL(ctrl->ctrlcap)) {

		/* power off slot */