diff options
| author | Laurent Pinchart <laurent.pinchart@linaro.org> | 2015-04-26 03:41:47 +0300 |
|---|---|---|
| committer | Laurent Pinchart <laurent.pinchart@linaro.org> | 2015-04-28 21:03:05 +0300 |
| commit | 2a8769ec8230bcfb79a2d15cd9c4c2ef8be3e0dd (patch) | |
| tree | 7a9becca59152e0800b90a9f131754de01842d8a | |
| parent | 76b8ee4beb486780bb34bf500fc947c9ddcea372 (diff) | |
media: s5k8aa: Remove the core.g_chip_ident operation
The operation g_chip_ident is deprecated, remove it.
Signed-off-by: Laurent Pinchart <laurent.pinchart@linaro.org>
Acked-By: Vaibhav Hiremath <vaibhav.hiremath@linaro.org>
| -rw-r--r-- | drivers/media/i2c/soc_camera/s5k8aa.c | 14 | ||||
| -rw-r--r-- | drivers/media/i2c/soc_camera/s5k8aa.h | 2 |
2 files changed, 0 insertions, 16 deletions
diff --git a/drivers/media/i2c/soc_camera/s5k8aa.c b/drivers/media/i2c/soc_camera/s5k8aa.c index 39adb3f38844..af4feef3f09c 100644 --- a/drivers/media/i2c/soc_camera/s5k8aa.c +++ b/drivers/media/i2c/soc_camera/s5k8aa.c @@ -20,7 +20,6 @@ #include <linux/videodev2.h> #include <linux/platform_data/camera-mmp.h> #include <linux/v4l2-mediabus.h> -#include <media/v4l2-chip-ident.h> #include "s5k8aa.h" MODULE_DESCRIPTION("Samsumg S5K8AA Camera Driver"); @@ -215,18 +214,6 @@ out: return ret; } -static int s5k8aa_g_chip_ident(struct v4l2_subdev *sd, - struct v4l2_dbg_chip_ident *id) -{ - struct i2c_client *client = v4l2_get_subdevdata(sd); - struct s5k8aa *s5k8aa = to_s5k8aa(client); - - id->ident = s5k8aa->model; - id->revision = 0; - - return 0; -} - #ifdef CONFIG_VIDEO_ADV_DEBUG static int s5k8aa_g_register(struct v4l2_subdev *sd, struct v4l2_dbg_register *reg) @@ -428,7 +415,6 @@ static int s5k8aa_s_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl) static struct v4l2_subdev_core_ops s5k8aa_subdev_core_ops = { .s_power = s5k8aa_s_power, - .g_chip_ident = s5k8aa_g_chip_ident, .s_ctrl = s5k8aa_s_ctrl, #ifdef CONFIG_VIDEO_ADV_DEBUG .g_register = s5k8aa_g_register, diff --git a/drivers/media/i2c/soc_camera/s5k8aa.h b/drivers/media/i2c/soc_camera/s5k8aa.h index cd44c6bc5e1d..aff5bb51dd3f 100644 --- a/drivers/media/i2c/soc_camera/s5k8aa.h +++ b/drivers/media/i2c/soc_camera/s5k8aa.h @@ -3,7 +3,6 @@ #include <linux/regulator/consumer.h> #include <linux/types.h> -#include <media/v4l2-chip-ident.h> #include <media/v4l2-common.h> /* The token to indicate array termination */ @@ -61,7 +60,6 @@ struct s5k8aa_format { struct s5k8aa { struct v4l2_subdev subdev; - int model; /* V4L2_IDENT_S5K8AA* codes from v4l2-chip-ident.h */ struct v4l2_rect rect; u32 pixfmt; int frame_rate; |