camera: fix compile warnings.

diff --git a/arch/arm/mach-rk30/board-rk30-sdk-camera.c b/arch/arm/mach-rk30/board-rk30-sdk-camera.c
index 4570d41fa02c2f051ebda14dcf1a263693e62c48..00cae90a324f5faac75bc2e44049d6a31b395559 100644 (file)
--- a/arch/arm/mach-rk30/board-rk30-sdk-camera.c
+++ b/arch/arm/mach-rk30/board-rk30-sdk-camera.c
@@ -191,6 +191,7 @@ static int sensor_power_usr_cb (struct rk29camera_gpio_res *res,int on)
 {
        //#error "CONFIG_SENSOR_POWER_IOCTL_USR is 1, sensor_power_usr_cb function must be writed!!";
     rk_cif_power(on);
+       return 0;
 }
 #endif
 

diff --git a/arch/arm/mach-rk30/board-rk3066b-m701-camera.c b/arch/arm/mach-rk30/board-rk3066b-m701-camera.c
index 1de3535e8262881eca70541e82397f7d6cc82f49..865a3400e104388f096c8db66ddf847e57679824 100644 (file)
--- a/arch/arm/mach-rk30/board-rk3066b-m701-camera.c
+++ b/arch/arm/mach-rk30/board-rk3066b-m701-camera.c
@@ -186,6 +186,7 @@ static int sensor_power_usr_cb (struct rk29camera_gpio_res *res,int on)
 {
        //#error "CONFIG_SENSOR_POWER_IOCTL_USR is 1, sensor_power_usr_cb function must be writed!!";
     rk_cif_power(on);
+       return 0;
 }
 #endif
 

diff --git a/arch/arm/mach-rk30/board-rk3066b-sdk-camera.c b/arch/arm/mach-rk30/board-rk3066b-sdk-camera.c
index a63577bd23f6d59df5719d5d7f383bc0a6fdd163..5cede24574cca0d5b83ee35571161b3b13cf7eee 100644 (file)
--- a/arch/arm/mach-rk30/board-rk3066b-sdk-camera.c
+++ b/arch/arm/mach-rk30/board-rk3066b-sdk-camera.c
@@ -186,6 +186,7 @@ static int sensor_power_usr_cb (struct rk29camera_gpio_res *res,int on)
 {
        //#error "CONFIG_SENSOR_POWER_IOCTL_USR is 1, sensor_power_usr_cb function must be writed!!";
     rk_cif_power(on);
+       return 0;
 }
 #endif
 

diff --git a/arch/arm/plat-rk/rk_camera.c b/arch/arm/plat-rk/rk_camera.c
index cacfd4df77e8f227251deea2d675dbddb438bb43..ace74a0700670555a90ae47247acf9c86c1ff566 100755 (executable)
--- a/arch/arm/plat-rk/rk_camera.c
+++ b/arch/arm/plat-rk/rk_camera.c
@@ -300,7 +300,11 @@ static int rk_sensor_io_init(void);
 static int rk_sensor_io_deinit(int sensor);\r
 static int rk_sensor_ioctrl(struct device *dev,enum rk29camera_ioctrl_cmd cmd, int on);\r
 static int rk_sensor_power(struct device *dev, int on);\r
+#if (CONFIG_SENSOR_RESET_PIN_0 != INVALID_GPIO) || (CONFIG_SENSOR_RESET_PIN_1 != INVALID_GPIO) \\r
+    || (CONFIG_SENSOR_RESET_PIN_01 != INVALID_GPIO) || (CONFIG_SENSOR_RESET_PIN_02 != INVALID_GPIO) \\r
+    || (CONFIG_SENSOR_RESET_PIN_11 != INVALID_GPIO) || (CONFIG_SENSOR_RESET_PIN_12 != INVALID_GPIO)\r
 static int rk_sensor_reset(struct device *dev);\r
