Commit 34e8df2f authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Greg Kroah-Hartman
Browse files

usb: dwc3: imx8mp: use scoped device node handling to simplify error paths 



Obtain the device node reference with scoped/cleanup.h to reduce error
handling and make the code a bit simpler.  Scoped/cleanup.h coding style
expects variable declaration with initialization, so the
of_get_compatible_child() call has to be moved earlier, before any goto
jumps happen.

Signed-off-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Acked-by: default avatarThinh Nguyen <Thinh.Nguyen@synopsys.com>
Reviewed-by: default avatarFrank Li <Frank.Li@nxp.com>
Link: https://lore.kernel.org/r/20240814-b4-cleanup-h-of-node-put-usb-v1-6-95481b9682bc@linaro.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 81d905b1

drivers/usb/dwc3/dwc3-imx8mp.c

+8 −12
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
 * Copyright (c) 2020 NXP.

 */



#include <linux/cleanup.h>

#include <linux/clk.h>

#include <linux/interrupt.h>

#include <linux/io.h>
@@ -147,7 +148,7 @@ static irqreturn_t dwc3_imx8mp_interrupt(int irq, void *_dwc3_imx) 
static int dwc3_imx8mp_probe(struct platform_device *pdev)

{

	struct device		*dev = &pdev->dev;

	struct device_node	*dwc3_np, *node = dev->of_node;

	struct device_node	*node = dev->of_node;

	struct dwc3_imx8mp	*dwc3_imx;

	struct resource		*res;

	int			err, irq;
@@ -193,6 +194,11 @@ static int dwc3_imx8mp_probe(struct platform_device *pdev) 
		return irq;

	dwc3_imx->irq = irq;



	struct device_node *dwc3_np __free(device_node) = of_get_compatible_child(node,

										  "snps,dwc3");

	if (!dwc3_np)

		return dev_err_probe(dev, -ENODEV, "failed to find dwc3 core child\n");



	imx8mp_configure_glue(dwc3_imx);



	pm_runtime_set_active(dev);
@@ -201,17 +207,10 @@ static int dwc3_imx8mp_probe(struct platform_device *pdev) 
	if (err < 0)

		goto disable_rpm;



	dwc3_np = of_get_compatible_child(node, "snps,dwc3");

	if (!dwc3_np) {

		err = -ENODEV;

		dev_err(dev, "failed to find dwc3 core child\n");

		goto disable_rpm;

	}



	err = of_platform_populate(node, NULL, NULL, dev);

	if (err) {

		dev_err(&pdev->dev, "failed to create dwc3 core\n");

		goto err_node_put;

		goto disable_rpm;

	}



	dwc3_imx->dwc3 = of_find_device_by_node(dwc3_np);
@@ -220,7 +219,6 @@ static int dwc3_imx8mp_probe(struct platform_device *pdev) 
		err = -ENODEV;

		goto depopulate;

	}

	of_node_put(dwc3_np);



	err = devm_request_threaded_irq(dev, irq, NULL, dwc3_imx8mp_interrupt,

					IRQF_ONESHOT, dev_name(dev), dwc3_imx);
@@ -236,8 +234,6 @@ static int dwc3_imx8mp_probe(struct platform_device *pdev) 


depopulate:

	of_platform_depopulate(dev);

err_node_put:

	of_node_put(dwc3_np);

disable_rpm:

	pm_runtime_disable(dev);

	pm_runtime_put_noidle(dev);