mfd: ti_am335x_tscadc: Rename a variable

We need to retrieve the number of wires used by the "secondary" device
(the touchscreen or the magnetic reader). Let's rename tsc_wires to
become tscmag_wires to clarify the fact that this variable can be used
in both situations.

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-33-miquel.raynal@bootlin.com

diff --git a/drivers/mfd/ti_am335x_tscadc.c b/drivers/mfd/ti_am335x_tscadc.c
index ffd52e0..70a423e 100644 (file)
--- 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;
-       int tsc_wires = 0, adc_channels = 0, cell_idx = 0, total_channels;
+       int tscmag_wires = 0, adc_channels = 0, cell_idx = 0, total_channels;
        int readouts = 0;
 
        /* Allocate memory for device */
@@ -140,7 +140,7 @@ static      int ti_tscadc_probe(struct platform_device *pdev)
        tscadc->data = of_device_get_match_data(&pdev->dev);
 
        node = of_get_child_by_name(pdev->dev.of_node, "tsc");
-       of_property_read_u32(node, "ti,wires", &tsc_wires);
+       of_property_read_u32(node, "ti,wires", &tscmag_wires);
        of_property_read_u32(node, "ti,coordiante-readouts", &readouts);
        of_node_put(node);
 
@@ -157,7 +157,7 @@ static      int ti_tscadc_probe(struct platform_device *pdev)
 
        of_node_put(node);
 
-       total_channels = tsc_wires + adc_channels;
+       total_channels = tscmag_wires + adc_channels;
        if (total_channels > 8) {
                dev_err(&pdev->dev, "Number of i/p channels more than 8\n");
                return -EINVAL;
@@ -223,9 +223,9 @@ static      int ti_tscadc_probe(struct platform_device *pdev)
         * added manually when timely.
         */
        tscadc->ctrl = CNTRLREG_TSC_STEPCONFIGWRT | CNTRLREG_STEPID;
-       if (tsc_wires > 0) {
+       if (tscmag_wires > 0) {
                tscadc->ctrl |= CNTRLREG_TSC_ENB;
-               if (tsc_wires == 5)
+               if (tscmag_wires == 5)
                        tscadc->ctrl |= CNTRLREG_TSC_5WIRE;
                else
                        tscadc->ctrl |= CNTRLREG_TSC_4WIRE;
@@ -238,7 +238,7 @@ static      int ti_tscadc_probe(struct platform_device *pdev)
        regmap_write(tscadc->regmap, REG_CTRL, tscadc->ctrl | CNTRLREG_SSENB);
 
        /* TSC Cell */
-       if (tsc_wires > 0) {
+       if (tscmag_wires > 0) {
                cell = &tscadc->cells[cell_idx++];
                cell->name = tscadc->data->secondary_feature_name;
                cell->of_compatible = tscadc->data->secondary_feature_compatible;