summaryrefslogtreecommitdiffstats
path: root/drivers/i2c
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2016-02-19 09:18:43 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2016-02-23 08:14:16 +0100
commit8ee5479a28df0a3f3019419e46e9ee5c119a27bd (patch)
treeed1fb39fb0a39e89525581a1feeeede937556bb5 /drivers/i2c
parentf1f8f5556ab94f4f8bedb97ad0199b2e63958c8b (diff)
downloadbarebox-8ee5479a28df0a3f3019419e46e9ee5c119a27bd.tar.gz
barebox-8ee5479a28df0a3f3019419e46e9ee5c119a27bd.tar.xz
driver: Fix return check of dev_request_mem_region
dev_request_mem_region returns an ERR_PTR, fix places which check for a NULL pointer instead. This patch has been generated with this semantic patch, written by me and improved by Andrey Smirnov: // <smpl> @@ expression e; expression e1; @@ e = dev_request_mem_region(...); ... -if (!e) - return e1; +if (IS_ERR(e)) + return PTR_ERR(e); @ rule1 @ expression e; @@ e = dev_request_mem_region(...); @@ expression rule1.e; identifier ret, label; constant errno; @@ if (!e) { ... ( - ret = -errno; + ret = PTR_ERR(e); ... goto label; | - return -errno; + return PTR_ERR(e); ) } @depends on rule1@ expression rule1.e; @@ - if (e == NULL) + if (IS_ERR(e)) { ... } // </smpl> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Diffstat (limited to 'drivers/i2c')
-rw-r--r--drivers/i2c/busses/i2c-at91.c4
-rw-r--r--drivers/i2c/busses/i2c-tegra.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/i2c/busses/i2c-at91.c b/drivers/i2c/busses/i2c-at91.c
index 622c56d97b..6db724334e 100644
--- a/drivers/i2c/busses/i2c-at91.c
+++ b/drivers/i2c/busses/i2c-at91.c
@@ -426,9 +426,9 @@ static int at91_twi_probe(struct device_d *dev)
i2c_at91->pdata = i2c_data;
i2c_at91->base = dev_request_mem_region(dev, 0);
- if (!i2c_at91->base) {
+ if (IS_ERR(i2c_at91->base)) {
dev_err(dev, "could not get memory region\n");
- rc = -ENODEV;
+ rc = PTR_ERR(i2c_at91->base);
goto out_free;
}
diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c
index f6a4b227f4..a6c6596f63 100644
--- a/drivers/i2c/busses/i2c-tegra.c
+++ b/drivers/i2c/busses/i2c-tegra.c
@@ -611,9 +611,9 @@ static int tegra_i2c_probe(struct device_d *dev)
int ret = 0;
base = dev_request_mem_region(dev, 0);
- if (!base) {
+ if (IS_ERR(base)) {
dev_err(dev, "could not get iomem region\n");
- return -ENODEV;
+ return PTR_ERR(base);
}
div_clk = clk_get(dev, "div-clk");