Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ab7ea305 authored by Russell King's avatar Russell King Committed by Bjorn Helgaas
Browse files

PCI: mvebu: Use port->name rather than "PCIe%d.%d" 



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.

Tested-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> (Armada XP GP)
Tested-by: Andrew Lunn <andrew@lunn.ch> (Kirkwood DIR665)
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Reviewed-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent 2cdf4ed1

drivers/pci/host/pci-mvebu.c

+8 −8
Original line number Original line Diff line number Diff line
@@ -1006,8 +1006,8 @@ static int mvebu_pcie_probe(struct platform_device *pdev) 
		ret = mvebu_get_tgt_attr(np, port->devfn, IORESOURCE_MEM,

		ret = mvebu_get_tgt_attr(np, port->devfn, IORESOURCE_MEM,

					 &port->mem_target, &port->mem_attr);

					 &port->mem_target, &port->mem_attr);

		if (ret < 0) {

		if (ret < 0) {

			dev_err(&pdev->dev, "PCIe%d.%d: cannot get tgt/attr for mem window\n",

			dev_err(&pdev->dev, "%s: cannot get tgt/attr for mem window\n",

				port->port, port->lane);

				port->name);

			continue;

			continue;

		}

		}
@@ -1025,8 +1025,8 @@ static int mvebu_pcie_probe(struct platform_device *pdev) 
			u32 reset_udelay = 20000;

			u32 reset_udelay = 20000;





			port->reset_active_low = flags & OF_GPIO_ACTIVE_LOW;

			port->reset_active_low = flags & OF_GPIO_ACTIVE_LOW;

			port->reset_name = kasprintf(GFP_KERNEL,

			port->reset_name = kasprintf(GFP_KERNEL, "%s-reset",

				     "pcie%d.%d-reset", port->port, port->lane);

						     port->name);

			of_property_read_u32(child, "reset-delay-us",

			of_property_read_u32(child, "reset-delay-us",

					     &reset_udelay);

					     &reset_udelay);
@@ -1045,8 +1045,8 @@ static int mvebu_pcie_probe(struct platform_device *pdev) 




		port->clk = of_clk_get_by_name(child, NULL);

		port->clk = of_clk_get_by_name(child, NULL);

		if (IS_ERR(port->clk)) {

		if (IS_ERR(port->clk)) {

			dev_err(&pdev->dev, "PCIe%d.%d: cannot get clock\n",

			dev_err(&pdev->dev, "%s: cannot get clock\n",

			       port->port, port->lane);

				port->name);

			continue;

			continue;

		}

		}
@@ -1056,8 +1056,8 @@ static int mvebu_pcie_probe(struct platform_device *pdev) 




		port->base = mvebu_pcie_map_registers(pdev, child, port);

		port->base = mvebu_pcie_map_registers(pdev, child, port);

		if (IS_ERR(port->base)) {

		if (IS_ERR(port->base)) {

			dev_err(&pdev->dev, "PCIe%d.%d: cannot map registers\n",

			dev_err(&pdev->dev, "%s: cannot map registers\n",

				port->port, port->lane);

				port->name);

			port->base = NULL;

			port->base = NULL;

			clk_disable_unprepare(port->clk);

			clk_disable_unprepare(port->clk);

			continue;

			continue;