Commit 7a827509 authored by Yang Yingliang's avatar Yang Yingliang Committed by Greg Kroah-Hartman
Browse files

usb: musb: sunxi: Switch to use dev_err_probe() helper 



In the probe path, dev_err() can be replaced with dev_err_probe()
which will check if error code is -EPROBE_DEFER and prints the
error name. It also sets the defer probe reason which can be
checked later through debugfs. It's more simple in error path.

Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
Link: https://lore.kernel.org/r/20220927072616.913672-6-yangyingliang@huawei.com


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

drivers/usb/musb/sunxi.c

+9 −20
Original line number Diff line number Diff line
@@ -743,31 +743,20 @@ static int sunxi_musb_probe(struct platform_device *pdev) 


	if (test_bit(SUNXI_MUSB_FL_HAS_RESET, &glue->flags)) {

		glue->rst = devm_reset_control_get(&pdev->dev, NULL);

		if (IS_ERR(glue->rst)) {

			if (PTR_ERR(glue->rst) == -EPROBE_DEFER)

				return -EPROBE_DEFER;

			dev_err(&pdev->dev, "Error getting reset %ld\n",

				PTR_ERR(glue->rst));

			return PTR_ERR(glue->rst);

		}

		if (IS_ERR(glue->rst))

			return dev_err_probe(&pdev->dev, PTR_ERR(glue->rst),

					     "Error getting reset\n");

	}



	glue->extcon = extcon_get_edev_by_phandle(&pdev->dev, 0);

	if (IS_ERR(glue->extcon)) {

		if (PTR_ERR(glue->extcon) == -EPROBE_DEFER)

			return -EPROBE_DEFER;

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

		return PTR_ERR(glue->extcon);

	}

	if (IS_ERR(glue->extcon))

		return dev_err_probe(&pdev->dev, PTR_ERR(glue->extcon),

				     "Invalid or missing extcon\n");



	glue->phy = devm_phy_get(&pdev->dev, "usb");

	if (IS_ERR(glue->phy)) {

		if (PTR_ERR(glue->phy) == -EPROBE_DEFER)

			return -EPROBE_DEFER;

		dev_err(&pdev->dev, "Error getting phy %ld\n",

			PTR_ERR(glue->phy));

		return PTR_ERR(glue->phy);

	}

	if (IS_ERR(glue->phy))

		return dev_err_probe(&pdev->dev, PTR_ERR(glue->phy),

				     "Error getting phy\n");



	glue->usb_phy = usb_phy_generic_register();

	if (IS_ERR(glue->usb_phy)) {