diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2017-11-14 12:11:28 -0600 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2017-11-14 12:11:28 -0600 |
| commit | afa7745692c552025b3bebe8dd79742c660c4b02 (patch) | |
| tree | 08f97b2e1c940ec840c9116694ff8c3ede4f8553 | |
| parent | 9ceb09cce1a30bdbcff861d1bbbbe0dbb7de05de (diff) | |
| parent | 499c0106f59d1da447cb0d99fdb74db0de5d8c1d (diff) | |
Merge branch 'pci/host-altera' into next
* pci/host-altera:
PCI: altera: Rename altera_pcie_link_is_up() to altera_pcie_link_up()
| -rw-r--r-- | drivers/pci/host/pcie-altera.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/pci/host/pcie-altera.c b/drivers/pci/host/pcie-altera.c index b468b8cccf8d..5cc4f594d79a 100644 --- a/drivers/pci/host/pcie-altera.c +++ b/drivers/pci/host/pcie-altera.c @@ -105,7 +105,7 @@ static inline u32 cra_readl(struct altera_pcie *pcie, const u32 reg) return readl_relaxed(pcie->cra_base + reg); } -static bool altera_pcie_link_is_up(struct altera_pcie *pcie) +static bool altera_pcie_link_up(struct altera_pcie *pcie) { return !!((cra_readl(pcie, RP_LTSSM) & RP_LTSSM_MASK) == LTSSM_L0); } @@ -142,7 +142,7 @@ static bool altera_pcie_valid_device(struct altera_pcie *pcie, { /* If there is no link, then there is no device */ if (bus->number != pcie->root_bus_nr) { - if (!altera_pcie_link_is_up(pcie)) + if (!altera_pcie_link_up(pcie)) return false; } @@ -412,7 +412,7 @@ static void altera_wait_link_retrain(struct altera_pcie *pcie) /* Wait for link is up */ start_jiffies = jiffies; for (;;) { - if (altera_pcie_link_is_up(pcie)) + if (altera_pcie_link_up(pcie)) break; if (time_after(jiffies, start_jiffies + LINK_UP_TIMEOUT)) { @@ -427,7 +427,7 @@ static void altera_pcie_retrain(struct altera_pcie *pcie) { u16 linkcap, linkstat, linkctl; - if (!altera_pcie_link_is_up(pcie)) + if (!altera_pcie_link_up(pcie)) return; /* |