spi: rockchip: fix arm64 compile error
authorwdc <wdc@rock-chips.com>
Thu, 30 Oct 2014 03:56:51 +0000 (11:56 +0800)
committer黄涛 <huangtao@rock-chips.com>
Thu, 30 Oct 2014 05:51:54 +0000 (13:51 +0800)
drivers/spi/spi-rockchip-core.c
drivers/spi/spi-rockchip-dma.c

index 93cb1803d2af3e544ecfa06f7b1bdaa068528254..dbe542cc11d51a4055c9c0ae378463545b425904 100755 (executable)
@@ -428,7 +428,7 @@ static void giveback(struct dw_spi *dws)
        dws->cur_chip = NULL;
        spi_finalize_current_message(dws->master);
        
-       DBG_SPI("%s:line=%d,tx_left=%d\n",__func__,__LINE__, (dws->tx_end - dws->tx) / dws->n_bytes);
+       DBG_SPI("%s:line=%d,tx_left=%ld\n",__func__,__LINE__, (long)(dws->tx_end - dws->tx) / dws->n_bytes);
 }
 
 
@@ -540,7 +540,7 @@ static irqreturn_t dw_spi_irq(int irq, void *dev_id)
 /* Must be called inside pump_transfers() */
 static void poll_transfer(struct dw_spi *dws)
 {      
-       DBG_SPI("%s:len=%d\n",__func__, dws->len);
+       DBG_SPI("%s:len=%ld\n",__func__, (long)dws->len);
        
        do {
                dw_writer(dws);
@@ -645,7 +645,7 @@ static void pump_transfers(unsigned long data)
                        chip->clk_div = clk_div;
                }
        }
-       DBG_SPI("%s:len=%d,clk_div=%d,speed_hz=%d\n",__func__,dws->len,chip->clk_div,chip->speed_hz);
+       DBG_SPI("%s:len=%ld,clk_div=%d,speed_hz=%d\n",__func__, (long)dws->len,chip->clk_div,chip->speed_hz);
        if (transfer->bits_per_word) {
                bits = transfer->bits_per_word;
 
index cbd613a0c62999d67736a28ba437641575174427..7c224da9c1295225ba3c2c4ece8a407f14569211 100755 (executable)
@@ -276,7 +276,8 @@ static int mid_spi_dma_transfer(struct dw_spi *dws, int cs_change)
                txdesc->callback = dw_spi_dma_txcb;
                txdesc->callback_param = dws;
 
-               DBG_SPI("%s:dst_addr=0x%p,tx_dma=0x%p,len=%d,burst=%d,width=%d\n",__func__,(int *)dws->tx_dma_addr, (int *)dws->tx_dma, dws->len,txconf.dst_maxburst, width);
+               DBG_SPI("%s:dst_addr=0x%p,tx_dma=0x%p,len=%ld,burst=%d,width=%d\n"
+                       ,__func__,(int *)dws->tx_dma_addr, (int *)dws->tx_dma, (long)dws->len,txconf.dst_maxburst, width);
        }
 
        if (dws->rx)
@@ -307,7 +308,8 @@ static int mid_spi_dma_transfer(struct dw_spi *dws, int cs_change)
                rxdesc->callback = dw_spi_dma_rxcb;
                rxdesc->callback_param = dws;
                
-               DBG_SPI("%s:src_addr=0x%p,rx_dma=0x%p,len=%d,burst=%d,width=%d\n",__func__, (int *)dws->rx_dma_addr, (int *)dws->rx_dma, dws->len, rxconf.src_maxburst, width);
+               DBG_SPI("%s:src_addr=0x%p,rx_dma=0x%p,len=%ld,burst=%d,width=%d\n"
+                       ,__func__, (int *)dws->rx_dma_addr, (int *)dws->rx_dma, (long)dws->len, rxconf.src_maxburst, width);
        }
 
        if(!dws->tx)