diff options
| author | Davide Ciminaghi <ciminaghi@gnudd.com> | 2012-12-10 14:47:21 +0100 | 
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-12-11 00:18:08 +0000 | 
| commit | 4b85da08c4d19f5de48d904d4f879dcfa04ec14c (patch) | |
| tree | 706f8e9703cf59c4ac30669bbccfc05c59ba2417 | |
| parent | a9a83785def8bf9142b37c86ffcb0fdc93fb851e (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>
| -rw-r--r-- | drivers/mmc/host/mmci.c | 8 | 
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  		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; @@ -907,7 +907,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;  | 
