Message ID | 20210809225845.916430-7-djrscally@gmail.com |
---|---|
State | Accepted |
Commit | d938b2f29be6ad5eb1b04c5bf0e3afa4348e9195 |
Headers | show |
Series | Extensions to ov8865 driver | expand |
On Mon, Aug 09, 2021 at 11:58:39PM +0100, Daniel Scally wrote: > @@ -2143,7 +2143,7 @@ static int ov8865_exposure_configure(struct ov8865_sensor *sensor, u32 exposure) > > /* Gain */ > > -static int ov8865_gain_configure(struct ov8865_sensor *sensor, u32 gain) > +static int ov8865_analog_gain_configure(struct ov8865_sensor *sensor, u32 gain) > { > int ret; > > @@ -2453,8 +2453,8 @@ static int ov8865_s_ctrl(struct v4l2_ctrl *ctrl) > if (ret) > return ret; > break; > - case V4L2_CID_GAIN: > - ret = ov8865_gain_configure(sensor, ctrl->val); > + case V4L2_CID_ANALOGUE_GAIN: > + ret = ov8865_analog_gain_configure(sensor, ctrl->val); > if (ret) > return ret; > break; > @@ -2499,7 +2499,7 @@ static int ov8865_ctrls_init(struct ov8865_sensor *sensor) > > /* Gain */ > > - v4l2_ctrl_new_std(handler, ops, V4L2_CID_GAIN, 128, 8191, 128, 128); > + v4l2_ctrl_new_std(handler, ops, V4L2_CID_ANALOGUE_GAIN, 128, 8191, 128, 128); Over 80, please wrap. -- Sakari Ailus
diff --git a/drivers/media/i2c/ov8865.c b/drivers/media/i2c/ov8865.c index 8c2b7d3cbc8c..a97e355c1e07 100644 --- a/drivers/media/i2c/ov8865.c +++ b/drivers/media/i2c/ov8865.c @@ -2143,7 +2143,7 @@ static int ov8865_exposure_configure(struct ov8865_sensor *sensor, u32 exposure) /* Gain */ -static int ov8865_gain_configure(struct ov8865_sensor *sensor, u32 gain) +static int ov8865_analog_gain_configure(struct ov8865_sensor *sensor, u32 gain) { int ret; @@ -2453,8 +2453,8 @@ static int ov8865_s_ctrl(struct v4l2_ctrl *ctrl) if (ret) return ret; break; - case V4L2_CID_GAIN: - ret = ov8865_gain_configure(sensor, ctrl->val); + case V4L2_CID_ANALOGUE_GAIN: + ret = ov8865_analog_gain_configure(sensor, ctrl->val); if (ret) return ret; break; @@ -2499,7 +2499,7 @@ static int ov8865_ctrls_init(struct ov8865_sensor *sensor) /* Gain */ - v4l2_ctrl_new_std(handler, ops, V4L2_CID_GAIN, 128, 8191, 128, 128); + v4l2_ctrl_new_std(handler, ops, V4L2_CID_ANALOGUE_GAIN, 128, 8191, 128, 128); /* White Balance */