| From d9a7e3b857e6a0e00c2ae86a05714efca0eb3765 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Tue, 11 Jan 2022 10:52:54 +0100 |
| Subject: phy: amlogic: meson8b-usb2: Use dev_err_probe() |
| |
| From: Amjad Ouled-Ameur <aouledameur@baylibre.com> |
| |
| [ Upstream commit 6466ba1898d415b527e1013bd8551a6fdfece94c ] |
| |
| Use the existing dev_err_probe() helper instead of open-coding the same |
| operation. |
| |
| Signed-off-by: Amjad Ouled-Ameur <aouledameur@baylibre.com> |
| Reported-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> |
| Reviewed-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> |
| Acked-by: Neil Armstrong <narmstrong@baylibre.com> |
| Link: https://lore.kernel.org/r/20220111095255.176141-3-aouledameur@baylibre.com |
| Signed-off-by: Vinod Koul <vkoul@kernel.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/phy/amlogic/phy-meson8b-usb2.c | 5 +++-- |
| 1 file changed, 3 insertions(+), 2 deletions(-) |
| |
| diff --git a/drivers/phy/amlogic/phy-meson8b-usb2.c b/drivers/phy/amlogic/phy-meson8b-usb2.c |
| index cf10bed40528..77e7e9b1428c 100644 |
| --- a/drivers/phy/amlogic/phy-meson8b-usb2.c |
| +++ b/drivers/phy/amlogic/phy-meson8b-usb2.c |
| @@ -265,8 +265,9 @@ static int phy_meson8b_usb2_probe(struct platform_device *pdev) |
| return PTR_ERR(priv->clk_usb); |
| |
| priv->reset = devm_reset_control_get_optional_shared(&pdev->dev, NULL); |
| - if (PTR_ERR(priv->reset) == -EPROBE_DEFER) |
| - return PTR_ERR(priv->reset); |
| + if (IS_ERR(priv->reset)) |
| + return dev_err_probe(&pdev->dev, PTR_ERR(priv->reset), |
| + "Failed to get the reset line"); |
| |
| priv->dr_mode = of_usb_get_dr_mode_by_phy(pdev->dev.of_node, -1); |
| if (priv->dr_mode == USB_DR_MODE_UNKNOWN) { |
| -- |
| 2.35.1 |
| |
