linux-arch.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Will Deacon <will.deacon@arm.com>
To: linux-kernel@vger.kernel.org
Cc: linux-arch@vger.kernel.org, benh@kernel.crashing.org,
	arnd@arndb.de, james.hogan@imgtec.com,
	Will Deacon <will.deacon@arm.com>, Chris Ball <cjb@laptop.org>,
	Davide Ciminaghi <ciminaghi@gnudd.com>
Subject: [PATCH v2 02/10] mmc: mmci: use io{read,write}*_rep accessors instead of string functions
Date: Mon, 10 Dec 2012 19:12:34 +0000	[thread overview]
Message-ID: <1355166762-15133-3-git-send-email-will.deacon@arm.com> (raw)
In-Reply-To: <1355166762-15133-1-git-send-email-will.deacon@arm.com>

The {read,write}s{b,w,l} operations are not defined by all architectures
and are being removed from the asm-generic/io.h interface.

This patch replaces the usage of these string functions with
io{read,write}{8,16,32}_rep calls instead, which are defined for all
architectures.

Cc: Chris Ball <cjb@laptop.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Davide Ciminaghi <ciminaghi@gnudd.com>
Cc: Ben Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Will Deacon <will.deacon@arm.com>
---

I believe Davide is pushing an identical patch to this one via rmk, but
I'm including it here for completeness.

 drivers/mmc/host/mmci.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
index edc3e9b..4f125b4 100644
--- a/drivers/mmc/host/mmci.c
+++ b/drivers/mmc/host/mmci.c
@@ -840,14 +840,14 @@ static int mmci_pio_read(struct mmci_host *host, char *buffer, unsigned int rema
 		if (unlikely(count & 0x3)) {
 			if (count < 4) {
 				unsigned char buf[4];
-				readsl(base + MMCIFIFO, buf, 1);
+				ioread32_rep(base + MMCIFIFO, buf, 1);
 				memcpy(ptr, buf, count);
 			} else {
-				readsl(base + MMCIFIFO, ptr, count >> 2);
+				ioread32_rep(base + MMCIFIFO, ptr, count >> 2);
 				count &= ~0x3;
 			}
 		} else {
-			readsl(base + MMCIFIFO, ptr, count >> 2);
+			ioread32_rep(base + MMCIFIFO, ptr, count >> 2);
 		}
 
 		ptr += count;
@@ -900,7 +900,7 @@ static int mmci_pio_write(struct mmci_host *host, char *buffer, unsigned int rem
 		 * byte become a 32bit write, 7 bytes will be two
 		 * 32bit writes etc.
 		 */
-		writesl(base + MMCIFIFO, ptr, (count + 3) >> 2);
+		iowrite32_rep(base + MMCIFIFO, ptr, (count + 3) >> 2);
 
 		ptr += count;
 		remain -= count;
-- 
1.8.0

  parent reply	other threads:[~2012-12-10 19:12 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-12-10 19:12 [PATCH v2 00/10] Fix endianness of generic I/O accessors Will Deacon
2012-12-10 19:12 ` [PATCH v2 01/10] asm-generic: io: don't perform swab during {in,out} string functions Will Deacon
2012-12-10 19:12   ` Will Deacon
2012-12-10 19:12 ` Will Deacon [this message]
2012-12-10 19:12   ` [PATCH v2 02/10] mmc: mmci: use io{read,write}*_rep accessors instead of " Will Deacon
2012-12-10 19:12 ` [PATCH v2 03/10] net: smc91x: " Will Deacon
2012-12-10 19:12   ` Will Deacon
2012-12-10 20:47   ` David Miller
2012-12-10 20:47     ` David Miller
2012-12-10 19:12 ` [PATCH v2 04/10] net: smc911x: use io{read,write}*_rep accessors Will Deacon
2012-12-10 19:12   ` Will Deacon
2012-12-10 20:47   ` David Miller
2012-12-11 14:49     ` Will Deacon
2012-12-11 17:51       ` David Miller
2012-12-10 19:12 ` [PATCH v2 05/10] net: dm9000: " Will Deacon
2012-12-10 19:12   ` Will Deacon
2012-12-10 20:47   ` David Miller
2012-12-10 20:47     ` David Miller
2012-12-10 19:12 ` [PATCH v2 06/10] net: 8390: " Will Deacon
2012-12-10 19:12   ` Will Deacon
2012-12-10 20:47   ` David Miller
2012-12-10 19:12 ` [PATCH v2 07/10] mtd: nand/gpio: " Will Deacon
2012-12-10 19:12   ` Will Deacon
2012-12-13 11:28   ` Artem Bityutskiy
2012-12-13 11:28     ` Artem Bityutskiy
2012-12-10 19:12 ` [PATCH v2 08/10] musb: tusb6010: " Will Deacon
2012-12-10 19:12   ` Will Deacon
2012-12-10 19:12 ` [PATCH v2 09/10] usb: musb: " Will Deacon
2012-12-10 19:12   ` Will Deacon
2012-12-10 19:12 ` [PATCH v2 10/10] asm-generic: io: remove {read,write} string functions Will Deacon
2012-12-10 19:12   ` Will Deacon

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=1355166762-15133-3-git-send-email-will.deacon@arm.com \
    --to=will.deacon@arm.com \
    --cc=arnd@arndb.de \
    --cc=benh@kernel.crashing.org \
    --cc=ciminaghi@gnudd.com \
    --cc=cjb@laptop.org \
    --cc=james.hogan@imgtec.com \
    --cc=linux-arch@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.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;
as well as URLs for NNTP newsgroup(s).