spi: rockchip: fix compilation error on arm
authorHuang, Tao <huangtao@rock-chips.com>
Wed, 20 May 2015 14:08:53 +0000 (22:08 +0800)
committerHuang, Tao <huangtao@rock-chips.com>
Wed, 20 May 2015 14:08:53 +0000 (22:08 +0800)
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
drivers/spi/spi-rockchip-test.c

index 6fe1fe35499729f6ec910aab49f998ef5f264151..4ac0658e95aef3ee875f0f59d78053ef596d7c0a 100755 (executable)
@@ -24,6 +24,7 @@
 #include <linux/of.h>\r
 #include <linux/of_gpio.h>\r
 #include <linux/miscdevice.h>\r
+#include <linux/hrtimer.h>\r
 #include <linux/platform_data/spi-rockchip.h>\r
 #include <asm/uaccess.h>\r
 \r
@@ -43,8 +44,6 @@ struct spi_test_data {
 };\r
 \r
 static struct spi_test_data *g_spi_test_data[MAX_SPI_DEV_NUM];\r
-ktime_t ktime_get(void);\r
-ktime_t k1,k2;\r
 \r
 \r
 static ssize_t spi_test_write(struct file *file, \r
@@ -55,6 +54,7 @@ static ssize_t spi_test_write(struct file *file,
        int i = 0;\r
        struct spi_device *spi = NULL;\r
        char txbuf[256],rxbuf[256];\r
+       ktime_t k1,k2;\r
 \r
        printk("%s:0:bus=0,cs=0; 1:bus=0,cs=1; 2:bus=1,cs=0; 3:bus=1,cs=1; 4:bus=2,cs=0; 5:bus=2,cs=1\n",__func__);\r
 \r
@@ -96,7 +96,7 @@ static ssize_t spi_test_write(struct file *file,
        k2 = ktime_get();\r
        k2 = ktime_sub(k2, k1);\r
        if(!ret)\r
-       printk("%s:bus_num=%d,chip_select=%d,ok cost:%lldus data rate:%lld Kbits/s\n",__func__,spi->master->bus_num, spi->chip_select, ktime_to_us(k2), 1536*5000*8/ktime_to_ms(k2));\r
+       printk("%s:bus_num=%d,chip_select=%d,ok cost:%lldus data rate:%d Kbits/s\n",__func__,spi->master->bus_num, spi->chip_select, ktime_to_us(k2), 1536*5000*8/(s32)ktime_to_ms(k2));\r
        else\r
        printk("%s:bus_num=%d,chip_select=%d,error\n",__func__,spi->master->bus_num, spi->chip_select);\r
        \r