Re: [PATCH v2 19/46] mfd: ti_am335x_tscadc: Drop useless variables from the driver structure

[Jonathan Cameron <jic23@kernel.org>]

On Thu,  2 Sep 2021 23:51:17 +0200
Miquel Raynal <miquel.raynal@bootlin.com> wrote:

> Keeping the count of tsc_cells and adc_cells is completely redundant, we
> can derive this information from other variables. Plus, these variables
> are not used anywhere else now. Let's get rid of them.
> 
> Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Makes sense and nice to get rid of these.

Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

> ---
>  drivers/mfd/ti_am335x_tscadc.c       | 15 ++++-----------
>  include/linux/mfd/ti_am335x_tscadc.h |  3 ---
>  2 files changed, 4 insertions(+), 14 deletions(-)
> 
> diff --git a/drivers/mfd/ti_am335x_tscadc.c b/drivers/mfd/ti_am335x_tscadc.c
> index 0dcc2151ac1f..4a24fc1141cf 100644
> --- a/drivers/mfd/ti_am335x_tscadc.c
> +++ b/drivers/mfd/ti_am335x_tscadc.c
> @@ -122,7 +122,7 @@ static	int ti_tscadc_probe(struct platform_device *pdev)
>  	const __be32 *cur;
>  	u32 val;
>  	int err, ctrl;
> -	int tsc_wires = 0, adc_channels = 0, total_channels;
> +	int tsc_wires = 0, adc_channels = 0, cell_idx = 0, total_channels;
>  	int readouts = 0;
>  
>  	/* Allocate memory for device */
> @@ -237,14 +237,9 @@ static	int ti_tscadc_probe(struct platform_device *pdev)
>  	ctrl |= CNTRLREG_TSCSSENB;
>  	regmap_write(tscadc->regmap, REG_CTRL, ctrl);
>  
> -	tscadc->used_cells = 0;
> -	tscadc->tsc_cell = -1;
> -	tscadc->adc_cell = -1;
> -
>  	/* TSC Cell */
>  	if (tsc_wires > 0) {
> -		tscadc->tsc_cell = tscadc->used_cells;
> -		cell = &tscadc->cells[tscadc->used_cells++];
> +		cell = &tscadc->cells[cell_idx++];
>  		cell->name = tscadc->data->name_tscmag;
>  		cell->of_compatible = tscadc->data->compat_tscmag;
>  		cell->platform_data = &tscadc;
> @@ -253,8 +248,7 @@ static	int ti_tscadc_probe(struct platform_device *pdev)
>  
>  	/* ADC Cell */
>  	if (adc_channels > 0) {
> -		tscadc->adc_cell = tscadc->used_cells;
> -		cell = &tscadc->cells[tscadc->used_cells++];
> +		cell = &tscadc->cells[cell_idx++];
>  		cell->name = tscadc->data->name_adc;
>  		cell->of_compatible = tscadc->data->compat_adc;
>  		cell->platform_data = &tscadc;
> @@ -262,8 +256,7 @@ static	int ti_tscadc_probe(struct platform_device *pdev)
>  	}
>  
>  	err = mfd_add_devices(&pdev->dev, PLATFORM_DEVID_AUTO,
> -			      tscadc->cells, tscadc->used_cells, NULL,
> -			      0, NULL);
> +			      tscadc->cells, cell_idx, NULL, 0, NULL);
>  	if (err < 0)
>  		goto err_disable_clk;
>  
> diff --git a/include/linux/mfd/ti_am335x_tscadc.h b/include/linux/mfd/ti_am335x_tscadc.h
> index 0f581c15d95a..e734fb97dff8 100644
> --- a/include/linux/mfd/ti_am335x_tscadc.h
> +++ b/include/linux/mfd/ti_am335x_tscadc.h
> @@ -177,10 +177,7 @@ struct ti_tscadc_dev {
>  	phys_addr_t tscadc_phys_base;
>  	const struct ti_tscadc_data *data;
>  	int irq;
> -	int used_cells;	/* 1-2 */
>  	int tsc_wires;
> -	int tsc_cell;	/* -1 if not used */
> -	int adc_cell;	/* -1 if not used */
>  	struct mfd_cell cells[TSCADC_CELLS];
>  	u32 reg_se_cache;
>  	bool adc_waiting;