diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2020-10-14 12:46:49 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2020-10-14 12:46:49 +0200 |
commit | 3b9ce49e17897cc053ed8416685e79902d7432a1 (patch) | |
tree | 324019c1b5ad3c9cf8dce274291008d6ff4d49e7 /drivers | |
parent | d2bb6342d6a812f3ff0dcf17180c0b01b85cacfb (diff) | |
parent | 9699096f1eccd742d898f471b046181ea90dd582 (diff) | |
download | barebox-3b9ce49e17897cc053ed8416685e79902d7432a1.tar.gz barebox-3b9ce49e17897cc053ed8416685e79902d7432a1.tar.xz |
Merge branch 'for-next/percent_pe' into master
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/clk/clk-qoric.c | 2 | ||||
-rw-r--r-- | drivers/mfd/superio.c | 3 | ||||
-rw-r--r-- | drivers/misc/acpi-test.c | 2 | ||||
-rw-r--r-- | drivers/net/designware_tegra186.c | 5 | ||||
-rw-r--r-- | drivers/usb/imx/chipidea-imx.c | 5 | ||||
-rw-r--r-- | drivers/usb/imx/imx-usb-phy.c | 2 | ||||
-rw-r--r-- | drivers/video/imx-ipu-v3/imx-ldb.c | 8 | ||||
-rw-r--r-- | drivers/video/imx-ipu-v3/ipu-common.c | 5 |
8 files changed, 14 insertions, 18 deletions
diff --git a/drivers/clk/clk-qoric.c b/drivers/clk/clk-qoric.c index 2ffc7613fa..b3e0780bc8 100644 --- a/drivers/clk/clk-qoric.c +++ b/drivers/clk/clk-qoric.c @@ -589,7 +589,7 @@ static void __init clockgen_init(struct device_node *np, clockgen.sysclk = of_clk_get(clockgen.node, 0); if (IS_ERR(clockgen.sysclk)) { - pr_err("sysclk not found: %s\n", strerrorp(clockgen.sysclk)); + pr_err("sysclk not found: %pe\n", clockgen.sysclk); return; } diff --git a/drivers/mfd/superio.c b/drivers/mfd/superio.c index ab94a4fa8f..fff26968ea 100644 --- a/drivers/mfd/superio.c +++ b/drivers/mfd/superio.c @@ -87,8 +87,7 @@ void superio_chip_add(struct superio_chip *siochip) regmap = regmap_init(siochip->dev, &superio_regmap_bus, siochip, &superio_regmap_config); if (IS_ERR(regmap)) - pr_warn("creating %s regmap failed: %s\n", - chipname, strerrorp(regmap)); + pr_warn("creating %s regmap failed: %pe\n", chipname, regmap); ret = regmap_register_cdev(regmap, chipname); if (ret) diff --git a/drivers/misc/acpi-test.c b/drivers/misc/acpi-test.c index 970b435a0e..1d6814ebcf 100644 --- a/drivers/misc/acpi-test.c +++ b/drivers/misc/acpi-test.c @@ -29,7 +29,7 @@ static int acpi_test_probe(struct device_d *dev) sdt = (u8 __force *)dev_request_mem_region_by_name(dev, "SDT"); if (IS_ERR(sdt)) { - dev_err(dev, "no SDT resource available: %s\n", strerrorp(sdt)); + dev_err(dev, "no SDT resource available: %pe\n", sdt); return PTR_ERR(sdt); } diff --git a/drivers/net/designware_tegra186.c b/drivers/net/designware_tegra186.c index 5348f65c41..f3b37be3ce 100644 --- a/drivers/net/designware_tegra186.c +++ b/drivers/net/designware_tegra186.c @@ -213,9 +213,8 @@ static int eqos_init_tegra186(struct device_d *dev, struct eqos *eqos) priv->rst = reset_control_get(dev, "eqos"); if (IS_ERR(priv->rst)) { - ret = PTR_ERR(priv->rst); - dev_err(dev, "reset_get_by_name(rst) failed: %s\n", strerror(-ret)); - return ret; + dev_err(dev, "reset_get_by_name(rst) failed: %pe\n", priv->rst); + return PTR_ERR(priv->rst); } phy_reset = of_get_named_gpio(dev->device_node, "phy-reset-gpios", 0); 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; } diff --git a/drivers/video/imx-ipu-v3/imx-ldb.c b/drivers/video/imx-ipu-v3/imx-ldb.c index 9b4524274c..d7793bdc0e 100644 --- a/drivers/video/imx-ipu-v3/imx-ldb.c +++ b/drivers/video/imx-ipu-v3/imx-ldb.c @@ -162,7 +162,7 @@ static int imx6q_set_clock(struct imx_ldb *ldb, int ipuno, int dino, int chno, u diclk = clk_lookup(clkname); free(clkname); if (IS_ERR(diclk)) { - dev_err(ldb->dev, "failed to get di clk: %s\n", strerrorp(diclk)); + dev_err(ldb->dev, "failed to get di clk: %pe\n", diclk); return PTR_ERR(diclk); } @@ -170,7 +170,7 @@ static int imx6q_set_clock(struct imx_ldb *ldb, int ipuno, int dino, int chno, u ldbclk = clk_lookup(clkname); free(clkname); if (IS_ERR(ldbclk)) { - dev_err(ldb->dev, "failed to get ldb clk: %s\n", strerrorp(ldbclk)); + dev_err(ldb->dev, "failed to get ldb clk: %pe\n", ldbclk); return PTR_ERR(ldbclk); } @@ -233,7 +233,7 @@ static int imx53_ldb_prepare(struct imx_ldb_channel *imx_ldb_ch, int di, diclk = clk_lookup(clkname); free(clkname); if (IS_ERR(diclk)) { - dev_err(ldb->dev, "failed to get di clk: %s\n", strerrorp(diclk)); + dev_err(ldb->dev, "failed to get di clk: %pe\n", diclk); return PTR_ERR(diclk); } @@ -241,7 +241,7 @@ static int imx53_ldb_prepare(struct imx_ldb_channel *imx_ldb_ch, int di, ldbclk = clk_lookup(clkname); free(clkname); if (IS_ERR(ldbclk)) { - dev_err(ldb->dev, "failed to get ldb clk: %s\n", strerrorp(ldbclk)); + dev_err(ldb->dev, "failed to get ldb clk: %pe\n", ldbclk); return PTR_ERR(ldbclk); } diff --git a/drivers/video/imx-ipu-v3/ipu-common.c b/drivers/video/imx-ipu-v3/ipu-common.c index 1811e50227..b31edcdd55 100644 --- a/drivers/video/imx-ipu-v3/ipu-common.c +++ b/drivers/video/imx-ipu-v3/ipu-common.c @@ -804,9 +804,8 @@ static int ipu_probe(struct device_d *dev) ipu->clk = clk_get(dev, "bus"); if (IS_ERR(ipu->clk)) { - ret = PTR_ERR(ipu->clk); - dev_err(dev, "clk_get failed: %s\n", strerror(-ret)); - return ret; + dev_err(dev, "clk_get failed: %pe\n", ipu->clk); + return PTR_ERR(ipu->clk); } dev->priv = ipu; |