mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Andrey Smirnov <andrew.smirnov@gmail.com>
To: barebox@lists.infradead.org
Cc: Andrey Smirnov <andrew.smirnov@gmail.com>
Subject: [PATCH 4/6] drivers: base: Simplify dev_request_mem_region_err_null()
Date: Fri, 26 Oct 2018 18:32:28 -0700	[thread overview]
Message-ID: <20181027013230.24387-5-andrew.smirnov@gmail.com> (raw)
In-Reply-To: <20181027013230.24387-1-andrew.smirnov@gmail.com>

Simplify dev_request_mem_region_err_null() by making use of
dev_request_mem_resource() to implement it.

Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
---
 drivers/base/driver.c | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/drivers/base/driver.c b/drivers/base/driver.c
index 4c1b6110a..c687afd75 100644
--- a/drivers/base/driver.c
+++ b/drivers/base/driver.c
@@ -396,32 +396,28 @@ void __iomem *dev_request_mem_region_by_name(struct device_d *dev, const char *n
 }
 EXPORT_SYMBOL(dev_request_mem_region_by_name);
 
-void __iomem *dev_request_mem_region_err_null(struct device_d *dev, int num)
+struct resource *dev_request_mem_resource(struct device_d *dev, int num)
 {
 	struct resource *res;
 
 	res = dev_get_resource(dev, IORESOURCE_MEM, num);
 	if (IS_ERR(res))
-		return NULL;
-
-	res = request_iomem_region(dev_name(dev), res->start, res->end);
-	if (IS_ERR(res))
-		return NULL;
+		return ERR_CAST(res);
 
-	return IOMEM(res->start);
+	return request_iomem_region(dev_name(dev), res->start, res->end);
 }
-EXPORT_SYMBOL(dev_request_mem_region_err_null);
 
-struct resource *dev_request_mem_resource(struct device_d *dev, int num)
+void __iomem *dev_request_mem_region_err_null(struct device_d *dev, int num)
 {
 	struct resource *res;
 
-	res = dev_get_resource(dev, IORESOURCE_MEM, num);
+	res = dev_request_mem_resource(dev, num);
 	if (IS_ERR(res))
-		return ERR_CAST(res);
+		return NULL;
 
-	return request_iomem_region(dev_name(dev), res->start, res->end);
+	return IOMEM(res->start);
 }
+EXPORT_SYMBOL(dev_request_mem_region_err_null);
 
 void __iomem *dev_request_mem_region(struct device_d *dev, int num)
 {
-- 
2.17.1


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

  parent reply	other threads:[~2018-10-27  1:34 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-10-27  1:32 [PATCH 0/6] Refactor driver resource allocation code Andrey Smirnov
2018-10-27  1:32 ` [PATCH 1/6] drivers: base: Simplify generic_memmap_ro() Andrey Smirnov
2018-10-27  7:47   ` Sam Ravnborg
2018-10-27  1:32 ` [PATCH 2/6] drivers: base: Drop dev_get_mem_region_by_name() Andrey Smirnov
2018-10-27  1:32 ` [PATCH 3/6] drivers: base: Share implementations for dev_get_resource*() Andrey Smirnov
2018-10-29  8:52   ` Sascha Hauer
2018-10-27  1:32 ` Andrey Smirnov [this message]
2018-10-27  1:32 ` [PATCH 5/6] drivers: base: Share code for dev_request_mem_region*() Andrey Smirnov
2018-10-27  8:20   ` Sam Ravnborg
2018-10-29  8:58     ` Sascha Hauer
2018-10-27  8:26   ` Sam Ravnborg
2018-10-27  8:46     ` Sam Ravnborg
2018-10-27  1:32 ` [PATCH 6/6] drivers: base: Share code for getting and then requesting a region Andrey Smirnov
2018-10-29  9:00 ` [PATCH 0/6] Refactor driver resource allocation code 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=20181027013230.24387-5-andrew.smirnov@gmail.com \
    --to=andrew.smirnov@gmail.com \
    --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