From 1d9812f48aa1f57a8917d3351f0a4f7c8d559755 Mon Sep 17 00:00:00 2001 From: Johann Neuhauser Date: Tue, 28 Apr 2020 23:20:13 +0200 Subject: [PATCH] ath79: phy-ar7200-usb: do not print error on defered init This is only a cosmetic correction, as the driver works as expected. However, the error message confuses users about a missing reset definition. On a defered init we don't see the following error message now: [ 0.078292] ar7200-usb-phy usb-phy: phy reset is missing Tested-by: Lech Perczak Signed-off-by: Johann Neuhauser --- .../ath79/patches-4.19/0004-phy-add-ath79-usb-phys.patch | 5 +++-- .../ath79/patches-5.4/0004-phy-add-ath79-usb-phys.patch | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/target/linux/ath79/patches-4.19/0004-phy-add-ath79-usb-phys.patch b/target/linux/ath79/patches-4.19/0004-phy-add-ath79-usb-phys.patch index fa3487d392..3629e6e875 100644 --- a/target/linux/ath79/patches-4.19/0004-phy-add-ath79-usb-phys.patch +++ b/target/linux/ath79/patches-4.19/0004-phy-add-ath79-usb-phys.patch @@ -194,7 +194,7 @@ Signed-off-by: John Crispin +MODULE_LICENSE("GPL"); --- /dev/null +++ b/drivers/phy/phy-ar7200-usb.c -@@ -0,0 +1,135 @@ +@@ -0,0 +1,136 @@ +/* + * Copyright (C) 2015 Alban Bedel + * @@ -265,7 +265,8 @@ Signed-off-by: John Crispin + + priv->rst_phy = devm_reset_control_get(&pdev->dev, "usb-phy"); + if (IS_ERR(priv->rst_phy)) { -+ dev_err(&pdev->dev, "phy reset is missing\n"); ++ if (PTR_ERR(priv->rst_phy) != -EPROBE_DEFER) ++ dev_err(&pdev->dev, "phy reset is missing\n"); + return PTR_ERR(priv->rst_phy); + } + diff --git a/target/linux/ath79/patches-5.4/0004-phy-add-ath79-usb-phys.patch b/target/linux/ath79/patches-5.4/0004-phy-add-ath79-usb-phys.patch index 7956edb937..e319f738a5 100644 --- a/target/linux/ath79/patches-5.4/0004-phy-add-ath79-usb-phys.patch +++ b/target/linux/ath79/patches-5.4/0004-phy-add-ath79-usb-phys.patch @@ -194,7 +194,7 @@ Signed-off-by: John Crispin +MODULE_LICENSE("GPL"); --- /dev/null +++ b/drivers/phy/phy-ar7200-usb.c -@@ -0,0 +1,135 @@ +@@ -0,0 +1,136 @@ +/* + * Copyright (C) 2015 Alban Bedel + * @@ -265,7 +265,8 @@ Signed-off-by: John Crispin + + priv->rst_phy = devm_reset_control_get(&pdev->dev, "usb-phy"); + if (IS_ERR(priv->rst_phy)) { -+ dev_err(&pdev->dev, "phy reset is missing\n"); ++ if (PTR_ERR(priv->rst_phy) != -EPROBE_DEFER) ++ dev_err(&pdev->dev, "phy reset is missing\n"); + return PTR_ERR(priv->rst_phy); + } + -- 2.30.2