Commit 4b85da08 authored by Davide Ciminaghi's avatar Davide Ciminaghi Committed by Russell King
Browse files

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: default avatarDavide Ciminaghi <ciminaghi@gnudd.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent a9a83785

drivers/mmc/host/mmci.c

+4 −4
Original line number Diff line number Diff line
@@ -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;