aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorDavide Ciminaghi <ciminaghi@gnudd.com>2012-12-10 08:47:21 -0500
committerRussell King <rmk+kernel@arm.linux.org.uk>2012-12-10 19:18:08 -0500
commit4b85da08c4d19f5de48d904d4f879dcfa04ec14c (patch)
tree706f8e9703cf59c4ac30669bbccfc05c59ba2417 /drivers
parenta9a83785def8bf9142b37c86ffcb0fdc93fb851e (diff)
ARM: 7596/1: mmci: replace readsl/writesl with ioread32_rep/iowrite32_rep
Not all the architectures have readsl/writesl, use the more portable ioread32_rep/iowrite32_rep functions instead. Signed-off-by: Davide Ciminaghi <ciminaghi@gnudd.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mmc/host/mmci.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
index 9446c176e744..5e39b312c7cc 100644
--- a/drivers/mmc/host/mmci.c
+++ b/drivers/mmc/host/mmci.c
@@ -863,14 +863,14 @@ static int mmci_pio_read(struct mmci_host *host, char *buffer, unsigned int rema
863 if (unlikely(count & 0x3)) { 863 if (unlikely(count & 0x3)) {
864 if (count < 4) { 864 if (count < 4) {
865 unsigned char buf[4]; 865 unsigned char buf[4];
866 readsl(base + MMCIFIFO, buf, 1); 866 ioread32_rep(base + MMCIFIFO, buf, 1);
867 memcpy(ptr, buf, count); 867 memcpy(ptr, buf, count);
868 } else { 868 } else {
869 readsl(base + MMCIFIFO, ptr, count >> 2); 869 ioread32_rep(base + MMCIFIFO, ptr, count >> 2);
870 count &= ~0x3; 870 count &= ~0x3;
871 } 871 }
872 } else { 872 } else {
873 readsl(base + MMCIFIFO, ptr, count >> 2); 873 ioread32_rep(base + MMCIFIFO, ptr, count >> 2);
874 } 874 }
875 875
876 ptr += count; 876 ptr += count;
@@ -907,7 +907,7 @@ static int mmci_pio_write(struct mmci_host *host, char *buffer, unsigned int rem
907 * byte become a 32bit write, 7 bytes will be two 907 * byte become a 32bit write, 7 bytes will be two
908 * 32bit writes etc. 908 * 32bit writes etc.
909 */ 909 */
910 writesl(base + MMCIFIFO, ptr, (count + 3) >> 2); 910 iowrite32_rep(base + MMCIFIFO, ptr, (count + 3) >> 2);
911 911
912 ptr += count; 912 ptr += count;
913 remain -= count; 913 remain -= count;