misc: sdio: remove build warnings

Remove build warnings.

Change-Id: I0b4506532ecce3e92d559f67903acf9cd250bc6e
Signed-off-by: Seung-Woo Kim <sw0312.kim@samsung.com>

diff --git a/drivers/misc/sdiodev/sdio_dev.c b/drivers/misc/sdiodev/sdio_dev.c
index 29d02ea..dfdcac0 100755 (executable)
--- a/drivers/misc/sdiodev/sdio_dev.c
+++ b/drivers/misc/sdiodev/sdio_dev.c
@@ -160,7 +160,6 @@ static void sdio_late_resume(struct early_suspend *es)
 #endif
 int mgr_suspend_init(void )
 {
-       int ret;
        atomic_set(&g_mgr_suspend.refcnt, 0);
        atomic_set(&g_mgr_suspend.in_sdio_suspend, 0);
        mutex_init(&g_mgr_suspend.func_lock);
@@ -246,7 +245,7 @@ EXPORT_SYMBOL_GPL(get_sprd_download_fin);
 
 void set_sprd_download_fin(int dl_tag)
 {
-       return fwdownload_fin = dl_tag;
+       fwdownload_fin = dl_tag;
 }
 EXPORT_SYMBOL_GPL(set_sprd_download_fin);
 
@@ -300,7 +299,7 @@ int get_screen_status(void)
        old_fs = get_fs();
        set_fs(KERNEL_DS);
 
-       buf = (int *)kzalloc(4,GFP_KERNEL);
+       buf = kzalloc(4,GFP_KERNEL);
 
        vfs_read(file, buf, 3, &pos);
 
@@ -328,9 +327,11 @@ int set_marlin_wakeup(uint32 chn,uint32 user_id)
 #if !defined(CONFIG_MARLIN_NO_SLEEP)
 
        int ret;
-       int flags;
+       unsigned long flags;
+#if 0
        int screen_status = 1;
        int bt_state ;
+#endif
        SDIOTRAN_DEBUG("entry");
 
        if(get_sprd_download_fin() != 1)
@@ -369,13 +370,13 @@ int set_marlin_wakeup(uint32 chn,uint32 user_id)
                if(0 != ack_gpio_status)  //bt ack low,then lose the marlinwake irq
                {
                        spin_unlock_irqrestore(&sleep_spinlock, flags);
-                       SDIOTRAN_ERR("ack_gpio_status-%d", ack_gpio_status,user_id);
+                       SDIOTRAN_ERR("ack_gpio_status-%d,user_id-%d", ack_gpio_status,user_id);
                        return -2;
                }
                if(0 == atomic_read(&(set_marlin_cmplete)))  //last wakeup don't complete
        {
                        spin_unlock_irqrestore(&sleep_spinlock, flags);
-                       SDIOTRAN_ERR("set_marlin_complete -%d",  set_marlin_cmplete);
+                       SDIOTRAN_ERR("set_marlin_complete -%d",  atomic_read(&set_marlin_cmplete));
                        return -3;
                }
 
@@ -989,7 +990,7 @@ int sdio_assertinfo_handler(void)
 }
 
 
-static void marlin_workq(void)
+static void marlin_workq(struct work_struct *work)
 {
        int read_chn;
        int ret = 0;
@@ -1200,11 +1201,8 @@ void marlin_sdio_sync_uninit(void)
 EXPORT_SYMBOL_GPL(marlin_sdio_sync_uninit);
 
 
-static void marlinack_workq(void)
+static void marlinack_workq(struct work_struct *work)
 {
-       int read_chn;
-       int ret = 0;
-
        SDIOTRAN_ERR("ENTRY");
        if(sdio_w_flag == 1)
                complete(&marlin_ack);
@@ -1219,7 +1217,7 @@ int time_d_value(struct timeval *start, struct timeval *end)
 static irqreturn_t marlinwake_irq_handler(int irq, void * para)
 {
        struct timeval cur_time;
-       uint32 gpio_wake_status = 0, usec;
+       uint32 gpio_wake_status = 0;
        //irq_set_irq_type(irq,IRQF_TRIGGER_RISING|IRQF_TRIGGER_FALLING);
        gpio_wake_status = gpio_get_value(sdio_data->wake_ack);
 
@@ -1230,8 +1228,11 @@ static irqreturn_t marlinwake_irq_handler(int irq, void * para)
        do_gettimeofday(&cur_time);
        if(ack_gpio_status == gpio_wake_status)
        {
+#if 0
+               uint32 usec;
                //usec = time_d_value(&ack_irq_time, &cur_time);
                //if(usec < 200)    //means invalid gpio value, so discard
+#endif
                {
                        SDIOTRAN_ERR("discard gpio%d irq", sdio_data->wake_ack);
                        return IRQ_HANDLED;
@@ -1347,12 +1348,11 @@ static void marlin_wake_intr_uninit(void)
 
 }
 
-
-
+#if defined(CONFIG_SDIODEV_TEST)
 static void sdio_tran_sync(void)
 {
 
-       int datalen,i,j;
+       int datalen,i;
 
        SDIOTRAN_ERR("entry");
 
@@ -1381,7 +1381,7 @@ static void sdio_tran_sync(void)
        if (NULL == sync_data_ptr)
        {
                SDIOTRAN_ERR("kmalloc sync buf err!!!");
-               return -1;
+               return;
        }
 
        SDIOTRAN_ERR("kmalloc sync buf ok!!!");
@@ -1396,7 +1396,7 @@ static void sdio_tran_sync(void)
 
        set_blklen(512);
 }
-
+#endif
 
 void set_blklen(int blklen)
 {