mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Sascha Hauer <s.hauer@pengutronix.de>
To: Barebox List <barebox@lists.infradead.org>
Subject: [PATCH 1/3] Fix return check of dev_request_mem_region
Date: Thu, 18 Feb 2016 11:50:15 +0100	[thread overview]
Message-ID: <1455792617-13671-2-git-send-email-s.hauer@pengutronix.de> (raw)
In-Reply-To: <1455792617-13671-1-git-send-email-s.hauer@pengutronix.de>

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:

// <smpl>
@@
expression e,e1,e2;
@@

e = dev_request_mem_region(...)
... when != e = e1
if (
-   e == NULL
+   IS_ERR(e)
   ) {
     ...
     return
-      e2
+      PTR_ERR(e)
     ;
     }
// </smpl>

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 drivers/clk/mvebu/common.c            |  4 ++--
 drivers/gpio/gpio-orion.c             |  4 ++--
 drivers/i2c/busses/i2c-tegra.c        |  4 ++--
 drivers/mtd/devices/mtdram.c          |  4 ++--
 drivers/mtd/nand/atmel_nand.c         | 12 ++++++------
 drivers/pinctrl/mvebu/armada-370.c    |  4 ++--
 drivers/rtc/rtc-jz4740.c              |  4 ++--
 drivers/usb/gadget/pxa27x_udc.c       |  4 ++--
 drivers/usb/imx/imx-usb-misc.c        |  4 ++--
 drivers/usb/imx/imx-usb-phy.c         |  4 ++--
 drivers/usb/musb/phy-am335x.c         |  4 ++--
 drivers/video/imx-ipu-v3/imx-hdmi.c   |  4 ++--
 drivers/video/imx-ipu-v3/ipu-common.c |  4 ++--
 drivers/watchdog/imxwd.c              |  4 ++--
 drivers/watchdog/jz4740.c             |  4 ++--
 15 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/drivers/clk/mvebu/common.c b/drivers/clk/mvebu/common.c
index c477497..1eded90 100644
--- a/drivers/clk/mvebu/common.c
+++ b/drivers/clk/mvebu/common.c
@@ -58,8 +58,8 @@ int mvebu_coreclk_probe(struct device_d *dev)
 
 	/* Get SAR base address */
 	base = dev_request_mem_region(dev, 0);
-	if (!base)
-		return -EINVAL;
+	if (IS_ERR(base))
+		return PTR_ERR(base);
 
 	/* Allocate struct for TCLK, cpu clk, and core ratio clocks */
 	clk_data.clk_num = 2 + desc->num_ratios;
diff --git a/drivers/gpio/gpio-orion.c b/drivers/gpio/gpio-orion.c
index 3deeac1..5348395 100644
--- a/drivers/gpio/gpio-orion.c
+++ b/drivers/gpio/gpio-orion.c
@@ -97,9 +97,9 @@ static int orion_gpio_probe(struct device_d *dev)
 
 	gpio = xzalloc(sizeof(*gpio));
 	gpio->regs = dev_request_mem_region(dev, 0);
-	if (!gpio->regs) {
+	if (IS_ERR(gpio->regs)) {
 		free(gpio);
-		return -EINVAL;
+		return PTR_ERR(gpio->regs);
 	}
 	gpio->chip.dev = dev;
 	gpio->chip.ops = &orion_gpio_ops;
diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c
index f6a4b22..a6c6596 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");
diff --git a/drivers/mtd/devices/mtdram.c b/drivers/mtd/devices/mtdram.c
index d1eaafd..34db8db 100644
--- a/drivers/mtd/devices/mtdram.c
+++ b/drivers/mtd/devices/mtdram.c
@@ -71,7 +71,7 @@ static int mtdram_probe(struct device_d *dev)
 	}
 
 	base = dev_request_mem_region(dev, 0);
