From 6c1a32e06758ba1c997f81a3c41e780cfc77b3c2 Mon Sep 17 00:00:00 2001 From: Rajat Jain Date: Thu, 26 Jun 2014 11:58:55 -0700 Subject: [PATCH] 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: Rajat Jain Signed-off-by: Rajat Jain Signed-off-by: Guenter Roeck Signed-off-by: Bjorn Helgaas --- drivers/pci/hotplug/pciehp.h | 1 - drivers/pci/hotplug/pciehp_hpc.c | 11 +---------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/drivers/pci/hotplug/pciehp.h b/drivers/pci/hotplug/pciehp.h index c496258cd9a7..9e5a9fbb93d7 100644 --- a/drivers/pci/hotplug/pciehp.h +++ b/drivers/pci/hotplug/pciehp.h @@ -96,7 +96,6 @@ struct controller { struct timer_list poll_timer; unsigned long cmd_started; /* jiffies */ unsigned int cmd_busy:1; - unsigned int no_cmd_complete:1; unsigned int link_active_reporting:1; unsigned int notification_enabled:1; unsigned int power_fault_detected; diff --git a/drivers/pci/hotplug/pciehp_hpc.c b/drivers/pci/hotplug/pciehp_hpc.c index a3a5c65def1c..f7c370993ab4 100644 --- a/drivers/pci/hotplug/pciehp_hpc.c +++ b/drivers/pci/hotplug/pciehp_hpc.c @@ -140,7 +140,7 @@ static void pcie_wait_cmd(struct controller *ctrl) * If the controller does not generate notifications for command * completions, we never need to wait between writes. */ - if (ctrl->no_cmd_complete) + if (NO_CMD_CMPL(ctrl)) return; if (!ctrl->cmd_busy) @@ -772,15 +772,6 @@ struct controller *pcie_init(struct pcie_device *dev) init_waitqueue_head(&ctrl->queue); 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 */ pcie_capability_read_dword(pdev, PCI_EXP_LNKCAP, &link_cap); if (link_cap & PCI_EXP_LNKCAP_DLLLARC) { -- GitLab