| Message ID | 20220203164709.1712069-1-vladimir.zapolskiy@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | i2c: qcom-cci: fixes and updates | expand |
On Thu, 3 Feb 2022 at 17:47, Vladimir Zapolskiy <vladimir.zapolskiy@linaro.org> wrote: > > Trivial non-functional change, which adds an alias to a widely > used data location. > > Signed-off-by: Vladimir Zapolskiy <vladimir.zapolskiy@linaro.org> > --- > drivers/i2c/busses/i2c-qcom-cci.c | 32 ++++++++++++++++--------------- > 1 file changed, 17 insertions(+), 15 deletions(-) > > diff --git a/drivers/i2c/busses/i2c-qcom-cci.c b/drivers/i2c/busses/i2c-qcom-cci.c > index cffc01b2285b..775945f7b4cd 100644 > --- a/drivers/i2c/busses/i2c-qcom-cci.c > +++ b/drivers/i2c/busses/i2c-qcom-cci.c > @@ -593,6 +593,7 @@ static int cci_probe(struct platform_device *pdev) > dev_dbg(dev, "CCI HW version = 0x%08x", val); > > for_each_available_child_of_node(dev->of_node, child) { > + struct cci_master *master; > u32 idx; > > ret = of_property_read_u32(child, "reg", &idx); > @@ -607,32 +608,33 @@ static int cci_probe(struct platform_device *pdev) > continue; > } > > - cci->master[idx].adap.quirks = &cci->data->quirks; > - cci->master[idx].adap.algo = &cci_algo; > - cci->master[idx].adap.dev.parent = dev; > - cci->master[idx].adap.dev.of_node = of_node_get(child); > - cci->master[idx].master = idx; > - cci->master[idx].cci = cci; > + master = &cci->master[idx]; > + master->adap.quirks = &cci->data->quirks; > + master->adap.algo = &cci_algo; > + master->adap.dev.parent = dev; > + master->adap.dev.of_node = of_node_get(child); > + master->master = idx; > + master->cci = cci; > > - i2c_set_adapdata(&cci->master[idx].adap, &cci->master[idx]); > - snprintf(cci->master[idx].adap.name, > - sizeof(cci->master[idx].adap.name), "Qualcomm-CCI"); > + i2c_set_adapdata(&master->adap, master); > + snprintf(master->adap.name, > + sizeof(master->adap.name), "Qualcomm-CCI"); > > - cci->master[idx].mode = I2C_MODE_STANDARD; > + master->mode = I2C_MODE_STANDARD; > ret = of_property_read_u32(child, "clock-frequency", &val); > if (!ret) { > if (val == I2C_MAX_FAST_MODE_FREQ) > - cci->master[idx].mode = I2C_MODE_FAST; > + master->mode = I2C_MODE_FAST; > else if (val == I2C_MAX_FAST_MODE_PLUS_FREQ) > - cci->master[idx].mode = I2C_MODE_FAST_PLUS; > + master->mode = I2C_MODE_FAST_PLUS; > } > > - init_completion(&cci->master[idx].irq_complete); > + init_completion(&master->irq_complete); > > - ret = i2c_add_adapter(&cci->master[idx].adap); > + ret = i2c_add_adapter(&master->adap); > if (ret < 0) { > of_node_put(child); > - cci->master[idx].cci = NULL; > + master->cci = NULL; > goto error_i2c; > } > } > -- > 2.33.0 > Reviewed-by: Robert Foss <robert.foss@linaro.org>
diff --git a/drivers/i2c/busses/i2c-qcom-cci.c b/drivers/i2c/busses/i2c-qcom-cci.c index cffc01b2285b..775945f7b4cd 100644 --- a/drivers/i2c/busses/i2c-qcom-cci.c +++ b/drivers/i2c/busses/i2c-qcom-cci.c @@ -593,6 +593,7 @@ static int cci_probe(struct platform_device *pdev) dev_dbg(dev, "CCI HW version = 0x%08x", val); for_each_available_child_of_node(dev->of_node, child) { + struct cci_master *master; u32 idx; ret = of_property_read_u32(child, "reg", &idx); @@ -607,32 +608,33 @@ static int cci_probe(struct platform_device *pdev) continue; } - cci->master[idx].adap.quirks = &cci->data->quirks; - cci->master[idx].adap.algo = &cci_algo; - cci->master[idx].adap.dev.parent = dev; - cci->master[idx].adap.dev.of_node = of_node_get(child); - cci->master[idx].master = idx; - cci->master[idx].cci = cci; + master = &cci->master[idx]; + master->adap.quirks = &cci->data->quirks; + master->adap.algo = &cci_algo; + master->adap.dev.parent = dev; + master->adap.dev.of_node = of_node_get(child); + master->master = idx; + master->cci = cci; - i2c_set_adapdata(&cci->master[idx].adap, &cci->master[idx]); - snprintf(cci->master[idx].adap.name, - sizeof(cci->master[idx].adap.name), "Qualcomm-CCI"); + i2c_set_adapdata(&master->adap, master); + snprintf(master->adap.name, + sizeof(master->adap.name), "Qualcomm-CCI"); - cci->master[idx].mode = I2C_MODE_STANDARD; + master->mode = I2C_MODE_STANDARD; ret = of_property_read_u32(child, "clock-frequency", &val); if (!ret) { if (val == I2C_MAX_FAST_MODE_FREQ) - cci->master[idx].mode = I2C_MODE_FAST; + master->mode = I2C_MODE_FAST; else if (val == I2C_MAX_FAST_MODE_PLUS_FREQ) - cci->master[idx].mode = I2C_MODE_FAST_PLUS; + master->mode = I2C_MODE_FAST_PLUS; } - init_completion(&cci->master[idx].irq_complete); + init_completion(&master->irq_complete); - ret = i2c_add_adapter(&cci->master[idx].adap); + ret = i2c_add_adapter(&master->adap); if (ret < 0) { of_node_put(child); - cci->master[idx].cci = NULL; + master->cci = NULL; goto error_i2c; } }
Trivial non-functional change, which adds an alias to a widely used data location. Signed-off-by: Vladimir Zapolskiy <vladimir.zapolskiy@linaro.org> --- drivers/i2c/busses/i2c-qcom-cci.c | 32 ++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-)