mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Sascha Hauer <s.hauer@pengutronix.de>
To: barebox@lists.infradead.org
Subject: [PATCH 05/19] mem_read/write: use resources
Date: Tue, 19 Jul 2011 10:39:49 +0200	[thread overview]
Message-ID: <1311064803-6305-6-git-send-email-s.hauer@pengutronix.de> (raw)
In-Reply-To: <1311064803-6305-1-git-send-email-s.hauer@pengutronix.de>

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 fs/fs.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/fs/fs.c b/fs/fs.c
index e71d5a2..bcc6ff4 100644
--- a/fs/fs.c
+++ b/fs/fs.c
@@ -1048,8 +1048,7 @@ ssize_t mem_read(struct cdev *cdev, void *buf, size_t count, ulong offset, ulong
 	dev = cdev->dev;
 
 	size = min((ulong)count, dev->size - offset);
-	debug("mem_read: dev->map_base: %p size: %d offset: %d\n",dev->map_base, size, offset);
-	memcpy_sz(buf, (void *)(dev->map_base + offset), size, flags & O_RWSIZE_MASK);
+	memcpy_sz(buf, dev_get_mem_region(dev, 0) + offset, size, flags & O_RWSIZE_MASK);
 	return size;
 }
 EXPORT_SYMBOL(mem_read);
@@ -1064,7 +1063,7 @@ ssize_t mem_write(struct cdev *cdev, const void *buf, size_t count, ulong offset
 	dev = cdev->dev;
 
 	size = min((ulong)count, dev->size - offset);
-	memcpy_sz((void *)(dev->map_base + offset), buf, size, flags & O_RWSIZE_MASK);
+	memcpy_sz(dev_get_mem_region(dev, 0) + offset, buf, size, flags & O_RWSIZE_MASK);
 	return size;
 }
 EXPORT_SYMBOL(mem_write);
-- 
1.7.5.4


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

  parent reply	other threads:[~2011-07-19  8:40 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-07-19  8:39 [PATCH] resources work Sascha Hauer
2011-07-19  8:39 ` [PATCH 01/19] register_device: Add IORESOURCE_MEM flag Sascha Hauer
2011-07-19  8:39 ` [PATCH 02/19] device: Add a dev_request_mem_region function Sascha Hauer
2011-07-19 10:11   ` Jean-Christophe PLAGNIOL-VILLARD
2011-07-19 10:58     ` Sascha Hauer
2011-07-19  8:39 ` [PATCH 03/19] add a add_mem_device function Sascha Hauer
2011-07-19 10:13   ` Jean-Christophe PLAGNIOL-VILLARD
2011-07-19 11:00     ` Sascha Hauer
2011-07-19 13:06       ` Jean-Christophe PLAGNIOL-VILLARD
2011-07-19  8:39 ` [PATCH 04/19] generic memmap: use resources Sascha Hauer
2011-07-19  8:39 ` Sascha Hauer [this message]
2011-07-19 10:14   ` [PATCH 05/19] mem_read/write: " Jean-Christophe PLAGNIOL-VILLARD
2011-07-19  8:39 ` [PATCH 06/19] nand i.MX: convert to struct resource Sascha Hauer
2011-07-19  8:39 ` [PATCH 07/19] video " Sascha Hauer
2011-07-19  8:39 ` [PATCH 08/19] serial " Sascha Hauer
2011-07-19  8:39 ` [PATCH 09/19] i2c " Sascha Hauer
2011-07-19  8:39 ` [PATCH 10/19] mci " Sascha Hauer
2011-07-19  8:39 ` [PATCH 11/19] net i.MX fec: " Sascha Hauer
2011-07-19  8:39 ` [PATCH 12/19] mci i.MX esdhc: " Sascha Hauer
2011-07-19  8:39 ` [PATCH 13/19] spi i.MX: " Sascha Hauer
2011-07-19  8:39 ` [PATCH 14/19] video i.MX ipu: " Sascha Hauer
2011-07-19  8:39 ` [PATCH 15/19] i.MX devices: " Sascha Hauer
2011-07-19  8:40 ` [PATCH 16/19] cfi: " Sascha Hauer
2011-07-19  8:40 ` [PATCH 17/19] ARM pcm038: use add_mem_device helper Sascha Hauer
2011-07-19  8:40 ` [PATCH 18/19] ARM pcm037: " Sascha Hauer
2011-07-19  8:40 ` [PATCH 19/19] ARM i.MX51 babbage: " 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=1311064803-6305-6-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