mirror of
https://github.com/Fishwaldo/build.git
synced 2025-03-29 18:21:27 +00:00
67 lines
2.3 KiB
Diff
67 lines
2.3 KiB
Diff
From: Russell King <rmk+kernel@arm.linux.org.uk>
|
|
Subject: [PATCH 38/84] pci: mvebu: use port->name rather than "PCIe%d.%d"
|
|
MIME-Version: 1.0
|
|
Content-Disposition: inline
|
|
Content-Transfer-Encoding: 8bit
|
|
Content-Type: text/plain; charset="utf-8"
|
|
|
|
Use the port->name string which we previously formatted when referring
|
|
to the name of a port, rather than manually creating the port name each
|
|
time.
|
|
|
|
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
|
|
---
|
|
drivers/pci/host/pci-mvebu.c | 16 ++++++++--------
|
|
1 file changed, 8 insertions(+), 8 deletions(-)
|
|
|
|
diff --git a/drivers/pci/host/pci-mvebu.c b/drivers/pci/host/pci-mvebu.c
|
|
index 8c715444b722..19144ed7bdad 100644
|
|
--- a/drivers/pci/host/pci-mvebu.c
|
|
+++ b/drivers/pci/host/pci-mvebu.c
|
|
@@ -1006,8 +1006,8 @@ static int mvebu_pcie_probe(struct platform_device *pdev)
|
|
ret = mvebu_get_tgt_attr(np, port->devfn, IORESOURCE_MEM,
|
|
&port->mem_target, &port->mem_attr);
|
|
if (ret < 0) {
|
|
- dev_err(&pdev->dev, "PCIe%d.%d: cannot get tgt/attr for mem window\n",
|
|
- port->port, port->lane);
|
|
+ dev_err(&pdev->dev, "%s: cannot get tgt/attr for mem window\n",
|
|
+ port->name);
|
|
continue;
|
|
}
|
|
|
|
@@ -1025,8 +1025,8 @@ static int mvebu_pcie_probe(struct platform_device *pdev)
|
|
u32 reset_udelay = 20000;
|
|
|
|
port->reset_active_low = flags & OF_GPIO_ACTIVE_LOW;
|
|
- port->reset_name = kasprintf(GFP_KERNEL,
|
|
- "pcie%d.%d-reset", port->port, port->lane);
|
|
+ port->reset_name = kasprintf(GFP_KERNEL, "%s-reset",
|
|
+ port->name);
|
|
of_property_read_u32(child, "reset-delay-us",
|
|
&reset_udelay);
|
|
|
|
@@ -1045,8 +1045,8 @@ static int mvebu_pcie_probe(struct platform_device *pdev)
|
|
|
|
port->clk = of_clk_get_by_name(child, NULL);
|
|
if (IS_ERR(port->clk)) {
|
|
- dev_err(&pdev->dev, "PCIe%d.%d: cannot get clock\n",
|
|
- port->port, port->lane);
|
|
+ dev_err(&pdev->dev, "%s: cannot get clock\n",
|
|
+ port->name);
|
|
continue;
|
|
}
|
|
|
|
@@ -1056,8 +1056,8 @@ static int mvebu_pcie_probe(struct platform_device *pdev)
|
|
|
|
port->base = mvebu_pcie_map_registers(pdev, child, port);
|
|
if (IS_ERR(port->base)) {
|
|
- dev_err(&pdev->dev, "PCIe%d.%d: cannot map registers\n",
|
|
- port->port, port->lane);
|
|
+ dev_err(&pdev->dev, "%s: cannot map registers\n",
|
|
+ port->name);
|
|
port->base = NULL;
|
|
clk_disable_unprepare(port->clk);
|
|
continue;
|
|
--
|
|
2.1.0
|
|
|