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

Commit 6c1a32e0 authored by Rajat Jain's avatar Rajat Jain Committed by Bjorn Helgaas
Browse files

PCI: pciehp: Remove struct controller.no_cmd_complete 



"no_cmd_complete" is only used once, and it duplicates read-only
information we already have in the cached Slot Capabilities value.

Remove the field and use the existing macro NO_CMD_CMPL() instead.

[bhelgaas: changelog]
Signed-off-by: default avatarRajat Jain <rajatxjain@gmail.com>
Signed-off-by: default avatarRajat Jain <rajatjain@juniper.net>
Signed-off-by: default avatarGuenter Roeck <groeck@juniper.net>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent 2cc56f30

drivers/pci/hotplug/pciehp.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -96,7 +96,6 @@ struct controller { 
	struct timer_list poll_timer;

	struct timer_list poll_timer;

	unsigned long cmd_started;	/* jiffies */

	unsigned long cmd_started;	/* jiffies */

	unsigned int cmd_busy:1;

	unsigned int cmd_busy:1;

	unsigned int no_cmd_complete:1;

	unsigned int link_active_reporting:1;

	unsigned int link_active_reporting:1;

	unsigned int notification_enabled:1;

	unsigned int notification_enabled:1;

	unsigned int power_fault_detected;

	unsigned int power_fault_detected;

drivers/pci/hotplug/pciehp_hpc.c

+1 −10
Original line number Original line Diff line number Diff line
@@ -140,7 +140,7 @@ static void pcie_wait_cmd(struct controller *ctrl) 
	 * If the controller does not generate notifications for command

	 * If the controller does not generate notifications for command

	 * completions, we never need to wait between writes.

	 * completions, we never need to wait between writes.

	 */

	 */

	if (ctrl->no_cmd_complete)

	if (NO_CMD_CMPL(ctrl))

		return;

		return;





	if (!ctrl->cmd_busy)

	if (!ctrl->cmd_busy)
@@ -772,15 +772,6 @@ struct controller *pcie_init(struct pcie_device *dev) 
	init_waitqueue_head(&ctrl->queue);

	init_waitqueue_head(&ctrl->queue);

	dbg_ctrl(ctrl);

	dbg_ctrl(ctrl);





	/*

	 * Controller doesn't notify of command completion if the "No

	 * Command Completed Support" bit is set in Slot Capabilities.

	 * If set, it means the controller can accept hotplug commands

	 * with no delay between them.

	 */

	if (NO_CMD_CMPL(ctrl))

		ctrl->no_cmd_complete = 1;



	/* Check if Data Link Layer Link Active Reporting is implemented */

	/* Check if Data Link Layer Link Active Reporting is implemented */

	pcie_capability_read_dword(pdev, PCI_EXP_LNKCAP, &link_cap);

	pcie_capability_read_dword(pdev, PCI_EXP_LNKCAP, &link_cap);

	if (link_cap & PCI_EXP_LNKCAP_DLLLARC) {

	if (link_cap & PCI_EXP_LNKCAP_DLLLARC) {