Reduce the scope of PXA's mmc_read/mmc_write/mmc_bread functions

These names are being taken over by the new MMC framework.  Hopefuly
the PXA can be easily ported, and these functions will go away entirely.

Signed-off-by: Andy Fleming <afleming@freescale.com>
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>

diff --git a/drivers/mmc/pxa_mmc.c b/drivers/mmc/pxa_mmc.c
index 33da75f4a3f9dc3557d8d1b4d9cbe0e370a71f9e..0fa249edf51172478149869873ddf5de5900e18d 100644 (file)
--- a/drivers/mmc/pxa_mmc.c
+++ b/drivers/mmc/pxa_mmc.c
@@ -216,7 +216,7 @@ mmc_block_write(ulong dst, uchar * src, int len)
 
 int
 /****************************************************/
 
 int
 /****************************************************/

-mmc_read(ulong src, uchar * dst, int size)
+pxa_mmc_read(long src, uchar * dst, int size)

 /****************************************************/
 {
        ulong end, part_start, part_end, part_len, aligned_start, aligned_end;
 /****************************************************/
 {
        ulong end, part_start, part_end, part_len, aligned_start, aligned_end;


@@ -292,7 +292,7 @@ mmc_read(ulong src, uchar * dst, int size)
 
 int
 /****************************************************/
 
 int
 /****************************************************/

-mmc_write(uchar * src, ulong dst, int size)
+pxa_mmc_write(uchar * src, ulong dst, int size)

 /****************************************************/
 {
        ulong end, part_start, part_end, part_len, aligned_start, aligned_end;
 /****************************************************/
 {
        ulong end, part_start, part_end, part_len, aligned_start, aligned_end;


@@ -373,7 +373,7 @@ mmc_write(uchar * src, ulong dst, int size)
        return 0;
 }
 
        return 0;
 }
 

-ulong
+static ulong

 /****************************************************/
 mmc_bread(int dev_num, ulong blknr, lbaint_t blkcnt, void *dst)
 /****************************************************/
 /****************************************************/
 mmc_bread(int dev_num, ulong blknr, lbaint_t blkcnt, void *dst)
 /****************************************************/


@@ -381,7 +381,7 @@ mmc_bread(int dev_num, ulong blknr, lbaint_t blkcnt, void *dst)
        int mmc_block_size = MMC_BLOCK_SIZE;
        ulong src = blknr * mmc_block_size + CONFIG_SYS_MMC_BASE;
 
        int mmc_block_size = MMC_BLOCK_SIZE;
        ulong src = blknr * mmc_block_size + CONFIG_SYS_MMC_BASE;
 

-       mmc_read(src, (uchar *) dst, blkcnt * mmc_block_size);
+       pxa_mmc_read(src, (uchar *) dst, blkcnt * mmc_block_size);

        return blkcnt;
 }
 
        return blkcnt;
 }