| Message ID | 20231215082452.1720481-2-tomm.merciai@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | media: i2c: alvium: store frame interval in subdev state | expand |
Hi Tommaso, Thank you for the patch. On Fri, Dec 15, 2023 at 09:24:50AM +0100, Tommaso Merciai wrote: > Remove driver private data dft_fr, min_fr and max_fr. > Those are used only in alvium_set_frame_interval function. > Use local ones instead. The fields are used to pass data from alvium_get_frame_interval() to its caller, not just in alvium_get_frame_interval(). You can write 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> > --- > drivers/media/i2c/alvium-csi2.c | 45 +++++++++++++++------------------ > drivers/media/i2c/alvium-csi2.h | 3 --- > 2 files changed, 21 insertions(+), 27 deletions(-) > > diff --git a/drivers/media/i2c/alvium-csi2.c b/drivers/media/i2c/alvium-csi2.c > index 34ff7fad3877..c4b7851045a1 100644 > --- a/drivers/media/i2c/alvium-csi2.c > +++ b/drivers/media/i2c/alvium-csi2.c > @@ -1170,40 +1170,36 @@ 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); > + max_fr, &ret); > if (ret) > return ret; You can just return ret; > > - alvium->dft_fr = dft_fr; > - alvium->min_fr = min_fr; > - alvium->max_fr = max_fr; > - > return 0; > } > > -static int alvium_set_frame_rate(struct alvium_dev *alvium) > +static int alvium_set_frame_rate(struct alvium_dev *alvium, u64 fr) > { > struct device *dev = &alvium->i2c_client->dev; > int ret; > > ret = alvium_write_hshake(alvium, REG_BCRM_ACQUISITION_FRAME_RATE_RW, > - alvium->fr); > + fr); This is unrelated to the commit message. Please split handling of the fr field to a separate patch. One change, one patch. > if (ret) { > dev_err(dev, "Fail to set frame rate lanes reg\n"); > return ret; > } > > - dev_dbg(dev, "set frame rate: %llu us\n", alvium->fr); > + dev_dbg(dev, "set frame rate: %llu us\n", fr); > > return 0; > } > @@ -1667,36 +1663,36 @@ static int alvium_g_frame_interval(struct v4l2_subdev *sd, > } > > static int alvium_set_frame_interval(struct alvium_dev *alvium, > - struct v4l2_subdev_frame_interval *fi) > + struct v4l2_subdev *sd, > + struct v4l2_subdev_state *sd_state, > + struct v4l2_subdev_frame_interval *fi, > + u64 *req_fr) > { > struct device *dev = &alvium->i2c_client->dev; > - u64 req_fr, min_fr, max_fr; > + u64 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", > fi->interval.denominator); > > - req_fr = (u64)((fi->interval.denominator * USEC_PER_SEC) / > + *req_fr = (u64)((fi->interval.denominator * USEC_PER_SEC) / > fi->interval.numerator); > > - if (req_fr >= max_fr && req_fr <= min_fr) > - req_fr = alvium->dft_fr; > + if (*req_fr >= max_fr && *req_fr <= min_fr) > + *req_fr = dft_fr; > > - alvium->fr = req_fr; > + alvium->fr = *req_fr; > alvium->frame_interval.numerator = fi->interval.numerator; > alvium->frame_interval.denominator = fi->interval.denominator; > > @@ -1708,6 +1704,7 @@ static int alvium_s_frame_interval(struct v4l2_subdev *sd, > struct v4l2_subdev_frame_interval *fi) > { > struct alvium_dev *alvium = sd_to_alvium(sd); > + u64 req_fr; > int ret; > > /* > @@ -1720,9 +1717,9 @@ static int alvium_s_frame_interval(struct v4l2_subdev *sd, > if (alvium->streaming) > return -EBUSY; > > - ret = alvium_set_frame_interval(alvium, fi); > + ret = alvium_set_frame_interval(alvium, sd, sd_state, fi, &req_fr); > if (!ret) > - ret = alvium_set_frame_rate(alvium); > + ret = alvium_set_frame_rate(alvium, req_fr); > > return ret; > } > diff --git a/drivers/media/i2c/alvium-csi2.h b/drivers/media/i2c/alvium-csi2.h > index 8b554bffdc39..a6529b28e7dd 100644 > --- a/drivers/media/i2c/alvium-csi2.h > +++ b/drivers/media/i2c/alvium-csi2.h > @@ -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;
On Mon, Dec 18, 2023 at 04:50:46AM +0200, Laurent Pinchart wrote: > Hi Tommaso, > > Thank you for the patch. > > On Fri, Dec 15, 2023 at 09:24:50AM +0100, Tommaso Merciai wrote: > > Remove driver private data dft_fr, min_fr and max_fr. > > Those are used only in alvium_set_frame_interval function. > > Use local ones instead. > > The fields are used to pass data from alvium_get_frame_interval() to its > caller, not just in alvium_get_frame_interval(). You can write > > 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> > > --- > > drivers/media/i2c/alvium-csi2.c | 45 +++++++++++++++------------------ > > drivers/media/i2c/alvium-csi2.h | 3 --- > > 2 files changed, 21 insertions(+), 27 deletions(-) > > > > diff --git a/drivers/media/i2c/alvium-csi2.c b/drivers/media/i2c/alvium-csi2.c > > index 34ff7fad3877..c4b7851045a1 100644 > > --- a/drivers/media/i2c/alvium-csi2.c > > +++ b/drivers/media/i2c/alvium-csi2.c > > @@ -1170,40 +1170,36 @@ 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); > > + max_fr, &ret); > > if (ret) > > return ret; > > You can just > > return ret; > > > > > - alvium->dft_fr = dft_fr; > > - alvium->min_fr = min_fr; > > - alvium->max_fr = max_fr; > > - > > return 0; > > } > > > > -static int alvium_set_frame_rate(struct alvium_dev *alvium) > > +static int alvium_set_frame_rate(struct alvium_dev *alvium, u64 fr) > > { > > struct device *dev = &alvium->i2c_client->dev; > > int ret; > > > > ret = alvium_write_hshake(alvium, REG_BCRM_ACQUISITION_FRAME_RATE_RW, > > - alvium->fr); > > + fr); > > This is unrelated to the commit message. Please split handling of the fr > field to a separate patch. One change, one patch. > > > if (ret) { > > dev_err(dev, "Fail to set frame rate lanes reg\n"); > > return ret; > > } > > > > - dev_dbg(dev, "set frame rate: %llu us\n", alvium->fr); > > + dev_dbg(dev, "set frame rate: %llu us\n", fr); > > > > return 0; > > } > > @@ -1667,36 +1663,36 @@ static int alvium_g_frame_interval(struct v4l2_subdev *sd, > > } > > > > static int alvium_set_frame_interval(struct alvium_dev *alvium, > > - struct v4l2_subdev_frame_interval *fi) > > + struct v4l2_subdev *sd, > > + struct v4l2_subdev_state *sd_state, This is also unrelated to this patch. > > + struct v4l2_subdev_frame_interval *fi, > > + u64 *req_fr) > > { > > struct device *dev = &alvium->i2c_client->dev; > > - u64 req_fr, min_fr, max_fr; > > + u64 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", > > fi->interval.denominator); > > > > - req_fr = (u64)((fi->interval.denominator * USEC_PER_SEC) / > > + *req_fr = (u64)((fi->interval.denominator * USEC_PER_SEC) / > > fi->interval.numerator); > > > > - if (req_fr >= max_fr && req_fr <= min_fr) > > - req_fr = alvium->dft_fr; > > + if (*req_fr >= max_fr && *req_fr <= min_fr) > > + *req_fr = dft_fr; > > > > - alvium->fr = req_fr; > > + alvium->fr = *req_fr; > > alvium->frame_interval.numerator = fi->interval.numerator; > > alvium->frame_interval.denominator = fi->interval.denominator; > > > > @@ -1708,6 +1704,7 @@ static int alvium_s_frame_interval(struct v4l2_subdev *sd, > > struct v4l2_subdev_frame_interval *fi) > > { > > struct alvium_dev *alvium = sd_to_alvium(sd); > > + u64 req_fr; > > int ret; > > > > /* > > @@ -1720,9 +1717,9 @@ static int alvium_s_frame_interval(struct v4l2_subdev *sd, > > if (alvium->streaming) > > return -EBUSY; > > > > - ret = alvium_set_frame_interval(alvium, fi); > > + ret = alvium_set_frame_interval(alvium, sd, sd_state, fi, &req_fr); > > if (!ret) > > - ret = alvium_set_frame_rate(alvium); > > + ret = alvium_set_frame_rate(alvium, req_fr); > > > > return ret; > > } > > diff --git a/drivers/media/i2c/alvium-csi2.h b/drivers/media/i2c/alvium-csi2.h > > index 8b554bffdc39..a6529b28e7dd 100644 > > --- a/drivers/media/i2c/alvium-csi2.h > > +++ b/drivers/media/i2c/alvium-csi2.h > > @@ -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;
Hi Laurent, Thanks for your review. On Mon, Dec 18, 2023 at 04:54:30AM +0200, Laurent Pinchart wrote: > On Mon, Dec 18, 2023 at 04:50:46AM +0200, Laurent Pinchart wrote: > > Hi Tommaso, > > > > Thank you for the patch. > > > > On Fri, Dec 15, 2023 at 09:24:50AM +0100, Tommaso Merciai wrote: > > > Remove driver private data dft_fr, min_fr and max_fr. > > > Those are used only in alvium_set_frame_interval function. > > > Use local ones instead. > > > > The fields are used to pass data from alvium_get_frame_interval() to its > > caller, not just in alvium_get_frame_interval(). You can write > > > > 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. Thanks for the hint. > > > > > Signed-off-by: Tommaso Merciai <tomm.merciai@gmail.com> > > > --- > > > drivers/media/i2c/alvium-csi2.c | 45 +++++++++++++++------------------ > > > drivers/media/i2c/alvium-csi2.h | 3 --- > > > 2 files changed, 21 insertions(+), 27 deletions(-) > > > > > > diff --git a/drivers/media/i2c/alvium-csi2.c b/drivers/media/i2c/alvium-csi2.c > > > index 34ff7fad3877..c4b7851045a1 100644 > > > --- a/drivers/media/i2c/alvium-csi2.c > > > +++ b/drivers/media/i2c/alvium-csi2.c > > > @@ -1170,40 +1170,36 @@ 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); > > > + max_fr, &ret); > > > if (ret) > > > return ret; > > > > You can just > > > > return ret; I'll do this in v2, thanks. > > > > > > > > - alvium->dft_fr = dft_fr; > > > - alvium->min_fr = min_fr; > > > - alvium->max_fr = max_fr; > > > - > > > return 0; > > > } > > > > > > -static int alvium_set_frame_rate(struct alvium_dev *alvium) > > > +static int alvium_set_frame_rate(struct alvium_dev *alvium, u64 fr) > > > { > > > struct device *dev = &alvium->i2c_client->dev; > > > int ret; > > > > > > ret = alvium_write_hshake(alvium, REG_BCRM_ACQUISITION_FRAME_RATE_RW, > > > - alvium->fr); > > > + fr); > > > > This is unrelated to the commit message. Please split handling of the fr > > field to a separate patch. One change, one patch. Right.. > > > > > if (ret) { > > > dev_err(dev, "Fail to set frame rate lanes reg\n"); > > > return ret; > > > } > > > > > > - dev_dbg(dev, "set frame rate: %llu us\n", alvium->fr); > > > + dev_dbg(dev, "set frame rate: %llu us\n", fr); > > > > > > return 0; > > > } > > > @@ -1667,36 +1663,36 @@ static int alvium_g_frame_interval(struct v4l2_subdev *sd, > > > } > > > > > > static int alvium_set_frame_interval(struct alvium_dev *alvium, > > > - struct v4l2_subdev_frame_interval *fi) > > > + struct v4l2_subdev *sd, > > > + struct v4l2_subdev_state *sd_state, > > This is also unrelated to this patch. > > > > + struct v4l2_subdev_frame_interval *fi, > > > + u64 *req_fr) > > > { > > > struct device *dev = &alvium->i2c_client->dev; > > > - u64 req_fr, min_fr, max_fr; > > > + u64 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", > > > fi->interval.denominator); > > > > > > - req_fr = (u64)((fi->interval.denominator * USEC_PER_SEC) / > > > + *req_fr = (u64)((fi->interval.denominator * USEC_PER_SEC) / > > > fi->interval.numerator); > > > > > > - if (req_fr >= max_fr && req_fr <= min_fr) > > > - req_fr = alvium->dft_fr; > > > + if (*req_fr >= max_fr && *req_fr <= min_fr) > > > + *req_fr = dft_fr; > > > > > > - alvium->fr = req_fr; > > > + alvium->fr = *req_fr; > > > alvium->frame_interval.numerator = fi->interval.numerator; > > > alvium->frame_interval.denominator = fi->interval.denominator; > > > > > > @@ -1708,6 +1704,7 @@ static int alvium_s_frame_interval(struct v4l2_subdev *sd, > > > struct v4l2_subdev_frame_interval *fi) > > > { > > > struct alvium_dev *alvium = sd_to_alvium(sd); > > > + u64 req_fr; > > > int ret; > > > > > > /* > > > @@ -1720,9 +1717,9 @@ static int alvium_s_frame_interval(struct v4l2_subdev *sd, > > > if (alvium->streaming) > > > return -EBUSY; > > > > > > - ret = alvium_set_frame_interval(alvium, fi); > > > + ret = alvium_set_frame_interval(alvium, sd, sd_state, fi, &req_fr); > > > if (!ret) > > > - ret = alvium_set_frame_rate(alvium); > > > + ret = alvium_set_frame_rate(alvium, req_fr); > > > > > > return ret; > > > } > > > diff --git a/drivers/media/i2c/alvium-csi2.h b/drivers/media/i2c/alvium-csi2.h > > > index 8b554bffdc39..a6529b28e7dd 100644 > > > --- a/drivers/media/i2c/alvium-csi2.h > > > +++ b/drivers/media/i2c/alvium-csi2.h > > > @@ -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; Plan for v2 is splitting this series into another patch as you suggest: media: i2c: alvium: removal of dft_fr, min_fr and max_fr + media: i2c: alvium: removal of fr field media: i2c: alvium: store frame interval in subdev state media: i2c: alvium: inline set_frame_interval into s_frame_interval Thanks & Regards, Tommaso > > -- > Regards, > > Laurent Pinchart
diff --git a/drivers/media/i2c/alvium-csi2.c b/drivers/media/i2c/alvium-csi2.c index 34ff7fad3877..c4b7851045a1 100644 --- a/drivers/media/i2c/alvium-csi2.c +++ b/drivers/media/i2c/alvium-csi2.c @@ -1170,40 +1170,36 @@ 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); + max_fr, &ret); if (ret) return ret; - alvium->dft_fr = dft_fr; - alvium->min_fr = min_fr; - alvium->max_fr = max_fr; - return 0; } -static int alvium_set_frame_rate(struct alvium_dev *alvium) +static int alvium_set_frame_rate(struct alvium_dev *alvium, u64 fr) { struct device *dev = &alvium->i2c_client->dev; int ret; ret = alvium_write_hshake(alvium, REG_BCRM_ACQUISITION_FRAME_RATE_RW, - alvium->fr); + fr); if (ret) { dev_err(dev, "Fail to set frame rate lanes reg\n"); return ret; } - dev_dbg(dev, "set frame rate: %llu us\n", alvium->fr); + dev_dbg(dev, "set frame rate: %llu us\n", fr); return 0; } @@ -1667,36 +1663,36 @@ static int alvium_g_frame_interval(struct v4l2_subdev *sd, } static int alvium_set_frame_interval(struct alvium_dev *alvium, - struct v4l2_subdev_frame_interval *fi) + struct v4l2_subdev *sd, + struct v4l2_subdev_state *sd_state, + struct v4l2_subdev_frame_interval *fi, + u64 *req_fr) { struct device *dev = &alvium->i2c_client->dev; - u64 req_fr, min_fr, max_fr; + u64 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", fi->interval.denominator); - req_fr = (u64)((fi->interval.denominator * USEC_PER_SEC) / + *req_fr = (u64)((fi->interval.denominator * USEC_PER_SEC) / fi->interval.numerator); - if (req_fr >= max_fr && req_fr <= min_fr) - req_fr = alvium->dft_fr; + if (*req_fr >= max_fr && *req_fr <= min_fr) + *req_fr = dft_fr; - alvium->fr = req_fr; + alvium->fr = *req_fr; alvium->frame_interval.numerator = fi->interval.numerator; alvium->frame_interval.denominator = fi->interval.denominator; @@ -1708,6 +1704,7 @@ static int alvium_s_frame_interval(struct v4l2_subdev *sd, struct v4l2_subdev_frame_interval *fi) { struct alvium_dev *alvium = sd_to_alvium(sd); + u64 req_fr; int ret; /* @@ -1720,9 +1717,9 @@ static int alvium_s_frame_interval(struct v4l2_subdev *sd, if (alvium->streaming) return -EBUSY; - ret = alvium_set_frame_interval(alvium, fi); + ret = alvium_set_frame_interval(alvium, sd, sd_state, fi, &req_fr); if (!ret) - ret = alvium_set_frame_rate(alvium); + ret = alvium_set_frame_rate(alvium, req_fr); return ret; } diff --git a/drivers/media/i2c/alvium-csi2.h b/drivers/media/i2c/alvium-csi2.h index 8b554bffdc39..a6529b28e7dd 100644 --- a/drivers/media/i2c/alvium-csi2.h +++ b/drivers/media/i2c/alvium-csi2.h @@ -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;
Remove driver private data dft_fr, min_fr and max_fr. Those are used only in alvium_set_frame_interval function. Use local ones instead. Signed-off-by: Tommaso Merciai <tomm.merciai@gmail.com> --- drivers/media/i2c/alvium-csi2.c | 45 +++++++++++++++------------------ drivers/media/i2c/alvium-csi2.h | 3 --- 2 files changed, 21 insertions(+), 27 deletions(-)