| Message ID | 20220419142458.884933-4-gengcixi@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | iio: adc: sc27xx: adjust structure and add PMIC's support | expand |
On Tue, 19 Apr 2022 22:24:54 +0800 Cixi Geng <gengcixi@gmail.com> wrote: > From: Cixi Geng <cixi.geng1@unisoc.com> > > Small adjustment the scale calibration value for the sc2731, > use new name sc2731_[big|small]_scale_graph_calib, and remove > the origin [big|small]_scale_graph_calib struct for unused. > > Fixes: 8ba0dbfd07a35 (iio: adc: sc27xx: Add ADC scale calibration) No blank line here. > > Signed-off-by: Cixi Geng <cixi.geng1@unisoc.com> > --- > drivers/iio/adc/sc27xx_adc.c | 19 +++++++++++-------- > 1 file changed, 11 insertions(+), 8 deletions(-) > > diff --git a/drivers/iio/adc/sc27xx_adc.c b/drivers/iio/adc/sc27xx_adc.c > index aee076c8e2b1..24211d2a71b1 100644 > --- a/drivers/iio/adc/sc27xx_adc.c > +++ b/drivers/iio/adc/sc27xx_adc.c > @@ -103,14 +103,17 @@ static struct sc27xx_adc_linear_graph small_scale_graph = { > 100, 341, > }; > > -static const struct sc27xx_adc_linear_graph big_scale_graph_calib = { > - 4200, 856, > - 3600, 733, > +/* > + * Add the sc2731_[big|small]_scale_graph_calib for sc2731 pmic. > + */ Why Add? Given the variable naming conveys this anyway, I would drop the comment entirely. > +static const struct sc27xx_adc_linear_graph sc2731_big_scale_graph_calib = { > + 4200, 850, > + 3600, 728, > }; > > -static const struct sc27xx_adc_linear_graph small_scale_graph_calib = { > - 1000, 833, > - 100, 80, > +static const struct sc27xx_adc_linear_graph sc2731_small_scale_graph_calib = { > + 1000, 838, > + 100, 84, > }; > > static int sc27xx_adc_get_calib_data(u32 calib_data, int calib_adc) > @@ -130,11 +133,11 @@ static int sc27xx_adc_scale_calibration(struct sc27xx_adc_data *data, > size_t len; > > if (big_scale) { > - calib_graph = &big_scale_graph_calib; > + calib_graph = &sc2731_big_scale_graph_calib; > graph = &big_scale_graph; > cell_name = "big_scale_calib"; > } else { > - calib_graph = &small_scale_graph_calib; > + calib_graph = &sc2731_small_scale_graph_calib; > graph = &small_scale_graph; > cell_name = "small_scale_calib"; > }
On Sun, 24 Apr 2022 18:01:47 +0100 Jonathan Cameron <jic23@kernel.org> wrote: > On Tue, 19 Apr 2022 22:24:54 +0800 > Cixi Geng <gengcixi@gmail.com> wrote: > > > From: Cixi Geng <cixi.geng1@unisoc.com> > > > > Small adjustment the scale calibration value for the sc2731, > > use new name sc2731_[big|small]_scale_graph_calib, and remove > > the origin [big|small]_scale_graph_calib struct for unused. > > > > Fixes: 8ba0dbfd07a35 (iio: adc: sc27xx: Add ADC scale calibration) > No blank line here. > > > > Signed-off-by: Cixi Geng <cixi.geng1@unisoc.com> > > --- > > drivers/iio/adc/sc27xx_adc.c | 19 +++++++++++-------- > > 1 file changed, 11 insertions(+), 8 deletions(-) > > > > diff --git a/drivers/iio/adc/sc27xx_adc.c b/drivers/iio/adc/sc27xx_adc.c > > index aee076c8e2b1..24211d2a71b1 100644 > > --- a/drivers/iio/adc/sc27xx_adc.c > > +++ b/drivers/iio/adc/sc27xx_adc.c > > @@ -103,14 +103,17 @@ static struct sc27xx_adc_linear_graph small_scale_graph = { > > 100, 341, > > }; > > > > -static const struct sc27xx_adc_linear_graph big_scale_graph_calib = { > > - 4200, 856, > > - 3600, 733, > > +/* > > + * Add the sc2731_[big|small]_scale_graph_calib for sc2731 pmic. > > + */ > > Why Add? > > Given the variable naming conveys this anyway, I would drop the comment entirely. I dropped the comment whilst applying and added sc27xx to the patch title prefix. > > > +static const struct sc27xx_adc_linear_graph sc2731_big_scale_graph_calib = { > > + 4200, 850, > > + 3600, 728, > > }; > > > > -static const struct sc27xx_adc_linear_graph small_scale_graph_calib = { > > - 1000, 833, > > - 100, 80, > > +static const struct sc27xx_adc_linear_graph sc2731_small_scale_graph_calib = { > > + 1000, 838, > > + 100, 84, > > }; > > > > static int sc27xx_adc_get_calib_data(u32 calib_data, int calib_adc) > > @@ -130,11 +133,11 @@ static int sc27xx_adc_scale_calibration(struct sc27xx_adc_data *data, > > size_t len; > > > > if (big_scale) { > > - calib_graph = &big_scale_graph_calib; > > + calib_graph = &sc2731_big_scale_graph_calib; > > graph = &big_scale_graph; > > cell_name = "big_scale_calib"; > > } else { > > - calib_graph = &small_scale_graph_calib; > > + calib_graph = &sc2731_small_scale_graph_calib; > > graph = &small_scale_graph; > > cell_name = "small_scale_calib"; > > } >
diff --git a/drivers/iio/adc/sc27xx_adc.c b/drivers/iio/adc/sc27xx_adc.c index aee076c8e2b1..24211d2a71b1 100644 --- a/drivers/iio/adc/sc27xx_adc.c +++ b/drivers/iio/adc/sc27xx_adc.c @@ -103,14 +103,17 @@ static struct sc27xx_adc_linear_graph small_scale_graph = { 100, 341, }; -static const struct sc27xx_adc_linear_graph big_scale_graph_calib = { - 4200, 856, - 3600, 733, +/* + * Add the sc2731_[big|small]_scale_graph_calib for sc2731 pmic. + */ +static const struct sc27xx_adc_linear_graph sc2731_big_scale_graph_calib = { + 4200, 850, + 3600, 728, }; -static const struct sc27xx_adc_linear_graph small_scale_graph_calib = { - 1000, 833, - 100, 80, +static const struct sc27xx_adc_linear_graph sc2731_small_scale_graph_calib = { + 1000, 838, + 100, 84, }; static int sc27xx_adc_get_calib_data(u32 calib_data, int calib_adc) @@ -130,11 +133,11 @@ static int sc27xx_adc_scale_calibration(struct sc27xx_adc_data *data, size_t len; if (big_scale) { - calib_graph = &big_scale_graph_calib; + calib_graph = &sc2731_big_scale_graph_calib; graph = &big_scale_graph; cell_name = "big_scale_calib"; } else { - calib_graph = &small_scale_graph_calib; + calib_graph = &sc2731_small_scale_graph_calib; graph = &small_scale_graph; cell_name = "small_scale_calib"; }