commit cd07ecfbed82ac971ded1167b6e91052a42674d5
author Alex Van Damme <atv@google.com> Wed Sep 09 12:26:01 2020 -0700
committer Alex Van Damme <atv@google.com> Wed Sep 09 14:52:38 2020 -0700
tree fc57987687e50aca644c946461a7c6ece069420e
parent 5cd935f49fc698dc5711f2b5d74f16270a638aab

Fix ov5645_mipi_v2 compile problems after import

- Fix compilation issues after importing from 4.14

Change-Id: I0c44d19489832c0e2f9026f4b78e9b52c33223d8

drivers/media/platform/mxc/capture/ov5645_mipi_v2.c

diff --git a/drivers/media/platform/mxc/capture/ov5645_mipi_v2.c b/drivers/media/platform/mxc/capture/ov5645_mipi_v2.c
index ab8da94..6b37dec 100644
--- a/drivers/media/platform/mxc/capture/ov5645_mipi_v2.c
+++ b/drivers/media/platform/mxc/capture/ov5645_mipi_v2.c
@@ -3381,8 +3381,6 @@
 }
 
 static struct v4l2_subdev_video_ops ov5645_subdev_video_ops = {
-	.g_parm = ov5645_g_parm,
-	.s_parm = ov5645_s_parm,
 	.s_stream = ov5645_s_stream,
 };
 
@@ -3396,10 +3394,6 @@
 
 static struct v4l2_subdev_core_ops ov5645_subdev_core_ops = {
 	.s_power	= ov5645_s_power,
-#ifdef CONFIG_VIDEO_ADV_DEBUG
-	.g_register	= ov5645_get_register,
-	.s_register	= ov5645_set_register,
-#endif
 	.queryctrl	= ov5645_queryctrl,
 };
 
@@ -3423,7 +3417,7 @@
 			regsetting->u8Val = 0x17;
 }
 
-static int ov5645_set_regs(const char *buffer, struct kernel_param *kp)
+static int ov5645_set_regs(const char *buffer, const struct kernel_param *kp)
 {
 	// Use this sysfs node to set the ov5645 isp regs by sending it a
 	// comma separated list of register value pairs in hex
@@ -3459,7 +3453,7 @@
 }
 
 static int reg_addr_to_read;
-static int ov5645_set_print_reg(const char *buffer, struct kernel_param *kp)
+static int ov5645_set_print_reg(const char *buffer, const struct kernel_param *kp)
 {
 	int cnt;
 	cnt = sscanf(buffer, "%x", &reg_addr_to_read);
@@ -3469,7 +3463,7 @@
 	return 0;
 }
 
-static int ov5645_get_print_reg(char *buffer, struct kernel_param *kp)
+static int ov5645_get_print_reg(char *buffer, const struct kernel_param *kp)
 {
 	int cnt, retval;
 	u8 val;
@@ -3483,7 +3477,7 @@
 	return cnt;
 }
 
-static int ov5645_set_af_mode(const char *buffer, struct kernel_param *kp)
+static int ov5645_set_af_mode(const char *buffer, const struct kernel_param *kp)
 {
 	int cnt, val;
 	cnt = sscanf(buffer, "%d", &val);
@@ -3505,7 +3499,7 @@
 	return 0;
 }
 
-static int ov5645_read_af(char *buffer, struct kernel_param *kp)
+static int ov5645_read_af(char *buffer, const struct kernel_param *kp)
 {
 	int cnt, retval;
 	u8 val;
@@ -3515,7 +3509,7 @@
 	return cnt;
 }
 
-static int ov5645_get_initialized(char *buffer, struct kernel_param *kp)
+static int ov5645_get_initialized(char *buffer, const struct kernel_param *kp)
 {
 	int cnt;
 	cnt = sprintf(buffer, "%d", ov5645_data.initialized ? 1 : 0);