Skip to content

Commit

Permalink
PCI: pciehp: Remove struct controller.no_cmd_complete
Browse files Browse the repository at this point in the history
"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 <rajatxjain@gmail.com>
Signed-off-by: Rajat Jain <rajatjain@juniper.net>
Signed-off-by: Guenter Roeck <groeck@juniper.net>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
  • Loading branch information
Rajat Jain authored and Bjorn Helgaas committed Jul 5, 2014
1 parent 2cc56f3 commit 6c1a32e
Showing 2 changed files with 1 addition and 11 deletions.
1 change: 0 additions & 1 deletion drivers/pci/hotplug/pciehp.h
Original file line number Diff line number Diff line change
@@ -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;
11 changes: 1 addition & 10 deletions drivers/pci/hotplug/pciehp_hpc.c
Original file line number Diff line number Diff line change
@@ -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) {

0 comments on commit 6c1a32e

Please sign in to comment.