iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PCI: pciehp: Remove struct controller.no_cmd_complete

Browse Source 
"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>
This commit is contained in:
Rajat Jain 2014-06-26 11:58:55 -07:00 committed by Bjorn Helgaas
parent 2cc56f3028
commit 6c1a32e067
2 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/pci/hotplug/pciehp.h
View File

@ -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;

11
drivers/pci/hotplug/pciehp_hpc.c
View File

@ -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) {