@@ -121,7 +121,7 @@ static int ti_tscadc_probe(struct platform_device *pdev)
const __be32 *cur;
struct clk *clk;
u32 val;
- int tsc_wires = 0, adc_channels = 0, readouts = 0;
+ int tsc_wires = 0, adc_channels = 0, readouts = 0, cell_idx = 0;
int total_channels, ctrl, err;
/* Allocate memory for device */
@@ -232,14 +232,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;
@@ -248,8 +243,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;
@@ -257,8 +251,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;
@@ -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;
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> --- drivers/mfd/ti_am335x_tscadc.c | 15 ++++----------- include/linux/mfd/ti_am335x_tscadc.h | 3 --- 2 files changed, 4 insertions(+), 14 deletions(-)