summaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2020-10-14 12:46:49 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2020-10-14 12:46:49 +0200
commit3b9ce49e17897cc053ed8416685e79902d7432a1 (patch)
tree324019c1b5ad3c9cf8dce274291008d6ff4d49e7 /drivers/usb
parentd2bb6342d6a812f3ff0dcf17180c0b01b85cacfb (diff)
parent9699096f1eccd742d898f471b046181ea90dd582 (diff)
downloadbarebox-3b9ce49e17897cc053ed8416685e79902d7432a1.tar.gz
barebox-3b9ce49e17897cc053ed8416685e79902d7432a1.tar.xz
Merge branch 'for-next/percent_pe' into master
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/imx/chipidea-imx.c5
-rw-r--r--drivers/usb/imx/imx-usb-phy.c2
2 files changed, 3 insertions, 4 deletions
diff --git a/drivers/usb/imx/chipidea-imx.c b/drivers/usb/imx/chipidea-imx.c
index 635be02929..b1a77a1637 100644
--- a/drivers/usb/imx/chipidea-imx.c
+++ b/drivers/usb/imx/chipidea-imx.c
@@ -277,9 +277,8 @@ static int imx_chipidea_probe(struct device_d *dev)
if (of_property_read_bool(dev->device_node, "fsl,usbphy")) {
ci->phy = of_phy_get_by_phandle(dev, "fsl,usbphy", 0);
if (IS_ERR(ci->phy)) {
- ret = PTR_ERR(ci->phy);
- dev_err(dev, "Cannot get phy: %s\n", strerror(-ret));
- return ret;
+ dev_err(dev, "Cannot get phy: %pe\n", ci->phy);
+ return PTR_ERR(ci->phy);
} else {
ci->usbphy = phy_to_usbphy(ci->phy);
if (IS_ERR(ci->usbphy))
diff --git a/drivers/usb/imx/imx-usb-phy.c b/drivers/usb/imx/imx-usb-phy.c
index d5c10dc282..32098ef248 100644
--- a/drivers/usb/imx/imx-usb-phy.c
+++ b/drivers/usb/imx/imx-usb-phy.c
@@ -165,7 +165,7 @@ static int imx_usbphy_probe(struct device_d *dev)
imxphy->clk = clk_get(dev, NULL);
if (IS_ERR(imxphy->clk)) {
- dev_err(dev, "could not get clk: %s\n", strerrorp(imxphy->clk));
+ dev_err(dev, "could not get clk: %pe\n", imxphy->clk);
ret = PTR_ERR(imxphy->clk);
goto err_clk;
}