mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
To: barebox@lists.infradead.org
Subject: [PATCH 05/16] mem_read/write: use resources
Date: Tue, 19 Jul 2011 18:09:01 +0200	[thread overview]
Message-ID: <1311091752-9114-5-git-send-email-plagnioj@jcrosoft.com> (raw)
In-Reply-To: <20110719160758.GK5727@game.jcrosoft.org>

From: Sascha Hauer <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 16:26 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-07-19 16:07 [PATCH v2] resources work Jean-Christophe PLAGNIOL-VILLARD
2011-07-19 16:08 ` [PATCH 01/16] register_device: Add IORESOURCE_MEM flag Jean-Christophe PLAGNIOL-VILLARD
2011-07-19 16:08 ` [PATCH 02/16] device: Add a dev_request_mem_region function Jean-Christophe PLAGNIOL-VILLARD
2011-07-19 16:08 ` [PATCH 03/16] mem: replace DEVFS_RDWR by IORESOURCE_MEM_WRITEABLE Jean-Christophe PLAGNIOL-VILLARD
2011-07-19 16:09 ` [PATCH 04/16] add a add_mem_device function Jean-Christophe PLAGNIOL-VILLARD
2011-07-19 17:07   ` [PATCH 04/16 v3] " Jean-Christophe PLAGNIOL-VILLARD
2011-07-19 17:19   ` [PATCH 04/16] " Sascha Hauer
2011-07-19 17:10     ` Jean-Christophe PLAGNIOL-VILLARD
2011-07-19 16:09 ` Jean-Christophe PLAGNIOL-VILLARD [this message]
2011-07-19 16:09 ` [PATCH 06/16] nand i.MX: convert to struct resource Jean-Christophe PLAGNIOL-VILLARD
2011-07-19 16:09 ` [PATCH 07/16] video " Jean-Christophe PLAGNIOL-VILLARD
2011-07-19 16:09 ` [PATCH 08/16] serial " Jean-Christophe PLAGNIOL-VILLARD
2011-07-19 16:09 ` [PATCH 09/16] i2c " Jean-Christophe PLAGNIOL-VILLARD
2011-07-19 16:09 ` [PATCH 10/16] mci " Jean-Christophe PLAGNIOL-VILLARD
2011-07-19 16:09 ` [PATCH 11/16] net i.MX fec: " Jean-Christophe PLAGNIOL-VILLARD
2011-07-19 16:09 ` [PATCH 12/16] mci i.MX esdhc: " Jean-Christophe PLAGNIOL-VILLARD
2011-07-19 16:09 ` [PATCH 13/16] spi i.MX: " Jean-Christophe PLAGNIOL-VILLARD
2011-07-19 16:09 ` [PATCH 14/16] video i.MX ipu: " Jean-Christophe PLAGNIOL-VILLARD
2011-07-19 16:09 ` [PATCH 15/16] i.MX devices: " Jean-Christophe PLAGNIOL-VILLARD
2011-07-19 16:09 ` [PATCH 16/16] cfi: " Jean-Christophe PLAGNIOL-VILLARD

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=1311091752-9114-5-git-send-email-plagnioj@jcrosoft.com \
    --to=plagnioj@jcrosoft.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