* [PATCH v1 0/3] PCI: Rename host functions for consistency
@ 2017-11-13 22:40 ` Bjorn Helgaas
0 siblings, 0 replies; 14+ messages in thread
From: Bjorn Helgaas @ 2017-11-13 22:40 UTC (permalink / raw)
To: linux-arm-kernel
All native host bridge driver probe functions are called *_pci_probe() or
*_pcie_probe() *except* X-Gene's. All "is the link up?" functions are
called *_pcie_link_up() *except* Altera's and Xilinx's. Rename them to be
consistent.
I plan to include these for v4.15 unless there are objections.
---
Bjorn Helgaas (3):
PCI: xgene: Rename xgene_pcie_probe_bridge() to xgene_pcie_probe()
PCI: altera: Rename altera_pcie_link_is_up() to altera_pcie_link_up()
PCI: xilinx: Rename xilinx_pcie_link_is_up() to xilinx_pcie_link_up()
drivers/pci/host/pci-xgene.c | 4 ++--
drivers/pci/host/pcie-altera.c | 8 ++++----
drivers/pci/host/pcie-xilinx.c | 6 +++---
3 files changed, 9 insertions(+), 9 deletions(-)
^ permalink raw reply [flat|nested] 14+ messages in thread* [PATCH v1 1/3] PCI: xgene: Rename xgene_pcie_probe_bridge() to xgene_pcie_probe()
2017-11-13 22:40 ` Bjorn Helgaas
@ 2017-11-13 22:40 ` Bjorn Helgaas
-1 siblings, 0 replies; 14+ messages in thread
From: Bjorn Helgaas @ 2017-11-13 22:40 UTC (permalink / raw)
To: linux-pci
Cc: Lorenzo Pieralisi, Michal Simek, rfi, Sören Brinkmann,
Ley Foon Tan, linux-arm-kernel, Tanmay Inamdar
From: Bjorn Helgaas <bhelgaas@google.com>
Rename xgene_pcie_probe_bridge() to xgene_pcie_probe() to follow the
convention of other drivers. No functional change intended.
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
---
drivers/pci/host/pci-xgene.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/pci/host/pci-xgene.c b/drivers/pci/host/pci-xgene.c
index 087645116ecb..9f53612f6594 100644
--- a/drivers/pci/host/pci-xgene.c
+++ b/drivers/pci/host/pci-xgene.c
@@ -628,7 +628,7 @@ static struct pci_ops xgene_pcie_ops = {
.write = pci_generic_config_write32,
};
-static int xgene_pcie_probe_bridge(struct platform_device *pdev)
+static int xgene_pcie_probe(struct platform_device *pdev)
{
struct device *dev = &pdev->dev;
struct device_node *dn = dev->of_node;
@@ -709,7 +709,7 @@ static struct platform_driver xgene_pcie_driver = {
.of_match_table = of_match_ptr(xgene_pcie_match_table),
.suppress_bind_attrs = true,
},
- .probe = xgene_pcie_probe_bridge,
+ .probe = xgene_pcie_probe,
};
builtin_platform_driver(xgene_pcie_driver);
#endif
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 14+ messages in thread* [PATCH v1 1/3] PCI: xgene: Rename xgene_pcie_probe_bridge() to xgene_pcie_probe()
@ 2017-11-13 22:40 ` Bjorn Helgaas
0 siblings, 0 replies; 14+ messages in thread
From: Bjorn Helgaas @ 2017-11-13 22:40 UTC (permalink / raw)
To: linux-arm-kernel
From: Bjorn Helgaas <bhelgaas@google.com>
Rename xgene_pcie_probe_bridge() to xgene_pcie_probe() to follow the
convention of other drivers. No functional change intended.
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
---
drivers/pci/host/pci-xgene.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/pci/host/pci-xgene.c b/drivers/pci/host/pci-xgene.c
index 087645116ecb..9f53612f6594 100644
--- a/drivers/pci/host/pci-xgene.c
+++ b/drivers/pci/host/pci-xgene.c
@@ -628,7 +628,7 @@ static struct pci_ops xgene_pcie_ops = {
.write = pci_generic_config_write32,
};
-static int xgene_pcie_probe_bridge(struct platform_device *pdev)
+static int xgene_pcie_probe(struct platform_device *pdev)
{
struct device *dev = &pdev->dev;
struct device_node *dn = dev->of_node;
@@ -709,7 +709,7 @@ static struct platform_driver xgene_pcie_driver = {
.of_match_table = of_match_ptr(xgene_pcie_match_table),
.suppress_bind_attrs = true,
},
- .probe = xgene_pcie_probe_bridge,
+ .probe = xgene_pcie_probe,
};
builtin_platform_driver(xgene_pcie_driver);
#endif
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH v1 2/3] PCI: altera: Rename altera_pcie_link_is_up() to altera_pcie_link_up()
2017-11-13 22:40 ` Bjorn Helgaas
@ 2017-11-13 22:40 ` Bjorn Helgaas
-1 siblings, 0 replies; 14+ messages in thread
From: Bjorn Helgaas @ 2017-11-13 22:40 UTC (permalink / raw)
To: linux-pci
Cc: Lorenzo Pieralisi, Michal Simek, rfi, Sören Brinkmann,
Ley Foon Tan, linux-arm-kernel, Tanmay Inamdar
From: Bjorn Helgaas <bhelgaas@google.com>
Rename altera_pcie_link_is_up() to altera_pcie_link_up() to follow the
convention of other drivers. No functional change intended.
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
---
drivers/pci/host/pcie-altera.c | 8 ++++----
1 file 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;
/*
^ permalink raw reply related [flat|nested] 14+ messages in thread* [PATCH v1 2/3] PCI: altera: Rename altera_pcie_link_is_up() to altera_pcie_link_up()
@ 2017-11-13 22:40 ` Bjorn Helgaas
0 siblings, 0 replies; 14+ messages in thread
From: Bjorn Helgaas @ 2017-11-13 22:40 UTC (permalink / raw)
To: linux-arm-kernel
From: Bjorn Helgaas <bhelgaas@google.com>
Rename altera_pcie_link_is_up() to altera_pcie_link_up() to follow the
convention of other drivers. No functional change intended.
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
---
drivers/pci/host/pcie-altera.c | 8 ++++----
1 file 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;
/*
^ permalink raw reply related [flat|nested] 14+ messages in thread* Re: [PATCH v1 2/3] PCI: altera: Rename altera_pcie_link_is_up() to altera_pcie_link_up()
2017-11-13 22:40 ` Bjorn Helgaas
@ 2017-11-14 16:58 ` Ley Foon Tan
-1 siblings, 0 replies; 14+ messages in thread
From: Ley Foon Tan @ 2017-11-14 16:58 UTC (permalink / raw)
To: Bjorn Helgaas, linux-pci
Cc: Lorenzo Pieralisi, Michal Simek, rfi, Sören Brinkmann,
Ley Foon Tan, linux-arm-kernel, Tanmay Inamdar
T24gTW9uLCAyMDE3LTExLTEzIGF0IDE2OjQwIC0wNjAwLCBCam9ybiBIZWxnYWFzIHdyb3RlOgo+
IEZyb206IEJqb3JuIEhlbGdhYXMgPGJoZWxnYWFzQGdvb2dsZS5jb20+Cj4gCj4gUmVuYW1lIGFs
dGVyYV9wY2llX2xpbmtfaXNfdXAoKSB0byBhbHRlcmFfcGNpZV9saW5rX3VwKCkgdG8gZm9sbG93
Cj4gdGhlCj4gY29udmVudGlvbiBvZiBvdGhlciBkcml2ZXJzLsKgwqBObyBmdW5jdGlvbmFsIGNo
YW5nZSBpbnRlbmRlZC4KPiAKPiBTaWduZWQtb2ZmLWJ5OiBCam9ybiBIZWxnYWFzIDxiaGVsZ2Fh
c0Bnb29nbGUuY29tPgo+IC0tLQo+IMKgZHJpdmVycy9wY2kvaG9zdC9wY2llLWFsdGVyYS5jIHzC
oMKgwqDCoDggKysrKy0tLS0KPiDCoDEgZmlsZSBjaGFuZ2VkLCA0IGluc2VydGlvbnMoKyksIDQg
ZGVsZXRpb25zKC0pCj4gCj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvcGNpL2hvc3QvcGNpZS1hbHRl
cmEuYyBiL2RyaXZlcnMvcGNpL2hvc3QvcGNpZS0KPiBhbHRlcmEuYwo+IGluZGV4IGI0NjhiOGNj
Y2Y4ZC4uNWNjNGY1OTRkNzlhIDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvcGNpL2hvc3QvcGNpZS1h
bHRlcmEuYwo+ICsrKyBiL2RyaXZlcnMvcGNpL2hvc3QvcGNpZS1hbHRlcmEuYwo+IEBAIC0xMDUs
NyArMTA1LDcgQEAgc3RhdGljIGlubGluZSB1MzIgY3JhX3JlYWRsKHN0cnVjdCBhbHRlcmFfcGNp
ZQo+ICpwY2llLCBjb25zdCB1MzIgcmVnKQo+IMKgwqDCoMKgwqDCoMKgwqByZXR1cm4gcmVhZGxf
cmVsYXhlZChwY2llLT5jcmFfYmFzZSArIHJlZyk7Cj4gwqB9Cj4gCj4gLXN0YXRpYyBib29sIGFs
dGVyYV9wY2llX2xpbmtfaXNfdXAoc3RydWN0IGFsdGVyYV9wY2llICpwY2llKQo+ICtzdGF0aWMg
Ym9vbCBhbHRlcmFfcGNpZV9saW5rX3VwKHN0cnVjdCBhbHRlcmFfcGNpZSAqcGNpZSkKPiDCoHsK
PiDCoMKgwqDCoMKgwqDCoMKgcmV0dXJuICEhKChjcmFfcmVhZGwocGNpZSwgUlBfTFRTU00pICYg
UlBfTFRTU01fTUFTSykgPT0KPiBMVFNTTV9MMCk7Cj4gwqB9Cj4gQEAgLTE0Miw3ICsxNDIsNyBA
QCBzdGF0aWMgYm9vbCBhbHRlcmFfcGNpZV92YWxpZF9kZXZpY2Uoc3RydWN0Cj4gYWx0ZXJhX3Bj
aWUgKnBjaWUsCj4gwqB7Cj4gwqDCoMKgwqDCoMKgwqDCoC8qIElmIHRoZXJlIGlzIG5vIGxpbmss
IHRoZW4gdGhlcmUgaXMgbm8gZGV2aWNlICovCj4gwqDCoMKgwqDCoMKgwqDCoGlmIChidXMtPm51
bWJlciAhPSBwY2llLT5yb290X2J1c19ucikgewo+IC3CoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC
oMKgwqBpZiAoIWFsdGVyYV9wY2llX2xpbmtfaXNfdXAocGNpZSkpCj4gK8KgwqDCoMKgwqDCoMKg
wqDCoMKgwqDCoMKgwqDCoGlmICghYWx0ZXJhX3BjaWVfbGlua191cChwY2llKSkKPiDCoMKgwqDC
oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqByZXR1cm4gZmFsc2U7Cj4g
wqDCoMKgwqDCoMKgwqDCoH0KPiAKPiBAQCAtNDEyLDcgKzQxMiw3IEBAIHN0YXRpYyB2b2lkIGFs
dGVyYV93YWl0X2xpbmtfcmV0cmFpbihzdHJ1Y3QKPiBhbHRlcmFfcGNpZSAqcGNpZSkKPiDCoMKg
wqDCoMKgwqDCoMKgLyogV2FpdCBmb3IgbGluayBpcyB1cCAqLwo+IMKgwqDCoMKgwqDCoMKgwqBz
dGFydF9qaWZmaWVzID0gamlmZmllczsKPiDCoMKgwqDCoMKgwqDCoMKgZm9yICg7Oykgewo+IC3C
oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqBpZiAoYWx0ZXJhX3BjaWVfbGlua19pc191cChw
Y2llKSkKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgaWYgKGFsdGVyYV9wY2llX2xp
bmtfdXAocGNpZSkpCj4gwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg
wqDCoMKgYnJlYWs7Cj4gCj4gwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqBpZiAodGlt
ZV9hZnRlcihqaWZmaWVzLCBzdGFydF9qaWZmaWVzICsKPiBMSU5LX1VQX1RJTUVPVVQpKSB7Cj4g
QEAgLTQyNyw3ICs0MjcsNyBAQCBzdGF0aWMgdm9pZCBhbHRlcmFfcGNpZV9yZXRyYWluKHN0cnVj
dAo+IGFsdGVyYV9wY2llICpwY2llKQo+IMKgewo+IMKgwqDCoMKgwqDCoMKgwqB1MTYgbGlua2Nh
cCwgbGlua3N0YXQsIGxpbmtjdGw7Cj4gCj4gLcKgwqDCoMKgwqDCoMKgaWYgKCFhbHRlcmFfcGNp
ZV9saW5rX2lzX3VwKHBjaWUpKQo+ICvCoMKgwqDCoMKgwqDCoGlmICghYWx0ZXJhX3BjaWVfbGlu
a191cChwY2llKSkKPiDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoHJldHVybjsKPiAK
PiDCoMKgwqDCoMKgwqDCoMKgLyoKPiAKQWNrZWQtYnk6IExleSBGb29uIFRhbiA8bGV5LmZvb24u
dGFuQGludGVsLmNvbT4=
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH v1 2/3] PCI: altera: Rename altera_pcie_link_is_up() to altera_pcie_link_up()
@ 2017-11-14 16:58 ` Ley Foon Tan
0 siblings, 0 replies; 14+ messages in thread
From: Ley Foon Tan @ 2017-11-14 16:58 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, 2017-11-13 at 16:40 -0600, Bjorn Helgaas wrote:
> From: Bjorn Helgaas <bhelgaas@google.com>
>
> Rename altera_pcie_link_is_up() to altera_pcie_link_up() to follow
> the
> convention of other drivers.??No functional change intended.
>
> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
> ---
> ?drivers/pci/host/pcie-altera.c |????8 ++++----
> ?1 file 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;
>
> ????????/*
>
Acked-by: Ley Foon Tan <ley.foon.tan@intel.com>
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH v1 3/3] PCI: xilinx: Rename xilinx_pcie_link_is_up() to xilinx_pcie_link_up()
2017-11-13 22:40 ` Bjorn Helgaas
@ 2017-11-13 22:40 ` Bjorn Helgaas
-1 siblings, 0 replies; 14+ messages in thread
From: Bjorn Helgaas @ 2017-11-13 22:40 UTC (permalink / raw)
To: linux-pci
Cc: Lorenzo Pieralisi, Michal Simek, rfi, Sören Brinkmann,
Ley Foon Tan, linux-arm-kernel, Tanmay Inamdar
From: Bjorn Helgaas <bhelgaas@google.com>
Rename xilinx_pcie_link_is_up() to xilinx_pcie_link_up() to follow the
convention of other drivers. No functional change intended.
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
---
drivers/pci/host/pcie-xilinx.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/pci/host/pcie-xilinx.c b/drivers/pci/host/pcie-xilinx.c
index 94e13cb8608f..7b5325990f5e 100644
--- a/drivers/pci/host/pcie-xilinx.c
+++ b/drivers/pci/host/pcie-xilinx.c
@@ -129,7 +129,7 @@ static inline void pcie_write(struct xilinx_pcie_port *port, u32 val, u32 reg)
writel(val, port->reg_base + reg);
}
-static inline bool xilinx_pcie_link_is_up(struct xilinx_pcie_port *port)
+static inline bool xilinx_pcie_link_up(struct xilinx_pcie_port *port)
{
return (pcie_read(port, XILINX_PCIE_REG_PSCR) &
XILINX_PCIE_REG_PSCR_LNKUP) ? 1 : 0;
@@ -165,7 +165,7 @@ static bool xilinx_pcie_valid_device(struct pci_bus *bus, unsigned int devfn)
/* Check if link is up when trying to access downstream ports */
if (bus->number != port->root_busno)
- if (!xilinx_pcie_link_is_up(port))
+ if (!xilinx_pcie_link_up(port))
return false;
/* Only one device down on each root port */
@@ -541,7 +541,7 @@ static void xilinx_pcie_init_port(struct xilinx_pcie_port *port)
{
struct device *dev = port->dev;
- if (xilinx_pcie_link_is_up(port))
+ if (xilinx_pcie_link_up(port))
dev_info(dev, "PCIe Link is UP\n");
else
dev_info(dev, "PCIe Link is DOWN\n");
^ permalink raw reply related [flat|nested] 14+ messages in thread* [PATCH v1 3/3] PCI: xilinx: Rename xilinx_pcie_link_is_up() to xilinx_pcie_link_up()
@ 2017-11-13 22:40 ` Bjorn Helgaas
0 siblings, 0 replies; 14+ messages in thread
From: Bjorn Helgaas @ 2017-11-13 22:40 UTC (permalink / raw)
To: linux-arm-kernel
From: Bjorn Helgaas <bhelgaas@google.com>
Rename xilinx_pcie_link_is_up() to xilinx_pcie_link_up() to follow the
convention of other drivers. No functional change intended.
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
---
drivers/pci/host/pcie-xilinx.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/pci/host/pcie-xilinx.c b/drivers/pci/host/pcie-xilinx.c
index 94e13cb8608f..7b5325990f5e 100644
--- a/drivers/pci/host/pcie-xilinx.c
+++ b/drivers/pci/host/pcie-xilinx.c
@@ -129,7 +129,7 @@ static inline void pcie_write(struct xilinx_pcie_port *port, u32 val, u32 reg)
writel(val, port->reg_base + reg);
}
-static inline bool xilinx_pcie_link_is_up(struct xilinx_pcie_port *port)
+static inline bool xilinx_pcie_link_up(struct xilinx_pcie_port *port)
{
return (pcie_read(port, XILINX_PCIE_REG_PSCR) &
XILINX_PCIE_REG_PSCR_LNKUP) ? 1 : 0;
@@ -165,7 +165,7 @@ static bool xilinx_pcie_valid_device(struct pci_bus *bus, unsigned int devfn)
/* Check if link is up when trying to access downstream ports */
if (bus->number != port->root_busno)
- if (!xilinx_pcie_link_is_up(port))
+ if (!xilinx_pcie_link_up(port))
return false;
/* Only one device down on each root port */
@@ -541,7 +541,7 @@ static void xilinx_pcie_init_port(struct xilinx_pcie_port *port)
{
struct device *dev = port->dev;
- if (xilinx_pcie_link_is_up(port))
+ if (xilinx_pcie_link_up(port))
dev_info(dev, "PCIe Link is UP\n");
else
dev_info(dev, "PCIe Link is DOWN\n");
^ permalink raw reply related [flat|nested] 14+ messages in thread* Re: [PATCH v1 3/3] PCI: xilinx: Rename xilinx_pcie_link_is_up() to xilinx_pcie_link_up()
2017-11-13 22:40 ` Bjorn Helgaas
@ 2017-11-14 7:17 ` Michal Simek
-1 siblings, 0 replies; 14+ messages in thread
From: Michal Simek @ 2017-11-14 7:17 UTC (permalink / raw)
To: Bjorn Helgaas, linux-pci
Cc: Lorenzo Pieralisi, Michal Simek, rfi, Sören Brinkmann,
Ley Foon Tan, linux-arm-kernel, Tanmay Inamdar
On 13.11.2017 23:40, Bjorn Helgaas wrote:
> From: Bjorn Helgaas <bhelgaas@google.com>
>
> Rename xilinx_pcie_link_is_up() to xilinx_pcie_link_up() to follow the
> convention of other drivers. No functional change intended.
>
> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
> ---
> drivers/pci/host/pcie-xilinx.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/pci/host/pcie-xilinx.c b/drivers/pci/host/pcie-xilinx.c
> index 94e13cb8608f..7b5325990f5e 100644
> --- a/drivers/pci/host/pcie-xilinx.c
> +++ b/drivers/pci/host/pcie-xilinx.c
> @@ -129,7 +129,7 @@ static inline void pcie_write(struct xilinx_pcie_port *port, u32 val, u32 reg)
> writel(val, port->reg_base + reg);
> }
>
> -static inline bool xilinx_pcie_link_is_up(struct xilinx_pcie_port *port)
> +static inline bool xilinx_pcie_link_up(struct xilinx_pcie_port *port)
> {
> return (pcie_read(port, XILINX_PCIE_REG_PSCR) &
> XILINX_PCIE_REG_PSCR_LNKUP) ? 1 : 0;
> @@ -165,7 +165,7 @@ static bool xilinx_pcie_valid_device(struct pci_bus *bus, unsigned int devfn)
>
> /* Check if link is up when trying to access downstream ports */
> if (bus->number != port->root_busno)
> - if (!xilinx_pcie_link_is_up(port))
> + if (!xilinx_pcie_link_up(port))
> return false;
>
> /* Only one device down on each root port */
> @@ -541,7 +541,7 @@ static void xilinx_pcie_init_port(struct xilinx_pcie_port *port)
> {
> struct device *dev = port->dev;
>
> - if (xilinx_pcie_link_is_up(port))
> + if (xilinx_pcie_link_up(port))
> dev_info(dev, "PCIe Link is UP\n");
> else
> dev_info(dev, "PCIe Link is DOWN\n");
>
Acked-by: Michal Simek <michal.simek@xilinx.com>
Thanks,
Michal
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 14+ messages in thread* [PATCH v1 3/3] PCI: xilinx: Rename xilinx_pcie_link_is_up() to xilinx_pcie_link_up()
@ 2017-11-14 7:17 ` Michal Simek
0 siblings, 0 replies; 14+ messages in thread
From: Michal Simek @ 2017-11-14 7:17 UTC (permalink / raw)
To: linux-arm-kernel
On 13.11.2017 23:40, Bjorn Helgaas wrote:
> From: Bjorn Helgaas <bhelgaas@google.com>
>
> Rename xilinx_pcie_link_is_up() to xilinx_pcie_link_up() to follow the
> convention of other drivers. No functional change intended.
>
> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
> ---
> drivers/pci/host/pcie-xilinx.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/pci/host/pcie-xilinx.c b/drivers/pci/host/pcie-xilinx.c
> index 94e13cb8608f..7b5325990f5e 100644
> --- a/drivers/pci/host/pcie-xilinx.c
> +++ b/drivers/pci/host/pcie-xilinx.c
> @@ -129,7 +129,7 @@ static inline void pcie_write(struct xilinx_pcie_port *port, u32 val, u32 reg)
> writel(val, port->reg_base + reg);
> }
>
> -static inline bool xilinx_pcie_link_is_up(struct xilinx_pcie_port *port)
> +static inline bool xilinx_pcie_link_up(struct xilinx_pcie_port *port)
> {
> return (pcie_read(port, XILINX_PCIE_REG_PSCR) &
> XILINX_PCIE_REG_PSCR_LNKUP) ? 1 : 0;
> @@ -165,7 +165,7 @@ static bool xilinx_pcie_valid_device(struct pci_bus *bus, unsigned int devfn)
>
> /* Check if link is up when trying to access downstream ports */
> if (bus->number != port->root_busno)
> - if (!xilinx_pcie_link_is_up(port))
> + if (!xilinx_pcie_link_up(port))
> return false;
>
> /* Only one device down on each root port */
> @@ -541,7 +541,7 @@ static void xilinx_pcie_init_port(struct xilinx_pcie_port *port)
> {
> struct device *dev = port->dev;
>
> - if (xilinx_pcie_link_is_up(port))
> + if (xilinx_pcie_link_up(port))
> dev_info(dev, "PCIe Link is UP\n");
> else
> dev_info(dev, "PCIe Link is DOWN\n");
>
Acked-by: Michal Simek <michal.simek@xilinx.com>
Thanks,
Michal
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH v1 0/3] PCI: Rename host functions for consistency
2017-11-13 22:40 ` Bjorn Helgaas
@ 2017-11-14 17:21 ` Lorenzo Pieralisi
-1 siblings, 0 replies; 14+ messages in thread
From: Lorenzo Pieralisi @ 2017-11-14 17:21 UTC (permalink / raw)
To: Bjorn Helgaas
Cc: linux-pci, Michal Simek, rfi, Sören Brinkmann, Ley Foon Tan,
linux-arm-kernel, Tanmay Inamdar
On Mon, Nov 13, 2017 at 04:40:36PM -0600, Bjorn Helgaas wrote:
> All native host bridge driver probe functions are called *_pci_probe() or
> *_pcie_probe() *except* X-Gene's. All "is the link up?" functions are
> called *_pcie_link_up() *except* Altera's and Xilinx's. Rename them to be
> consistent.
>
> I plan to include these for v4.15 unless there are objections.
>
> ---
>
> Bjorn Helgaas (3):
> PCI: xgene: Rename xgene_pcie_probe_bridge() to xgene_pcie_probe()
> PCI: altera: Rename altera_pcie_link_is_up() to altera_pcie_link_up()
> PCI: xilinx: Rename xilinx_pcie_link_is_up() to xilinx_pcie_link_up()
>
>
> drivers/pci/host/pci-xgene.c | 4 ++--
> drivers/pci/host/pcie-altera.c | 8 ++++----
> drivers/pci/host/pcie-xilinx.c | 6 +++---
> 3 files changed, 9 insertions(+), 9 deletions(-)
On the series:
Reviewed-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH v1 0/3] PCI: Rename host functions for consistency
@ 2017-11-14 17:21 ` Lorenzo Pieralisi
0 siblings, 0 replies; 14+ messages in thread
From: Lorenzo Pieralisi @ 2017-11-14 17:21 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Nov 13, 2017 at 04:40:36PM -0600, Bjorn Helgaas wrote:
> All native host bridge driver probe functions are called *_pci_probe() or
> *_pcie_probe() *except* X-Gene's. All "is the link up?" functions are
> called *_pcie_link_up() *except* Altera's and Xilinx's. Rename them to be
> consistent.
>
> I plan to include these for v4.15 unless there are objections.
>
> ---
>
> Bjorn Helgaas (3):
> PCI: xgene: Rename xgene_pcie_probe_bridge() to xgene_pcie_probe()
> PCI: altera: Rename altera_pcie_link_is_up() to altera_pcie_link_up()
> PCI: xilinx: Rename xilinx_pcie_link_is_up() to xilinx_pcie_link_up()
>
>
> drivers/pci/host/pci-xgene.c | 4 ++--
> drivers/pci/host/pcie-altera.c | 8 ++++----
> drivers/pci/host/pcie-xilinx.c | 6 +++---
> 3 files changed, 9 insertions(+), 9 deletions(-)
On the series:
Reviewed-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
^ permalink raw reply [flat|nested] 14+ messages in thread