| Message ID | 20190603193433.6394-4-festevam@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/4] iio: imx7d_adc: Remove unneeded error message | expand |
On Mon, 3 Jun 2019 16:34:33 -0300 Fabio Estevam <festevam@gmail.com> wrote: > average_en is always true, so there is not really need for > this structure member. > > Signed-off-by: Fabio Estevam <festevam@gmail.com> Applied. Thanks, Jonathan > --- > drivers/iio/adc/imx7d_adc.c | 8 ++------ > 1 file changed, 2 insertions(+), 6 deletions(-) > > diff --git a/drivers/iio/adc/imx7d_adc.c b/drivers/iio/adc/imx7d_adc.c > index 46e88899ad74..26a7bbe4d534 100644 > --- a/drivers/iio/adc/imx7d_adc.c > +++ b/drivers/iio/adc/imx7d_adc.c > @@ -101,8 +101,6 @@ struct imx7d_adc_feature { > enum imx7d_adc_average_num avg_num; > > u32 core_time_unit; /* impact the sample rate */ > - > - bool average_en; > }; > > struct imx7d_adc { > @@ -180,7 +178,6 @@ static void imx7d_adc_feature_config(struct imx7d_adc *info) > info->adc_feature.clk_pre_div = IMX7D_ADC_ANALOG_CLK_PRE_DIV_4; > info->adc_feature.avg_num = IMX7D_ADC_AVERAGE_NUM_32; > info->adc_feature.core_time_unit = 1; > - info->adc_feature.average_en = true; > } > > static void imx7d_adc_sample_rate_set(struct imx7d_adc *info) > @@ -241,9 +238,8 @@ static void imx7d_adc_channel_set(struct imx7d_adc *info) > > /* the channel choose single conversion, and enable average mode */ > cfg1 |= (IMX7D_REG_ADC_CH_CFG1_CHANNEL_EN | > - IMX7D_REG_ADC_CH_CFG1_CHANNEL_SINGLE); > - if (info->adc_feature.average_en) > - cfg1 |= IMX7D_REG_ADC_CH_CFG1_CHANNEL_AVG_EN; > + IMX7D_REG_ADC_CH_CFG1_CHANNEL_SINGLE | > + IMX7D_REG_ADC_CH_CFG1_CHANNEL_AVG_EN); > > /* > * physical channel 0 chose logical channel A
diff --git a/drivers/iio/adc/imx7d_adc.c b/drivers/iio/adc/imx7d_adc.c index 46e88899ad74..26a7bbe4d534 100644 --- a/drivers/iio/adc/imx7d_adc.c +++ b/drivers/iio/adc/imx7d_adc.c @@ -101,8 +101,6 @@ struct imx7d_adc_feature { enum imx7d_adc_average_num avg_num; u32 core_time_unit; /* impact the sample rate */ - - bool average_en; }; struct imx7d_adc { @@ -180,7 +178,6 @@ static void imx7d_adc_feature_config(struct imx7d_adc *info) info->adc_feature.clk_pre_div = IMX7D_ADC_ANALOG_CLK_PRE_DIV_4; info->adc_feature.avg_num = IMX7D_ADC_AVERAGE_NUM_32; info->adc_feature.core_time_unit = 1; - info->adc_feature.average_en = true; } static void imx7d_adc_sample_rate_set(struct imx7d_adc *info) @@ -241,9 +238,8 @@ static void imx7d_adc_channel_set(struct imx7d_adc *info) /* the channel choose single conversion, and enable average mode */ cfg1 |= (IMX7D_REG_ADC_CH_CFG1_CHANNEL_EN | - IMX7D_REG_ADC_CH_CFG1_CHANNEL_SINGLE); - if (info->adc_feature.average_en) - cfg1 |= IMX7D_REG_ADC_CH_CFG1_CHANNEL_AVG_EN; + IMX7D_REG_ADC_CH_CFG1_CHANNEL_SINGLE | + IMX7D_REG_ADC_CH_CFG1_CHANNEL_AVG_EN); /* * physical channel 0 chose logical channel A
average_en is always true, so there is not really need for this structure member. Signed-off-by: Fabio Estevam <festevam@gmail.com> --- drivers/iio/adc/imx7d_adc.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)