mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-09 03:10:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

media: i2c: alvium: removal of dft_fr, min_fr and max_fr

Browse Source 
The dft_fr, min_fr and max_fr fields of the alvium_dev structure are
only used to pass results from alvium_get_frame_interval() to its
caller. Replace them with function parameters.

Signed-off-by: Tommaso Merciai <tomm.merciai@gmail.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
This commit is contained in:
Tommaso Merciai
2023-12-20 13:40:19 +01:00
committed by Hans Verkuil
parent e0b8eb0f6d
commit b5c5a02b3d
2 changed files with 9 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
drivers/media/i2c/alvium-csi2.c
View File

@@ -1170,25 +1170,19 @@ static int alvium_set_bayer_pattern(struct alvium_dev *alvium,
return 0;
}
static int alvium_get_frame_interval(struct alvium_dev *alvium)
static int alvium_get_frame_interval(struct alvium_dev *alvium,
u64 *dft_fr, u64 *min_fr, u64 *max_fr)
{
u64 dft_fr, min_fr, max_fr;
int ret = 0;
alvium_read(alvium, REG_BCRM_ACQUISITION_FRAME_RATE_RW,
&dft_fr, &ret);
dft_fr, &ret);
alvium_read(alvium, REG_BCRM_ACQUISITION_FRAME_RATE_MIN_R,
&min_fr, &ret);
min_fr, &ret);
alvium_read(alvium, REG_BCRM_ACQUISITION_FRAME_RATE_MAX_R,
&max_fr, &ret);
if (ret)
return ret;
max_fr, &ret);
alvium->dft_fr = dft_fr;
alvium->min_fr = min_fr;
alvium->max_fr = max_fr;
return 0;
return ret;
}
static int alvium_set_frame_rate(struct alvium_dev *alvium)
@@ -1670,21 +1664,18 @@ static int alvium_set_frame_interval(struct alvium_dev *alvium,
struct v4l2_subdev_frame_interval *fi)
{
struct device *dev = &alvium->i2c_client->dev;
u64 req_fr, min_fr, max_fr;
u64 req_fr, dft_fr, min_fr, max_fr;
int ret;
if (fi->interval.denominator == 0)
return -EINVAL;
ret = alvium_get_frame_interval(alvium);
ret = alvium_get_frame_interval(alvium, &dft_fr, &min_fr, &max_fr);
if (ret) {
dev_err(dev, "Fail to get frame interval\n");
return ret;
}
min_fr = alvium->min_fr;
max_fr = alvium->max_fr;
dev_dbg(dev, "fi->interval.numerator = %d\n",
fi->interval.numerator);
dev_dbg(dev, "fi->interval.denominator = %d\n",
@@ -1694,7 +1685,7 @@ static int alvium_set_frame_interval(struct alvium_dev *alvium,
fi->interval.numerator);
if (req_fr >= max_fr && req_fr <= min_fr)
req_fr = alvium->dft_fr;
req_fr = dft_fr;
alvium->fr = req_fr;
alvium->frame_interval.numerator = fi->interval.numerator;

3
drivers/media/i2c/alvium-csi2.h
View File

@@ -443,9 +443,6 @@ struct alvium_dev {
struct alvium_mode mode;
struct v4l2_fract frame_interval;
u64 dft_fr;
u64 min_fr;
u64 max_fr;
u64 fr;
u8 h_sup_csi_lanes;