+#endif\r
 static int rk_sensor_powerdown(struct device *dev, int on);\r
 \r
 static struct rk29camera_platform_data rk_camera_platform_data = {\r
@@ -570,7 +574,7 @@ static struct rk29camera_platform_data rk_camera_platform_data = {
                 .bus_id= RK29_CAM_PLATFORM_DEV_ID,\r
                 #endif\r
                .power          = rk_sensor_power,\r
-                #if (CONFIG_SENSOR_RESET_PIN_1 != INVALID_GPIO)\r
+                #if (CONFIG_SENSOR_RESET_PIN_01 != INVALID_GPIO)\r
                .reset          = rk_sensor_reset,\r
                 #endif   \r
                .powerdown      = rk_sensor_powerdown,\r
@@ -603,7 +607,7 @@ static struct rk29camera_platform_data rk_camera_platform_data = {
                 .bus_id= RK29_CAM_PLATFORM_DEV_ID,\r
                 #endif\r
                .power          = rk_sensor_power,\r
-                #if (CONFIG_SENSOR_RESET_PIN_1 != INVALID_GPIO)\r
+                #if (CONFIG_SENSOR_RESET_PIN_02 != INVALID_GPIO)\r
                .reset          = rk_sensor_reset,\r
                 #endif   \r
                .powerdown      = rk_sensor_powerdown,\r
@@ -636,7 +640,7 @@ static struct rk29camera_platform_data rk_camera_platform_data = {
                 .bus_id= RK29_CAM_PLATFORM_DEV_ID,\r
                 #endif\r
                .power          = rk_sensor_power,\r
-                #if (CONFIG_SENSOR_RESET_PIN_1 != INVALID_GPIO)\r
+                #if (CONFIG_SENSOR_RESET_PIN_11 != INVALID_GPIO)\r
                .reset          = rk_sensor_reset,\r
                 #endif   \r
                .powerdown      = rk_sensor_powerdown,\r
@@ -669,7 +673,7 @@ static struct rk29camera_platform_data rk_camera_platform_data = {
                 .bus_id= RK29_CAM_PLATFORM_DEV_ID,\r
                 #endif\r
                .power          = rk_sensor_power,\r
-                #if (CONFIG_SENSOR_RESET_PIN_1 != INVALID_GPIO)\r
+                #if (CONFIG_SENSOR_RESET_PIN_12 != INVALID_GPIO)\r
                .reset          = rk_sensor_reset,\r
                 #endif   \r
                .powerdown      = rk_sensor_powerdown,\r
@@ -1281,7 +1285,9 @@ static int rk_sensor_power(struct device *dev, int on)
        rk_sensor_ioctrl(dev,Cam_Power,on);\r
     return 0;\r
 }\r
-#if (CONFIG_SENSOR_RESET_PIN_0 != INVALID_GPIO) || (CONFIG_SENSOR_RESET_PIN_1 != INVALID_GPIO)\r
+#if (CONFIG_SENSOR_RESET_PIN_0 != INVALID_GPIO) || (CONFIG_SENSOR_RESET_PIN_1 != INVALID_GPIO) \\r
+    || (CONFIG_SENSOR_RESET_PIN_01 != INVALID_GPIO) || (CONFIG_SENSOR_RESET_PIN_02 != INVALID_GPIO) \\r
+    || (CONFIG_SENSOR_RESET_PIN_11 != INVALID_GPIO) || (CONFIG_SENSOR_RESET_PIN_12 != INVALID_GPIO)\r
 static int rk_sensor_reset(struct device *dev)\r
 {\r
        rk_sensor_ioctrl(dev,Cam_Reset,1);\r
@@ -1294,8 +1300,7 @@ static int rk_sensor_powerdown(struct device *dev, int on)
 {\r
        return rk_sensor_ioctrl(dev,Cam_PowerDown,on);\r
 }\r
-\r
-#ifdef PMEM_CAM_NECESSARY\r
+#if ((defined PMEM_CAM_NECESSARY)&&(defined CONFIG_VIDEO_RK29_CAMMEM_PMEM))\r
 static struct android_pmem_platform_data android_pmem_cam_pdata = {\r
        .name           = "pmem_cam",\r
        .start          = PMEM_CAM_BASE,\r