| Message ID | 53AC6D6F.5000308@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Delegated to: | Bjorn Helgaas |
| Headers | show |
On Thu, Jun 26, 2014 at 11:58:55AM -0700, Rajat Jain wrote: > After following recent cleanups by Bjorn: > > http://git.kernel.org/cgit/linux/kernel/git/helgaas/pci.git/log/?h=pci/hotplug > > 2cc56f3 PCI: pciehp: Remove assumptions about which commands cause > 40b9608 PCI: pciehp: Compute timeout from hotplug command start time > 3461a06 PCI: pciehp: Wait for hotplug command completion lazily > 4283c70 PCI: pciehp: Make pcie_wait_cmd() self-contained > > the bitfield no_cmd_complete is not really needed anymore, as there is > only a single occurance of its use. Hence remove the unnecessary bit > field, and use existing macro NO_CMD_CMPL() instead. > > Signed-off-by: Rajat Jain <rajatxjain@gmail.com> > Signed-off-by: Rajat Jain <rajatjain@juniper.net> > Signed-off-by: Guenter Roeck <groeck@juniper.net> Great, thanks for fixing this! Applied to pci/hotplug for v3.17. > --- > (This is rebased on top of Bjorn's pci/hotplug branch mentioned above) > > 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 c496258..9e5a9fb 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 a3a5c65..f7c3709 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) { > -- > 1.7.9.5 > -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/pci/hotplug/pciehp.h b/drivers/pci/hotplug/pciehp.h index c496258..9e5a9fb 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 a3a5c65..f7c3709 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) {