-	if (!base) {
+	if (IS_ERR(base)) {
 		ret = -EBUSY;
 		goto nobase;
 	}
@@ -99,7 +99,7 @@ static int mtdram_probe(struct device_d *dev)
 nobase:
 	kfree(mtd);
 
-	return ret;
+	return PTR_ERR(base);
 }
 
 static __maybe_unused struct of_device_id mtdram_dt_ids[] = {
diff --git a/drivers/mtd/nand/atmel_nand.c b/drivers/mtd/nand/atmel_nand.c
index 4ddabda..c1c9390 100644
--- a/drivers/mtd/nand/atmel_nand.c
+++ b/drivers/mtd/nand/atmel_nand.c
@@ -873,16 +873,16 @@ static int __init atmel_pmecc_nand_init_params(struct device_d *dev,
 		 cap, sector_size);
 
 	host->ecc = dev_request_mem_region(dev, 1);
-	if (host->ecc == NULL) {
+	if (IS_ERR(host->ecc)) {
 		dev_err(host->dev, "ioremap failed\n");
-		return -EIO;
+		return PTR_ERR(host->ecc);
 	}
 
 	host->pmerrloc_base = dev_request_mem_region(dev, 2);
-	if (!host->pmerrloc_base) {
+	if (IS_ERR(host->pmerrloc_base)) {
 		dev_err(host->dev,
 			"Can not get I/O resource for PMECC ERRLOC controller!\n");
-		return -EIO;
+		return PTR_ERR(host->pmerrloc_base);
 	}
 
 	host->pmecc_rom_base = dev_request_mem_region(dev, 3);
@@ -1249,9 +1249,9 @@ static int atmel_hw_nand_init_params(struct device_d *dev,
 	struct nand_chip *nand_chip = &host->nand_chip;
 
 	host->ecc = dev_request_mem_region(dev, 1);
-	if (host->ecc == NULL) {
+	if (IS_ERR(host->ecc)) {
 		dev_err(host->dev, "ioremap failed\n");
-		return -EIO;
+		return PTR_ERR(host->ecc);
 	}
 
 	/* ECC is calculated for the whole page (1 step) */
diff --git a/drivers/pinctrl/mvebu/armada-370.c b/drivers/pinctrl/mvebu/armada-370.c
index b7901f8..7ad8d04 100644
--- a/drivers/pinctrl/mvebu/armada-370.c
+++ b/drivers/pinctrl/mvebu/armada-370.c
@@ -397,8 +397,8 @@ static int armada_370_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/rtc/rtc-jz4740.c b/drivers/rtc/rtc-jz4740.c
index 8194050..762f356 100644
--- a/drivers/rtc/rtc-jz4740.c
+++ b/drivers/rtc/rtc-jz4740.c
@@ -119,9 +119,9 @@ static int jz4740_rtc_probe(struct device_d *dev)
 	void __iomem *base;
 
 	base = dev_request_mem_region(dev, 0);
-	if (!base) {
+	if (IS_ERR(base)) {
 		dev_err(dev, "could not get memory region\n");
-		return -ENODEV;
+		return PTR_ERR(base);
 	}
 
 	rtc = xzalloc(sizeof(*rtc));
diff --git a/drivers/usb/gadget/pxa27x_udc.c b/drivers/usb/gadget/pxa27x_udc.c
index 3db3480..831fbde 100644
--- a/drivers/usb/gadget/pxa27x_udc.c
+++ b/drivers/usb/gadget/pxa27x_udc.c
@@ -1453,8 +1453,8 @@ static int __init pxa_udc_probe(struct device_d *dev)
 	int gpio, ret;
 
 	udc->regs = dev_request_mem_region(dev, 0);
-	if (!udc->regs)
-		return -ENXIO;
+	if (IS_ERR(udc->regs))
+		return PTR_ERR(udc->regs);
 
 	udc->dev = dev;
 	udc->mach = dev->platform_data;
diff --git a/drivers/usb/imx/imx-usb-misc.c b/drivers/usb/imx/imx-usb-misc.c
index af1a321..576dc9a 100644
--- a/drivers/usb/imx/imx-usb-misc.c
+++ b/drivers/usb/imx/imx-usb-misc.c
@@ -553,8 +553,8 @@ static int imx_usbmisc_probe(struct device_d *dev)
 		return ret;
 
 	usbmisc_base = dev_request_mem_region(dev, 0);
-	if (!usbmisc_base)
-		return -ENOMEM;
+	if (IS_ERR(usbmisc_base))
+		return PTR_ERR(usbmisc_base);
 
 	imxusbmisc_data = devtype;
 
diff --git a/drivers/usb/imx/imx-usb-phy.c b/drivers/usb/imx/imx-usb-phy.c
index 837c1b5..4562fb2 100644
--- a/drivers/usb/imx/imx-usb-phy.c
+++ b/drivers/usb/imx/imx-usb-phy.c
@@ -71,7 +71,7 @@ static int imx_usbphy_probe(struct device_d *dev)
 	imxphy = xzalloc(sizeof(*imxphy));
 
 	imxphy->base = dev_request_mem_region(dev, 0);
-	if (!imxphy->base) {
+	if (IS_ERR(imxphy->base)) {
 		ret = -ENODEV;
 		goto err_free;
 	}
@@ -92,7 +92,7 @@ err_clk:
 err_free:
 	free(imxphy);
 
-	return ret;
+	return PTR_ERR(imxphy->base);
 };
 
 static __maybe_unused struct of_device_id imx_usbphy_dt_ids[] = {
diff --git a/drivers/usb/musb/phy-am335x.c b/drivers/usb/musb/phy-am335x.c
index 2d58bbe..2be31ea 100644
--- a/drivers/usb/musb/phy-am335x.c
+++ b/drivers/usb/musb/phy-am335x.c
@@ -37,7 +37,7 @@ static int am335x_phy_probe(struct device_d *dev)
 		return -ENOMEM;
 
 	am_usbphy->base = dev_request_mem_region(dev, 0);
-	if (!am_usbphy->base) {
+	if (IS_ERR(am_usbphy->base)) {
 		ret = -ENODEV;
 		goto err_free;
 	}
@@ -62,7 +62,7 @@ static int am335x_phy_probe(struct device_d *dev)
 err_free:
 	free(am_usbphy);
 
-	return ret;
+	return PTR_ERR(am_usbphy->base);
 };
 
 static __maybe_unused struct of_device_id am335x_phy_dt_ids[] = {
diff --git a/drivers/video/imx-ipu-v3/imx-hdmi.c b/drivers/video/imx-ipu-v3/imx-hdmi.c
index 25fcb0c..49cbca1 100644
--- a/drivers/video/imx-ipu-v3/imx-hdmi.c
+++ b/drivers/video/imx-ipu-v3/imx-hdmi.c
@@ -1294,8 +1294,8 @@ static int dw_hdmi_probe(struct device_d *dev)
 	hdmi->ddc_node = of_parse_phandle(np, "ddc-i2c-bus", 0);
 
 	hdmi->regs = dev_request_mem_region(dev, 0);
-	if (!hdmi->regs)
-		return -EBUSY;
+	if (IS_ERR(hdmi->regs))
+		return PTR_ERR(hdmi->regs);
 
 	hdmi->isfr_clk = clk_get(hdmi->dev, "isfr");
 	if (IS_ERR(hdmi->isfr_clk)) {
diff --git a/drivers/video/imx-ipu-v3/ipu-common.c b/drivers/video/imx-ipu-v3/ipu-common.c
index 70bb0e5..398eefb 100644
--- a/drivers/video/imx-ipu-v3/ipu-common.c
+++ b/drivers/video/imx-ipu-v3/ipu-common.c
@@ -761,8 +761,8 @@ static int ipu_probe(struct device_d *dev)
 		return ret;
 
 	ipu_base = dev_request_mem_region(dev, 0);
-	if (!ipu_base)
-		return -EBUSY;
+	if (IS_ERR(ipu_base))
+		return PTR_ERR(ipu_base);
 
 	ipu = xzalloc(sizeof(*ipu));
 
diff --git a/drivers/watchdog/imxwd.c b/drivers/watchdog/imxwd.c
index 1952548..1458894 100644
--- a/drivers/watchdog/imxwd.c
+++ b/drivers/watchdog/imxwd.c
@@ -183,9 +183,9 @@ static int imx_wd_probe(struct device_d *dev)
 
 	priv = xzalloc(sizeof(struct imx_wd));
 	priv->base = dev_request_mem_region(dev, 0);
-	if (!priv->base) {
+	if (IS_ERR(priv->base)) {
 		dev_err(dev, "could not get memory region\n");
-		return -ENODEV;
+		return PTR_ERR(priv->base);
 	}
 	priv->ops = ops;
 	priv->wd.set_timeout = imx_watchdog_set_timeout;
diff --git a/drivers/watchdog/jz4740.c b/drivers/watchdog/jz4740.c
index 3d45b46..85a1c1d 100644
--- a/drivers/watchdog/jz4740.c
+++ b/drivers/watchdog/jz4740.c
@@ -71,9 +71,9 @@ static int jz4740_wdt_probe(struct device_d *dev)
 
 	priv = xzalloc(sizeof(struct jz4740_wdt_drvdata));
 	priv->base = dev_request_mem_region(dev, 0);
-	if (!priv->base) {
+	if (IS_ERR(priv->base)) {
 		dev_err(dev, "could not get memory region\n");
-		return -ENODEV;
+		return PTR_ERR(priv->base);
 	}
 
 	dev->priv = priv;
-- 
2.7.0


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

  reply	other threads:[~2016-02-18 10:50 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-02-18 10:50 [PATCH] dev_request_mem_region -> dev_request_mem_resource conversion Sascha Hauer
2016-02-18 10:50 ` Sascha Hauer [this message]
2016-02-19  0:58   ` [PATCH 1/3] Fix return check of dev_request_mem_region Andrey Smirnov
2016-02-19  8:29     ` Sascha Hauer
2016-02-19 19:12       ` Andrey Smirnov
2016-02-23  7:15         ` Sascha Hauer
2016-02-18 10:50 ` [PATCH 2/3] driver: Introduce dev_request_mem_resource Sascha Hauer
2016-02-18 10:50 ` [PATCH 3/3] driver: replace dev_request_mem_region with dev_request_mem_resource Sascha Hauer
2016-02-26  8:37   ` Teresa Remmet
2016-02-29  6:41     ` Sascha Hauer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1455792617-13671-2-git-send-email-s.hauer@pengutronix.de \
    --to=s.hauer@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox