lkml.org 
[lkml]   [2012]   [Oct]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[RESEND PATCH 3/4] mmc: mmci: use io{read,write}*_rep accessors instead of string functions
    Date
    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: Arnd Bergmann <arnd@arndb.de>
    Cc: Ben Herrenschmidt <benh@kernel.crashing.org>
    Signed-off-by: Will Deacon <will.deacon@arm.com>
    ---
    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 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.7.4.1


    \
     
     \ /
      Last update: 2012-10-17 18:21    [W:2.370 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site