Commit 40452520 authored by Dragan Simic's avatar Dragan Simic Committed by Vinod Koul
Browse files

phy: phy-rockchip-inno-usb2: Use dev_err_probe() in the probe path 



Improve error handling in the probe path by using function dev_err_probe()
instead of function dev_err(), where appropriate.

Signed-off-by: default avatarDragan Simic <dsimic@manjaro.org>
Reviewed-by: default avatarHeiko Stuebner <heiko@sntech.de>
Link: https://lore.kernel.org/r/d4ccd9fc278fb46ea868406bf77811ee507f0e4e.1725524803.git.dsimic@manjaro.org


Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent 595ad7a3

drivers/phy/rockchip/phy-rockchip-inno-usb2.c

+10 −17
Original line number Diff line number Diff line
@@ -424,11 +424,9 @@ static int rockchip_usb2phy_extcon_register(struct rockchip_usb2phy *rphy) 


	if (of_property_read_bool(node, "extcon")) {

		edev = extcon_get_edev_by_phandle(rphy->dev, 0);

		if (IS_ERR(edev)) {

			if (PTR_ERR(edev) != -EPROBE_DEFER)

				dev_err(rphy->dev, "Invalid or missing extcon\n");

			return PTR_ERR(edev);

		}

		if (IS_ERR(edev))

			return dev_err_probe(rphy->dev, PTR_ERR(edev),

					     "invalid or missing extcon\n");

	} else {

		/* Initialize extcon device */

		edev = devm_extcon_dev_allocate(rphy->dev,
@@ -439,10 +437,9 @@ static int rockchip_usb2phy_extcon_register(struct rockchip_usb2phy *rphy) 
					     "failed to allocate extcon device\n");



		ret = devm_extcon_dev_register(rphy->dev, edev);

		if (ret) {

			dev_err(rphy->dev, "failed to register extcon device\n");

			return ret;

		}

		if (ret)

			return dev_err_probe(rphy->dev, ret,

					     "failed to register extcon device\n");

	}



	rphy->edev = edev;
@@ -1408,10 +1405,8 @@ static int rockchip_usb2phy_probe(struct platform_device *pdev) 
				     "failed to get phyclk\n");



	ret = rockchip_usb2phy_clk480m_register(rphy);

	if (ret) {

		dev_err(dev, "failed to register 480m output clock\n");

		return ret;

	}

	if (ret)

		return dev_err_probe(dev, ret, "failed to register 480m output clock\n");



	if (rphy->phy_cfg->phy_tuning) {

		ret = rphy->phy_cfg->phy_tuning(rphy);
@@ -1431,8 +1426,7 @@ static int rockchip_usb2phy_probe(struct platform_device *pdev) 


		phy = devm_phy_create(dev, child_np, &rockchip_usb2phy_ops);

		if (IS_ERR(phy)) {

			dev_err_probe(dev, PTR_ERR(phy), "failed to create phy\n");

			ret = PTR_ERR(phy);

			ret = dev_err_probe(dev, PTR_ERR(phy), "failed to create phy\n");

			goto put_child;

		}
@@ -1467,8 +1461,7 @@ static int rockchip_usb2phy_probe(struct platform_device *pdev) 
						"rockchip_usb2phy",

						rphy);

		if (ret) {

			dev_err(rphy->dev,

				"failed to request usb2phy irq handle\n");

			dev_err_probe(rphy->dev, ret, "failed to request usb2phy irq handle\n");

			goto put_child;

		}

	}