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

Commit 37c342cb authored by Rob Herring's avatar Rob Herring Committed by Arnd Bergmann
Browse files

soc: Convert to using %pOF instead of full_name 



Now that we have a custom printf format specifier, convert users of
full_name to use %pOF instead. This is preparation to remove storing
of the full path string for each node.

Signed-off-by: default avatarRob Herring <robh@kernel.org>
Acked-by: default avatarKrzysztof Kozlowski <krzk@kernel.org>
Reviewed-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Acked-by: default avatarMatthias Brugger <matthias.bgg@gmail.com>
Acked-by: default avatarSimon Horman <horms+renesas@verge.net.au>
Cc: Scott Wood <oss@buserror.net>
Cc: Qiang Zhao <qiang.zhao@nxp.com>
Cc: Magnus Damm <magnus.damm@gmail.com>
Cc: Kukjin Kim <kgene@kernel.org>
Cc: Javier Martinez Canillas <javier@osg.samsung.com>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 9c0982d8

drivers/soc/fsl/qbman/bman_ccsr.c

+5 −5
Original line number Diff line number Diff line
@@ -177,8 +177,8 @@ static int fsl_bman_probe(struct platform_device *pdev) 


	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	if (!res) {

		dev_err(dev, "Can't get %s property 'IORESOURCE_MEM'\n",

			node->full_name);

		dev_err(dev, "Can't get %pOF property 'IORESOURCE_MEM'\n",

			node);

		return -ENXIO;

	}

	bm_ccsr_start = devm_ioremap(dev, res->start, resource_size(res));
@@ -205,14 +205,14 @@ static int fsl_bman_probe(struct platform_device *pdev) 


	err_irq = platform_get_irq(pdev, 0);

	if (err_irq <= 0) {

		dev_info(dev, "Can't get %s IRQ\n", node->full_name);

		dev_info(dev, "Can't get %pOF IRQ\n", node);

		return -ENODEV;

	}

	ret = devm_request_irq(dev, err_irq, bman_isr, IRQF_SHARED, "bman-err",

			       dev);

	if (ret)  {

		dev_err(dev, "devm_request_irq() failed %d for '%s'\n",

			ret, node->full_name);

		dev_err(dev, "devm_request_irq() failed %d for '%pOF'\n",

			ret, node);

		return ret;

	}

	/* Disable Buffer Pool State Change */

drivers/soc/fsl/qbman/bman_portal.c

+3 −5
Original line number Diff line number Diff line
@@ -103,16 +103,14 @@ static int bman_portal_probe(struct platform_device *pdev) 
	addr_phys[0] = platform_get_resource(pdev, IORESOURCE_MEM,

					     DPAA_PORTAL_CE);

	if (!addr_phys[0]) {

		dev_err(dev, "Can't get %s property 'reg::CE'\n",

			node->full_name);

		dev_err(dev, "Can't get %pOF property 'reg::CE'\n", node);

		return -ENXIO;

	}



	addr_phys[1] = platform_get_resource(pdev, IORESOURCE_MEM,

					     DPAA_PORTAL_CI);

	if (!addr_phys[1]) {

		dev_err(dev, "Can't get %s property 'reg::CI'\n",

			node->full_name);

		dev_err(dev, "Can't get %pOF property 'reg::CI'\n", node);

		return -ENXIO;

	}
@@ -120,7 +118,7 @@ static int bman_portal_probe(struct platform_device *pdev) 


	irq = platform_get_irq(pdev, 0);

	if (irq <= 0) {

		dev_err(dev, "Can't get %s IRQ'\n", node->full_name);

		dev_err(dev, "Can't get %pOF IRQ'\n", node);

		return -ENXIO;

	}

	pcfg->irq = irq;

drivers/soc/fsl/qbman/qman_ccsr.c

+6 −6
Original line number Diff line number Diff line
@@ -695,8 +695,8 @@ static int fsl_qman_probe(struct platform_device *pdev) 


	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	if (!res) {

		dev_err(dev, "Can't get %s property 'IORESOURCE_MEM'\n",

			node->full_name);

		dev_err(dev, "Can't get %pOF property 'IORESOURCE_MEM'\n",

			node);

		return -ENXIO;

	}

	qm_ccsr_start = devm_ioremap(dev, res->start, resource_size(res));
@@ -740,15 +740,15 @@ static int fsl_qman_probe(struct platform_device *pdev) 


	err_irq = platform_get_irq(pdev, 0);

	if (err_irq <= 0) {

		dev_info(dev, "Can't get %s property 'interrupts'\n",

			 node->full_name);

		dev_info(dev, "Can't get %pOF property 'interrupts'\n",

			 node);

		return -ENODEV;

	}

	ret = devm_request_irq(dev, err_irq, qman_isr, IRQF_SHARED, "qman-err",

			       dev);

	if (ret)  {

		dev_err(dev, "devm_request_irq() failed %d for '%s'\n",

			ret, node->full_name);

		dev_err(dev, "devm_request_irq() failed %d for '%pOF'\n",

			ret, node);

		return ret;

	}

drivers/soc/fsl/qbman/qman_portal.c

+4 −7
Original line number Diff line number Diff line
@@ -237,30 +237,27 @@ static int qman_portal_probe(struct platform_device *pdev) 
	addr_phys[0] = platform_get_resource(pdev, IORESOURCE_MEM,

					     DPAA_PORTAL_CE);

	if (!addr_phys[0]) {

		dev_err(dev, "Can't get %s property 'reg::CE'\n",

			node->full_name);

		dev_err(dev, "Can't get %pOF property 'reg::CE'\n", node);

		return -ENXIO;

	}



	addr_phys[1] = platform_get_resource(pdev, IORESOURCE_MEM,

					     DPAA_PORTAL_CI);

	if (!addr_phys[1]) {

		dev_err(dev, "Can't get %s property 'reg::CI'\n",

			node->full_name);

		dev_err(dev, "Can't get %pOF property 'reg::CI'\n", node);

		return -ENXIO;

	}



	err = of_property_read_u32(node, "cell-index", &val);

	if (err) {

		dev_err(dev, "Can't get %s property 'cell-index'\n",

			node->full_name);

		dev_err(dev, "Can't get %pOF property 'cell-index'\n", node);

		return err;

	}

	pcfg->channel = val;

	pcfg->cpu = -1;

	irq = platform_get_irq(pdev, 0);

	if (irq <= 0) {

		dev_err(dev, "Can't get %s IRQ\n", node->full_name);

		dev_err(dev, "Can't get %pOF IRQ\n", node);

		return -ENXIO;

	}

	pcfg->irq = irq;

drivers/soc/fsl/qe/gpio.c

+2 −2
Original line number Diff line number Diff line
@@ -304,8 +304,8 @@ static int __init qe_add_gpiochips(void) 
			goto err;

		continue;

err:

		pr_err("%s: registration failed with status %d\n",

		       np->full_name, ret);

		pr_err("%pOF: registration failed with status %d\n",

		       np, ret);

		kfree(qe_gc);

		/* try others anyway */

	}