diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2014-01-07 17:34:06 -0700 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2014-01-07 17:34:06 -0700 |
commit | 133a36051bc5db5c0a20df41079c246166eab23c (patch) | |
tree | e9f51e954fa65a3f6f35a2f20f6a223de8ac992e /drivers/pci/host | |
parent | 79bf7fc51118e4ffc61a0a8c943b94c394aa3ecc (diff) | |
parent | 58275f2f0a6acd750b0acdc62d6457fb3e0f264e (diff) | |
download | op-kernel-dev-133a36051bc5db5c0a20df41079c246166eab23c.zip op-kernel-dev-133a36051bc5db5c0a20df41079c246166eab23c.tar.gz |
Merge branch 'pci/host-designware' into next
* pci/host-designware:
PCI: designware: Fix indent code style
Diffstat (limited to 'drivers/pci/host')
-rw-r--r-- | drivers/pci/host/pcie-designware.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pci/host/pcie-designware.c b/drivers/pci/host/pcie-designware.c index 4a08d30..17ce88f 100644 --- a/drivers/pci/host/pcie-designware.c +++ b/drivers/pci/host/pcie-designware.c @@ -213,14 +213,14 @@ static int find_valid_pos0(struct pcie_port *pp, int msgvec, int pos, int *pos0) } static void clear_irq_range(struct pcie_port *pp, unsigned int irq_base, - unsigned int nvec, unsigned int pos) + unsigned int nvec, unsigned int pos) { unsigned int i, res, bit, val; for (i = 0; i < nvec; i++) { irq_set_msi_desc_off(irq_base, i, NULL); clear_bit(pos + i, pp->msi_irq_in_use); - /* Disable corresponding interrupt on MSI interrupt controller */ + /* Disable corresponding interrupt on MSI controller */ res = ((pos + i) / 32) * 12; bit = (pos + i) % 32; dw_pcie_rd_own_conf(pp, PCIE_MSI_INTR0_ENABLE + res, 4, &val); |