aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mfd
diff options
context:
space:
mode:
authorMiquel Raynal <miquel.raynal@bootlin.com>2021-10-15 10:14:37 +0200
committerLee Jones <lee.jones@linaro.org>2021-10-20 17:28:25 +0100
commit7c605802f33176d872ffb6a3830ba4d88d9f21f6 (patch)
treeb0a5842c2c75e9eeb3efdbdc8306d4fd9461b7c8 /drivers/mfd
parentmfd: ti_am335x_tscadc: Mimic the probe from resume() (diff)
downloadlinux-dev-7c605802f33176d872ffb6a3830ba4d88d9f21f6.tar.xz
linux-dev-7c605802f33176d872ffb6a3830ba4d88d9f21f6.zip
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: Miquel Raynal <miquel.raynal@bootlin.com> Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> Signed-off-by: Lee Jones <lee.jones@linaro.org> Link: https://lore.kernel.org/r/20211015081506.933180-20-miquel.raynal@bootlin.com
Diffstat (limited to 'drivers/mfd')
-rw-r--r--drivers/mfd/ti_am335x_tscadc.c15
1 files changed, 4 insertions, 11 deletions
diff --git a/drivers/mfd/ti_am335x_tscadc.c b/drivers/mfd/ti_am335x_tscadc.c
index d9c0b16d8d0d..9ce1a3e34c1e 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 */
@@ -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;