media: sprd_sensor: remove build warnings

Remoev build warnings.

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

diff --git a/drivers/media/sprd_sensor/csi2/csi_driver.c b/drivers/media/sprd_sensor/csi2/csi_driver.c
index dc4c922c4d317c5ebbce47f9bc341f4a01bd35d9..85c1ed4e378450604e85600007338f2dc7eaa952 100644 (file)
--- a/drivers/media/sprd_sensor/csi2/csi_driver.c
+++ b/drivers/media/sprd_sensor/csi2/csi_driver.c
@@ -30,7 +30,7 @@ static const struct csi_pclk_cfg csi_pclk_setting[CSI_PCLK_CFG_COUNTER] = {
        {300, 330, 0x05, 17},
        {330, 360, 0x15, 17},
        {360, 400, 0x25, 17},
-#ifdef IS_ENABLED(VERSION3T) || IS_ENABLED(VERSION3D)
+#if IS_ENABLED(VERSION3T) || IS_ENABLED(VERSION3D)
        {400, 450, 0x06, 25},
        {450, 500, 0x16, 26},
 #elif IS_ENABLED(VERSION3L)
@@ -104,7 +104,7 @@ static void dpy_ab_sync(void)
 {
        sci_glb_clr(SPRD_MMAHB_BASE + 0x000C, 0x07);
 }
-#else IS_ENABLED(VERSION3L)
+#elif IS_ENABLED(VERSION3L)
 static void dpy_ab_clr(void)
 {
 }
@@ -279,7 +279,7 @@ u8 csi_init(u64 base_address)
     csi_error_t e = SUCCESS;
     do {
                if (csi_core_initialized == 0) {
-                       access_init((u32*)base_address);
+                       access_init((u32*)(uintptr_t)base_address);
                        if (csi_core_read(VERSION) == (u32)(CURRENT_VERSION)) {
                                csi_core_initialized = 1;
                                break;

diff --git a/drivers/media/sprd_sensor/otp/sensor_otp_coreprime3g_ve.c b/drivers/media/sprd_sensor/otp/sensor_otp_coreprime3g_ve.c
index 7de40ffcbf24f567e4e51d259db7ba612988b05a..e26bb42b84ac31b366d7ac3d630615ef36bbf292 100644 (file)
--- a/drivers/media/sprd_sensor/otp/sensor_otp_coreprime3g_ve.c
+++ b/drivers/media/sprd_sensor/otp/sensor_otp_coreprime3g_ve.c
@@ -57,7 +57,9 @@ struct isp_data_t {
 
        //static struct task_struct * otp_task = NULL;
 static struct file *pfile = NULL;
+#if 0
 static struct file *pdebugfile = NULL;
+#endif
 
 static int fw_version_len=0;
 static uint8_t fw_version[12] = {0};
@@ -68,6 +70,7 @@ static int z_ioctl (struct file *f, unsigned int cmd, unsigned long arg)
     return f->f_op->compat_ioctl (f, cmd, arg);
   else if (f->f_op->unlocked_ioctl)
     return f->f_op->unlocked_ioctl (f, cmd, arg);
+  return -ENOTTY;
 }
 
 static void Sensor_PowerOn (uint32_t power_on)
@@ -82,10 +85,10 @@ static void Sensor_PowerOn (uint32_t power_on)
     } else {
       power_cfg.is_on = 0;
     }
-  z_ioctl (pfile, SENSOR_IO_POWER_CFG, &power_cfg);
+  z_ioctl (pfile, SENSOR_IO_POWER_CFG, (uintptr_t)&power_cfg);
 
   if (power_on) {
-      z_ioctl (pfile, SENSOR_IO_SET_MCLK, &mclk);
+      z_ioctl (pfile, SENSOR_IO_SET_MCLK, (uintptr_t)&mclk);
     }
 }
 
@@ -101,7 +104,7 @@ static int Sensor_WriteI2C (uint16_t slave_addr, uint8_t * cmd, uint16_t cmd_len
   MM_TRACE ("Sensor_ReadI2C, slave_addr=0x%x, ptr=0x%p, count=%d\n",
            i2c_tab.slave_addr, i2c_tab.i2c_data, i2c_tab.i2c_count);
 
-  ret = z_ioctl (pfile, SENSOR_IO_I2C_WRITE_EXT, &i2c_tab);
+  ret = z_ioctl (pfile, SENSOR_IO_I2C_WRITE_EXT, (uintptr_t)&i2c_tab);
 
   return ret;
 }
@@ -118,7 +121,7 @@ static int Sensor_ReadI2C (uint16_t slave_addr, uint8_t * cmd, uint16_t cmd_leng
 //       MM_TRACE("Sensor_ReadI2C, slave_addr=0x%x, ptr=0x%p, count=%d\n",
 //            i2c_tab.slave_addr, i2c_tab.i2c_data, i2c_tab.i2c_count);
 
-  ret = z_ioctl (pfile, SENSOR_IO_I2C_READ_EXT, &i2c_tab);
+  ret = z_ioctl (pfile, SENSOR_IO_I2C_READ_EXT, (uintptr_t)&i2c_tab);
 
   return ret;
 }
@@ -189,12 +192,13 @@ int sensor_reloadinfo_thread (void *data)
 
   uint32_t clock = 400000;
 
+#if 0
   loff_t otp_start_addr = 0;
+#endif
   uint32_t otp_data_len = 0;
   SENSOR_VAL_T val;
   struct isp_data_t checksum_otp;
   struct isp_data_t sensor_otp;
-  uint32_t is_need_checksum = 0;
 
   uint32_t count = 0;
   MM_TRACE ("sensor_reloadinfo_thread start\n");
@@ -220,7 +224,7 @@ int sensor_reloadinfo_thread (void *data)
 
   Sensor_PowerOn (1);
 
-  ret = z_ioctl (pfile, SENSOR_IO_SET_I2CCLOCK, &clock);
+  ret = z_ioctl (pfile, SENSOR_IO_SET_I2CCLOCK, (uintptr_t)&clock);
 
   /*read fw_version */
   fw_version_len = 11;

diff --git a/drivers/media/sprd_sensor/power/sensor_power_z3.c b/drivers/media/sprd_sensor/power/sensor_power_z3.c
index a171726b63adb2836b9ca67cfb288692d9f571f4..8dbea9b14d52cfdeb761a0c8f2579bc493a480d2 100644 (file)
--- a/drivers/media/sprd_sensor/power/sensor_power_z3.c
+++ b/drivers/media/sprd_sensor/power/sensor_power_z3.c
@@ -18,6 +18,7 @@
 #include <linux/kernel.h>
 #include <soc/sprd/hardware.h>
 #include <soc/sprd/board.h>
+#include <video/sensor_drv_k.h>
 #include "../sensor_drv_sprd.h"
 
 static int sensor_s5k4h5yc_poweron(uint32_t *fd_handle, struct sensor_power *dev0,
@@ -123,12 +124,10 @@ static int sensor_s5k5e3yx_poweroff(uint32_t *fd_handle, struct sensor_power *de
        return ret;
 }
 
-static int sensor_ov5670_poweron(uint32_t *fd_handle,
+static int __maybe_unused sensor_ov5670_poweron(uint32_t *fd_handle,
        struct sensor_power *dev0, struct sensor_power *dev1,
        struct sensor_power *dev2)
 {
-       int ret = 0;
-
        sensor_k_sensor_sel(fd_handle, SENSOR_DEV_0); /*select sub sensor*/
 #if 0
        sensor_k_set_pd_level(fd_handle, 0); /*power down*/
@@ -167,9 +166,10 @@ static int sensor_ov5670_poweron(uint32_t *fd_handle,
 
        pr_info("sensor ov5670 poweron OK\n");
 
+       return 0;
 }
 
-static int sensor_ov5670_poweroff(uint32_t *fd_handle,
+static int __maybe_unused sensor_ov5670_poweroff(uint32_t *fd_handle,
        struct sensor_power *dev0, struct sensor_power *dev1,
        struct sensor_power *dev2)
 {

diff --git a/drivers/media/sprd_sensor/sensor_drv_k.c b/drivers/media/sprd_sensor/sensor_drv_k.c
index 58715da83d9230ecea0c777800681582eb5369a8..905d40880673126b9a19e99fa76446a9f8392045 100755 (executable)
--- a/drivers/media/sprd_sensor/sensor_drv_k.c
+++ b/drivers/media/sprd_sensor/sensor_drv_k.c
@@ -1317,7 +1317,7 @@ int sensor_k_release(struct inode *node, struct file *file)
                printk("SENSOR: Invalid addr, %p", p_mod);
        } else {
                if(NULL == p_file->sensor_mem.buf_ptr || 0 == p_file->sensor_mem.size){
-                       printk("check !! free size = %d, ptr=0x%x \n", p_file->sensor_mem.size, p_file->sensor_mem.buf_ptr);
+                       printk("check !! free size = %d, ptr=%p \n", p_file->sensor_mem.size, p_file->sensor_mem.buf_ptr);
                }
                else {
                        vfree(p_file->sensor_mem.buf_ptr);
@@ -1356,7 +1356,8 @@ LOCAL ssize_t sensor_k_write(struct file *filp, const char __user *ubuf, size_t
 
        i2c_client = p_mod->sensor_dev_tab[p_file->sensor_id].cur_i2c_client;
 
-       SENSOR_PRINT("sensor w cnt %ld, buf %ld\n", cnt, sizeof(buf));
+       SENSOR_PRINT("sensor w cnt %ld, buf %ld\n", (unsigned long)cnt,
+                       (unsigned long)sizeof(buf));
 
        if (cnt < sizeof(buf)) {
                pBuff = buf;
@@ -1364,15 +1365,18 @@ LOCAL ssize_t sensor_k_write(struct file *filp, const char __user *ubuf, size_t
        }  else {
                pBuff = _sensor_k_malloc(p_file, cnt);
                if (PNULL == pBuff) {
-                       SENSOR_PRINT_ERR("sensor w ERR: alloc fail, size %ld \n", cnt);
+                       SENSOR_PRINT_ERR("sensor w ERR: alloc fail, size %ld \n",
+                                       (unsigned long)cnt);
                        goto sensor_k_write_return;
                } else {
-                       SENSOR_PRINT("sensor w: alloc success, size %ld \n", cnt);
+                       SENSOR_PRINT("sensor w: alloc success, size %ld \n",
+                                       (unsigned long)cnt);
                }
        }
 
        if (copy_from_user(pBuff, ubuf, cnt)) {
-               SENSOR_PRINT_ERR("sensor w ERR: copy user fail, size %ld\n", cnt);
+               SENSOR_PRINT_ERR("sensor w ERR: copy user fail, size %ld\n",
+                               (unsigned long)cnt);
                goto sensor_k_write_return;
        }
        printk("sensor clnt addr 0x%x.\n", i2c_client->addr);
@@ -1890,14 +1894,14 @@ LOCAL long sensor_k_ioctl(struct file *file, unsigned int cmd,
                {
                        SENSOR_OTP_PARAM_T *para = (SENSOR_OTP_PARAM_T *)arg;
                        uint32_t type;
-                       copy_from_user(&type, &para->type, sizeof(uint32_t));
-                       SENSOR_PRINT("SENSOR: ioctl SENSOR_IO_READ_OTPDATA %p type %d\n", arg, para->type);
+                       ret = copy_from_user(&type, &para->type, sizeof(uint32_t));
+                       SENSOR_PRINT("SENSOR: ioctl SENSOR_IO_READ_OTPDATA %p type %d\n", para, para->type);
 
                        if(type == SENSOR_OTP_PARAM_CHECKSUM) {
                                SENSOR_OTP_DATA_INFO_T *chksum = &p_mod->otp_param[p_file->sensor_id].golden;
                                if(chksum->data_ptr && chksum->size > 0) {
-                                       copy_to_user(para->buff, chksum->data_ptr, chksum->size);
-                                       copy_to_user(&para->len, &chksum->size, sizeof(uint32_t));
+                                       ret = copy_to_user(para->buff, chksum->data_ptr, chksum->size);
+                                       ret = copy_to_user(&para->len, &chksum->size, sizeof(uint32_t));
                                }
                        } else if(type == SENSOR_OTP_PARAM_NORMAL) {
 
@@ -1905,18 +1909,18 @@ LOCAL long sensor_k_ioctl(struct file *file, unsigned int cmd,
                                SENSOR_OTP_DATA_INFO_T *lsc = &p_mod->otp_param[p_file->sensor_id].lsc;
 
                                if(p_mod->otp_param[p_file->sensor_id].buff && p_mod->otp_param[p_file->sensor_id].len > 0) {
-                                       copy_to_user(para->buff, p_mod->otp_param[p_file->sensor_id].buff,
+                                       ret = copy_to_user(para->buff, p_mod->otp_param[p_file->sensor_id].buff,
                                                p_mod->otp_param[p_file->sensor_id].len);
-                                       copy_to_user(&para->len, &p_mod->otp_param[p_file->sensor_id].len,
+                                       ret = copy_to_user(&para->len, &p_mod->otp_param[p_file->sensor_id].len,
                                                sizeof(uint32_t));
                                }
                                if(awb->data_ptr && awb->size > 0) {
-                                       copy_to_user(para->awb.data_ptr, awb->data_ptr, awb->size);
-                                       copy_to_user(&para->awb.size, &awb->size, sizeof(uint32_t));
+                                       ret = copy_to_user(para->awb.data_ptr, awb->data_ptr, awb->size);
+                                       ret = copy_to_user(&para->awb.size, &awb->size, sizeof(uint32_t));
                                }
                                if(lsc->data_ptr && lsc->size > 0) {
-                                       copy_to_user(para->lsc.data_ptr, lsc->data_ptr, lsc->size);
-                                       copy_to_user(&para->lsc.size, &lsc->size, sizeof(uint32_t));
+                                       ret = copy_to_user(para->lsc.data_ptr, lsc->data_ptr, lsc->size);
+                                       ret = copy_to_user(&para->lsc.size, &lsc->size, sizeof(uint32_t));
                                }
                        } else  {
                                printk("SENSOR: ioctl SENSOR_IO_READ_OTPDATA mismatch type \n");
@@ -2192,7 +2196,7 @@ LOCAL const struct of_device_id of_match_table_sensor[] = {
        { },
 };
 
-LOCAL int sensor_k_suspend(struct platform_device *dev)
+LOCAL int sensor_k_suspend(struct platform_device *dev, pm_message_t state)
 {
        int i;
        struct sensor_gpio_tag       gpio_tab;
@@ -2421,7 +2425,7 @@ static ssize_t Rear_Cam_store_flash(struct device *dev, struct device_attribute
        return size;
 }
 
-static ssize_t Rear_Cam_show_flash(struct device *dev, struct device_attribute *attr, const char *buf, size_t size)
+static ssize_t Rear_Cam_show_flash(struct device *dev, struct device_attribute *attr, char *buf)
 {
        SENSOR_PRINT("Rear_Cam_show_flash value\n");
        return sprintf(buf, "%d", flash_torch_status);