aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/i2c/soc_camera/ov9740.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/i2c/soc_camera/ov9740.c')
-rw-r--r--drivers/media/i2c/soc_camera/ov9740.c17
1 files changed, 0 insertions, 17 deletions
diff --git a/drivers/media/i2c/soc_camera/ov9740.c b/drivers/media/i2c/soc_camera/ov9740.c
index 012bd6271124..0bc21a643c08 100644
--- a/drivers/media/i2c/soc_camera/ov9740.c
+++ b/drivers/media/i2c/soc_camera/ov9740.c
@@ -17,7 +17,6 @@
17#include <linux/v4l2-mediabus.h> 17#include <linux/v4l2-mediabus.h>
18 18
19#include <media/soc_camera.h> 19#include <media/soc_camera.h>
20#include <media/v4l2-chip-ident.h>
21#include <media/v4l2-ctrls.h> 20#include <media/v4l2-ctrls.h>
22 21
23#define to_ov9740(sd) container_of(sd, struct ov9740_priv, subdev) 22#define to_ov9740(sd) container_of(sd, struct ov9740_priv, subdev)
@@ -197,7 +196,6 @@ struct ov9740_priv {
197 struct v4l2_subdev subdev; 196 struct v4l2_subdev subdev;
198 struct v4l2_ctrl_handler hdl; 197 struct v4l2_ctrl_handler hdl;
199 198
200 int ident;
201 u16 model; 199 u16 model;
202 u8 revision; 200 u8 revision;
203 u8 manid; 201 u8 manid;
@@ -772,18 +770,6 @@ static int ov9740_s_ctrl(struct v4l2_ctrl *ctrl)
772 return 0; 770 return 0;
773} 771}
774 772
775/* Get chip identification */
776static int ov9740_g_chip_ident(struct v4l2_subdev *sd,
777 struct v4l2_dbg_chip_ident *id)
778{
779 struct ov9740_priv *priv = to_ov9740(sd);
780
781 id->ident = priv->ident;
782 id->revision = priv->revision;
783
784 return 0;
785}
786
787static int ov9740_s_power(struct v4l2_subdev *sd, int on) 773static int ov9740_s_power(struct v4l2_subdev *sd, int on)
788{ 774{
789 struct i2c_client *client = v4l2_get_subdevdata(sd); 775 struct i2c_client *client = v4l2_get_subdevdata(sd);
@@ -887,8 +873,6 @@ static int ov9740_video_probe(struct i2c_client *client)
887 goto done; 873 goto done;
888 } 874 }
889 875
890 priv->ident = V4L2_IDENT_OV9740;
891
892 dev_info(&client->dev, "ov9740 Model ID 0x%04x, Revision 0x%02x, " 876 dev_info(&client->dev, "ov9740 Model ID 0x%04x, Revision 0x%02x, "
893 "Manufacturer 0x%02x, SMIA Version 0x%02x\n", 877 "Manufacturer 0x%02x, SMIA Version 0x%02x\n",
894 priv->model, priv->revision, priv->manid, priv->smiaver); 878 priv->model, priv->revision, priv->manid, priv->smiaver);
@@ -927,7 +911,6 @@ static struct v4l2_subdev_video_ops ov9740_video_ops = {
927}; 911};
928 912
929static struct v4l2_subdev_core_ops ov9740_core_ops = { 913static struct v4l2_subdev_core_ops ov9740_core_ops = {
930 .g_chip_ident = ov9740_g_chip_ident,
931 .s_power = ov9740_s_power, 914 .s_power = ov9740_s_power,
932#ifdef CONFIG_VIDEO_ADV_DEBUG 915#ifdef CONFIG_VIDEO_ADV_DEBUG
933 .g_register = ov9740_get_register, 916 .g_register = ov9740_get_register,