|
@@ -35,7 +35,6 @@
|
|
|
#include <linux/i2c.h>
|
|
|
#include <linux/delay.h>
|
|
|
#include <media/v4l2-common.h>
|
|
|
-#include <media/v4l2-chip-ident.h>
|
|
|
#include <media/v4l2-device.h>
|
|
|
#include "au8522.h"
|
|
|
#include "au8522_priv.h"
|
|
@@ -524,11 +523,8 @@ static int au8522_s_ctrl(struct v4l2_ctrl *ctrl)
|
|
|
static int au8522_g_register(struct v4l2_subdev *sd,
|
|
|
struct v4l2_dbg_register *reg)
|
|
|
{
|
|
|
- struct i2c_client *client = v4l2_get_subdevdata(sd);
|
|
|
struct au8522_state *state = to_state(sd);
|
|
|
|
|
|
- if (!v4l2_chip_match_i2c_client(client, ®->match))
|
|
|
- return -EINVAL;
|
|
|
reg->val = au8522_readreg(state, reg->reg & 0xffff);
|
|
|
return 0;
|
|
|
}
|
|
@@ -536,11 +532,8 @@ static int au8522_g_register(struct v4l2_subdev *sd,
|
|
|
static int au8522_s_register(struct v4l2_subdev *sd,
|
|
|
const struct v4l2_dbg_register *reg)
|
|
|
{
|
|
|
- struct i2c_client *client = v4l2_get_subdevdata(sd);
|
|
|
struct au8522_state *state = to_state(sd);
|
|
|
|
|
|
- if (!v4l2_chip_match_i2c_client(client, ®->match))
|
|
|
- return -EINVAL;
|
|
|
au8522_writereg(state, reg->reg, reg->val & 0xff);
|
|
|
return 0;
|
|
|
}
|
|
@@ -632,20 +625,10 @@ static int au8522_g_tuner(struct v4l2_subdev *sd, struct v4l2_tuner *vt)
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
-static int au8522_g_chip_ident(struct v4l2_subdev *sd,
|
|
|
- struct v4l2_dbg_chip_ident *chip)
|
|
|
-{
|
|
|
- struct au8522_state *state = to_state(sd);
|
|
|
- struct i2c_client *client = v4l2_get_subdevdata(sd);
|
|
|
-
|
|
|
- return v4l2_chip_ident_i2c_client(client, chip, state->id, state->rev);
|
|
|
-}
|
|
|
-
|
|
|
/* ----------------------------------------------------------------------- */
|
|
|
|
|
|
static const struct v4l2_subdev_core_ops au8522_core_ops = {
|
|
|
.log_status = v4l2_ctrl_subdev_log_status,
|
|
|
- .g_chip_ident = au8522_g_chip_ident,
|
|
|
.reset = au8522_reset,
|
|
|
#ifdef CONFIG_VIDEO_ADV_DEBUG
|
|
|
.g_register = au8522_g_register,
|