Merge branch 'for-next/resource-err-ptr'

8 files changed, 21 insertions, 12 deletions

diff --git a/drivers/pinctrl/imx-iomux-v1.c b/drivers/pinctrl/imx-iomux-v1.c
index 16415c2de0..a3f04802a2 100644
--- a/drivers/pinctrl/imx-iomux-v1.c
+++ b/drivers/pinctrl/imx-iomux-v1.c
@@ -4,6 +4,7 @@
 #include <malloc.h>
 #include <pinctrl.h>
 #include <mach/iomux-v1.h>
+#include <linux/err.h>
 
 /*
  *  GPIO Module and I/O Multiplexer
@@ -284,6 +285,8 @@ static int imx_iomux_v1_probe(struct device_d *dev)
 		return -EBUSY;
 
 	iomuxv1_base = dev_get_mem_region(dev, 0);
+	if (IS_ERR(iomuxv1_base))
+		return PTR_ERR(iomuxv1_base);
 
 	ret = of_platform_populate(dev->device_node, NULL, NULL);
 
diff --git a/drivers/pinctrl/imx-iomux-v2.c b/drivers/pinctrl/imx-iomux-v2.c
index cef0340909..2622d9a2d6 100644
--- a/drivers/pinctrl/imx-iomux-v2.c
+++ b/drivers/pinctrl/imx-iomux-v2.c
@@ -17,6 +17,7 @@
 #include <common.h>
 #include <io.h>
 #include <init.h>
+#include <linux/err.h>
 #include <mach/iomux-mx31.h>
 
 /*
@@ -118,6 +119,8 @@ int imx_iomux_setup_multiple_pins(const unsigned int *pin_list, unsigned count)
 static int imx_iomux_probe(struct device_d *dev)
 {
 	base = dev_request_mem_region(dev, 0);
+	if (IS_ERR(base))
+		return PTR_ERR(base);
 
 	return 0;
 }
diff --git a/drivers/pinctrl/mvebu/armada-xp.c b/drivers/pinctrl/mvebu/armada-xp.c
index 9f79d373e4..8c71867a7d 100644
--- a/drivers/pinctrl/mvebu/armada-xp.c
+++ b/drivers/pinctrl/mvebu/armada-xp.c
@@ -375,8 +375,8 @@ static int armada_xp_pinctrl_probe(struct device_d *dev)
 	struct mvebu_pinctrl_soc_info *soc = &armada_xp_pinctrl_info;
 
 	mpp_base = dev_request_mem_region(dev, 0);
-	if (!mpp_base)
-		return -EBUSY;
+	if (IS_ERR(mpp_base))
+		return PTR_ERR(mpp_base);
 
 	soc->variant = (enum armada_xp_variant)match->data;
 
diff --git a/drivers/pinctrl/mvebu/kirkwood.c b/drivers/pinctrl/mvebu/kirkwood.c
index 94ab105442..05142489c0 100644
--- a/drivers/pinctrl/mvebu/kirkwood.c
+++ b/drivers/pinctrl/mvebu/kirkwood.c
@@ -13,6 +13,7 @@
 #include <init.h>
 #include <malloc.h>
 #include <of.h>
+#include <linux/err.h>
 
 #include "common.h"
 
@@ -437,8 +438,8 @@ static int kirkwood_pinctrl_probe(struct device_d *dev)
 		(struct mvebu_pinctrl_soc_info *)match->data;
 
 	mpp_base = dev_request_mem_region(dev, 0);
-	if (!mpp_base)
-		return -EBUSY;
+	if (IS_ERR(mpp_base))
+		return PTR_ERR(mpp_base);
 
 	return mvebu_pinctrl_probe(dev, soc);
 }
diff --git a/drivers/pinctrl/pinctrl-at91.c b/drivers/pinctrl/pinctrl-at91.c
index 29e54cf6cb..0d6d2e7e53 100644
--- a/drivers/pinctrl/pinctrl-at91.c
+++ b/drivers/pinctrl/pinctrl-at91.c
@@ -653,8 +653,8 @@ static int at91_gpio_probe(struct device_d *dev)
 
 	gpio_banks = max(gpio_banks, alias_idx + 1);
 	at91_gpio->regbase = dev_request_mem_region(dev, 0);
-	if (!at91_gpio->regbase)
-		return -EBUSY;
+	if (IS_ERR(at91_gpio->regbase))
+		return PTR_ERR(at91_gpio->regbase);
 
 	at91_gpio->chip.ops = &at91_gpio_ops;
 	at91_gpio->chip.ngpio = MAX_NB_GPIO_PER_BANK;
diff --git a/drivers/pinctrl/pinctrl-rockchip.c b/drivers/pinctrl/pinctrl-rockchip.c
index 5f04c048cb..3533aff942 100644
--- a/drivers/pinctrl/pinctrl-rockchip.c
+++ b/drivers/pinctrl/pinctrl-rockchip.c
@@ -341,10 +341,10 @@ static int rockchip_get_bank_data(struct rockchip_pin_bank *bank,
 	}
 
 	res = request_iomem_region(dev_name(dev), node_res.start, node_res.end);
-	if (!res) {
+	if (IS_ERR(res)) {
 		dev_err(dev, "cannot request iomem region %08x\n",
 			node_res.start);
-		return -ENOENT;
+		return PTR_ERR(res);
 	}
 
 	bank->reg_base = (void __iomem *)res->start;
diff --git a/drivers/pinctrl/pinctrl-tegra20.c b/drivers/pinctrl/pinctrl-tegra20.c
index 053981f44c..3c11be6f55 100644
--- a/drivers/pinctrl/pinctrl-tegra20.c
+++ b/drivers/pinctrl/pinctrl-tegra20.c
@@ -28,6 +28,7 @@
 #include <io.h>
 #include <malloc.h>
 #include <pinctrl.h>
+#include <linux/err.h>
 
 struct pinctrl_tegra20 {
 	struct {
@@ -309,9 +310,9 @@ static int pinctrl_tegra20_probe(struct device_d *dev)
 	regs = (u32 **)&ctrl->regs;
 	for (i = 0; i <= 2; i++) {
 		regs[i] = dev_request_mem_region(dev, i);
-		if (!regs[i]) {
+		if (IS_ERR(regs[i])) {
 			dev_err(dev, "Could not get iomem region %d\n", i);
-			return -ENODEV;
+			return PTR_ERR(regs[i]);
 		}
 	}
 
diff --git a/drivers/pinctrl/pinctrl-tegra30.c b/drivers/pinctrl/pinctrl-tegra30.c
index 5cacfae8a3..82772187d5 100644
--- a/drivers/pinctrl/pinctrl-tegra30.c
+++ b/drivers/pinctrl/pinctrl-tegra30.c
@@ -22,6 +22,7 @@
 #include <io.h>
 #include <malloc.h>
 #include <pinctrl.h>
+#include <linux/err.h>
 
 struct pinctrl_tegra30_drvdata;
 
@@ -884,9 +885,9 @@ static int pinctrl_tegra30_probe(struct device_d *dev)
 	regs = (u32 **)&ctrl->regs;
 	for (i = 0; i <= 1; i++) {
 		regs[i] = dev_request_mem_region(dev, i);
-		if (!regs[i]) {
+		if (IS_ERR(regs[i])) {
 			dev_err(dev, "Could not get iomem region %d\n", i);
-			return -ENODEV;
+			return PTR_ERR(regs[i]);
 		}
 	}