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

Commit 9194094b authored by Denis Efremov's avatar Denis Efremov Committed by Bjorn Helgaas
Browse files

PCI: pciehp: Remove pciehp_green_led_{on,off,blink}() 

Remove pciehp_green_led_{on,off,blink}() and use pciehp_set_indicators()
instead, since the code is mostly the same.

[bhelgaas: drop set_power_indicator() wrapper to reduce the number of
interfaces]
Link: https://lore.kernel.org/r/20190903111021.1559-5-efremov@linux.com


Signed-off-by: default avatarDenis Efremov <efremov@linux.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Reviewed-by: default avatarKuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>
parent 106feb2f

drivers/pci/hotplug/pciehp.h

+0 −3
Original line number Diff line number Diff line
@@ -172,9 +172,6 @@ void pciehp_set_indicators(struct controller *ctrl, int pwr, int attn); 


void pciehp_get_latch_status(struct controller *ctrl, u8 *status);

int pciehp_query_power_fault(struct controller *ctrl);

void pciehp_green_led_on(struct controller *ctrl);

void pciehp_green_led_off(struct controller *ctrl);

void pciehp_green_led_blink(struct controller *ctrl);

bool pciehp_card_present(struct controller *ctrl);

bool pciehp_card_present_or_link_active(struct controller *ctrl);

int pciehp_check_link_status(struct controller *ctrl);

drivers/pci/hotplug/pciehp_ctrl.c

+7 −4
Original line number Diff line number Diff line
@@ -68,7 +68,8 @@ static int board_added(struct controller *ctrl) 
			return retval;

	}



	pciehp_green_led_blink(ctrl);

	pciehp_set_indicators(ctrl, PCI_EXP_SLTCTL_PWR_IND_BLINK,

			      INDICATOR_NOOP);



	/* Check link training status */

	retval = pciehp_check_link_status(ctrl);
@@ -126,8 +127,8 @@ static void remove_board(struct controller *ctrl, bool safe_removal) 
			   &ctrl->pending_events);

	}



	/* turn off Green LED */

	pciehp_green_led_off(ctrl);

	pciehp_set_indicators(ctrl, PCI_EXP_SLTCTL_PWR_IND_OFF,

			      INDICATOR_NOOP);

}



static int pciehp_enable_slot(struct controller *ctrl);
@@ -314,7 +315,9 @@ static int pciehp_enable_slot(struct controller *ctrl) 
	pm_runtime_get_sync(&ctrl->pcie->port->dev);

	ret = __pciehp_enable_slot(ctrl);

	if (ret && ATTN_BUTTN(ctrl))

		pciehp_green_led_off(ctrl); /* may be blinking */

		/* may be blinking */

		pciehp_set_indicators(ctrl, PCI_EXP_SLTCTL_PWR_IND_OFF,

				      INDICATOR_NOOP);

	pm_runtime_put(&ctrl->pcie->port->dev);



	mutex_lock(&ctrl->state_lock);

drivers/pci/hotplug/pciehp_hpc.c

+0 −36
Original line number Diff line number Diff line
@@ -454,42 +454,6 @@ void pciehp_set_indicators(struct controller *ctrl, int pwr, int attn) 
	}

}



void pciehp_green_led_on(struct controller *ctrl)

{

	if (!PWR_LED(ctrl))

		return;



	pcie_write_cmd_nowait(ctrl, PCI_EXP_SLTCTL_PWR_IND_ON,

			      PCI_EXP_SLTCTL_PIC);

	ctrl_dbg(ctrl, "%s: SLOTCTRL %x write cmd %x\n", __func__,

		 pci_pcie_cap(ctrl->pcie->port) + PCI_EXP_SLTCTL,

		 PCI_EXP_SLTCTL_PWR_IND_ON);

}



void pciehp_green_led_off(struct controller *ctrl)

{

	if (!PWR_LED(ctrl))

		return;



	pcie_write_cmd_nowait(ctrl, PCI_EXP_SLTCTL_PWR_IND_OFF,

			      PCI_EXP_SLTCTL_PIC);

	ctrl_dbg(ctrl, "%s: SLOTCTRL %x write cmd %x\n", __func__,

		 pci_pcie_cap(ctrl->pcie->port) + PCI_EXP_SLTCTL,

		 PCI_EXP_SLTCTL_PWR_IND_OFF);

}



void pciehp_green_led_blink(struct controller *ctrl)

{

	if (!PWR_LED(ctrl))

		return;



	pcie_write_cmd_nowait(ctrl, PCI_EXP_SLTCTL_PWR_IND_BLINK,

			      PCI_EXP_SLTCTL_PIC);

	ctrl_dbg(ctrl, "%s: SLOTCTRL %x write cmd %x\n", __func__,

		 pci_pcie_cap(ctrl->pcie->port) + PCI_EXP_SLTCTL,

		 PCI_EXP_SLTCTL_PWR_IND_BLINK);

}



int pciehp_power_on_slot(struct controller *ctrl)

{

	struct pci_dev *pdev = ctrl_dev(ctrl);