Commit 7c605802 authored by Miquel Raynal's avatar Miquel Raynal Committed by Lee Jones
Browse files

mfd: ti_am335x_tscadc: Drop useless variables from the driver structure 



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: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
Reviewed-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
Link: https://lore.kernel.org/r/20211015081506.933180-20-miquel.raynal@bootlin.com
parent 2bb9e6a3

drivers/mfd/ti_am335x_tscadc.c

+4 −11
Original line number Diff line number Diff line
@@ -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 */
@@ -235,14 +235,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->secondary_feature_name;

		cell->of_compatible = tscadc->data->secondary_feature_compatible;

		cell->platform_data = &tscadc;
@@ -251,8 +246,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->adc_feature_name;

		cell->of_compatible = tscadc->data->adc_feature_compatible;

		cell->platform_data = &tscadc;
@@ -260,8 +254,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;

include/linux/mfd/ti_am335x_tscadc.h

+0 −3
Original line number Diff line number Diff line
@@ -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;