sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

introduce strerrorp 

putting an error pointer into strerror can be a bit confusing since
strerror takes a positive error code but PTR_ERR returns a negative
number, so we have to do strerror(-PTR_ERR(errp)). Some places got
this wrong already, so introduce a strerrorp function which directly
takes an error pointer.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Sascha Hauer 2015-09-10 12:04:02 +02:00
parent 9d54b6f6b6
commit 7e44c8495a
5 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/blspec.c
View File

@ -646,7 +646,7 @@ static int blspec_append_root(struct blspec_entry *entry)
rootarg = path_get_linux_rootarg(entry->rootpath);
if (IS_ERR(rootarg)) {
pr_err("Getting root argument for %s failed with: %s\n",
entry->rootpath, strerror(-PTR_ERR(rootarg)));
entry->rootpath, strerrorp(rootarg));
return PTR_ERR(rootarg);
}

2
drivers/usb/imx/imx-usb-phy.c
View File

@ -78,7 +78,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", strerror(-PTR_ERR(imxphy->clk)));
dev_err(dev, "could not get clk: %s\n", strerrorp(imxphy->clk));
goto err_clk;
}

8
drivers/video/imx-ipu-v3/imx-ldb.c
View File

@ -176,7 +176,7 @@ static int imx6q_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", strerror(PTR_ERR(diclk)));
dev_err(ldb->dev, "failed to get di clk: %s\n", strerrorp(diclk));
return PTR_ERR(diclk);
}
@ -184,7 +184,7 @@ static int imx6q_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", strerror(PTR_ERR(ldbclk)));
dev_err(ldb->dev, "failed to get ldb clk: %s\n", strerrorp(ldbclk));
return PTR_ERR(ldbclk);
}
@ -216,7 +216,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", strerror(PTR_ERR(diclk)));
dev_err(ldb->dev, "failed to get di clk: %s\n", strerrorp(diclk));
return PTR_ERR(diclk);
}
@ -224,7 +224,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", strerror(PTR_ERR(ldbclk)));
dev_err(ldb->dev, "failed to get ldb clk: %s\n", strerrorp(ldbclk));
return PTR_ERR(ldbclk);
}

2
fs/ubifs/ubifs.c
View File

@ -622,7 +622,7 @@ static int ubifs_probe(struct device_d *dev)
priv->ubi = ubi_open_volume_cdev(priv->cdev, UBI_READONLY);
if (IS_ERR(priv->ubi)) {
dev_err(dev, "failed to open ubi volume: %s\n",
strerror(-PTR_ERR(priv->ubi)));
strerrorp(priv->ubi));
ret = PTR_ERR(priv->ubi);
goto err_free;
}

6
include/errno.h
View File

@ -2,6 +2,7 @@
#define __ERRNO_H
#include <asm-generic/errno.h>
#include <linux/err.h>
extern int errno;
@ -9,4 +10,9 @@ void perror(const char *s);
const char *errno_str(void);
const char *strerror(int errnum);
static inline const char *strerrorp(const void *errp)
{
return strerror(-PTR_ERR(errp));
}
#endif /* __ERRNO_H */