driver: dwmmc: Fix pointer conversion warnings for hikey
authorPrabhakar Kushwaha <prabhakar@freescale.com>
Sun, 25 Oct 2015 07:48:25 +0000 (13:18 +0530)
committerTom Rini <trini@konsulko.com>
Thu, 12 Nov 2015 20:59:00 +0000 (15:59 -0500)
Fix below compilation warings happening for hikey_defconfig

drivers/mmc/dw_mmc.c: In function ‘dwmci_set_idma_desc’:
drivers/mmc/dw_mmc.c:43:20: warning: cast from pointer to integer
of different size [-Wpointer-to-int-cast]
  desc->next_addr = (unsigned int)desc + sizeof(struct dwmci_idmac);
                    ^
drivers/mmc/dw_mmc.c: In function ‘dwmci_prepare_data’:
drivers/mmc/dw_mmc.c:61:35: warning: cast from pointer to integer
of different size [-Wpointer-to-int-cast]
  dwmci_writel(host, DWMCI_DBADDR, (unsigned int)cur_idmac);
                                   ^
drivers/mmc/dw_mmc.c:73:9: warning: cast from pointer to integer
of different size [-Wpointer-to-int-cast]
         (u32)bounce_buffer + (i * PAGE_SIZE));
         ^
  CC      drivers/mmc/hi6220_dw_mmc.o
drivers/mmc/hi6220_dw_mmc.c: In function ‘hi6220_dwmci_add_port’:
drivers/mmc/hi6220_dw_mmc.c:51:17: warning: cast to pointer from integer
of different size [-Wint-to-pointer-cast]
  host->ioaddr = (void *)regbase;

Signed-off-by: Prabhakar Kushwaha <prabhakar@freescale.com>
drivers/mmc/dw_mmc.c
drivers/mmc/hi6220_dw_mmc.c

index 26d34ae5ccc4d0349b27e1dda3128dfbfb84ebf9..4375abc9406a904fcd85ce579347dc93e6758327 100644 (file)
@@ -40,7 +40,7 @@ static void dwmci_set_idma_desc(struct dwmci_idmac *idmac,
        desc->flags = desc0;
        desc->cnt = desc1;
        desc->addr = desc2;
-       desc->next_addr = (unsigned int)desc + sizeof(struct dwmci_idmac);
+       desc->next_addr = (ulong)desc + sizeof(struct dwmci_idmac);
 }
 
 static void dwmci_prepare_data(struct dwmci_host *host,
@@ -58,7 +58,7 @@ static void dwmci_prepare_data(struct dwmci_host *host,
        dwmci_wait_reset(host, DWMCI_CTRL_FIFO_RESET);
 
        data_start = (ulong)cur_idmac;
-       dwmci_writel(host, DWMCI_DBADDR, (unsigned int)cur_idmac);
+       dwmci_writel(host, DWMCI_DBADDR, (ulong)cur_idmac);
 
        do {
                flags = DWMCI_IDMAC_OWN | DWMCI_IDMAC_CH ;
@@ -70,7 +70,7 @@ static void dwmci_prepare_data(struct dwmci_host *host,
                        cnt = data->blocksize * 8;
 
                dwmci_set_idma_desc(cur_idmac, flags, cnt,
-                                   (u32)bounce_buffer + (i * PAGE_SIZE));
+                                   (ulong)bounce_buffer + (i * PAGE_SIZE));
 
                if (blk_cnt <= 8)
                        break;
index 731458c18c5630a382e533ae38f169ea713c5211..b0d063c6987ee34129f3f1698d1ecfae05eaf1ba 100644 (file)
@@ -48,7 +48,7 @@ int hi6220_dwmci_add_port(int index, u32 regbase, int bus_width)
                return -ENOMEM;
        }
 
-       host->ioaddr = (void *)regbase;
+       host->ioaddr = (void *)(ulong)regbase;
        host->buswidth = bus_width;
        host->bus_hz = MMC0_DEFAULT_FREQ;