| Message ID | 20190401041418.5999-4-andrew.smirnov@gmail.com (mailing list archive) |
|---|---|
| State | Superseded, archived |
| Delegated to: | Eduardo Valentin |
| Headers | show |
| Series | QorIQ TMU multi-sensor and HWMON support | expand |
On 01/04/2019 06:14, Andrey Smirnov wrote: > Struct thermal_zone_device reference stored as sensor's private data > isn't really used anywhere in the code. Drop it. > > Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com> > Cc: Chris Healy <cphealy@gmail.com> > Cc: Lucas Stach <l.stach@pengutronix.de> > Cc: Zhang Rui <rui.zhang@intel.com> > Cc: Eduardo Valentin <edubezval@gmail.com> > Cc: Daniel Lezcano <daniel.lezcano@linaro.org> > Cc: Angus Ainslie (Purism) <angus@akkea.ca> > Cc: linux-imx@nxp.com > Cc: linux-pm@vger.kernel.org > Cc: linux-kernel@vger.kernel.org Acked-by: Daniel Lezcano <daniel.lezcano@linaro.org> > --- > drivers/thermal/qoriq_thermal.c | 15 +++++++++------ > 1 file changed, 9 insertions(+), 6 deletions(-) > > diff --git a/drivers/thermal/qoriq_thermal.c b/drivers/thermal/qoriq_thermal.c > index 91f9f49d2776..6d40b9788266 100644 > --- a/drivers/thermal/qoriq_thermal.c > +++ b/drivers/thermal/qoriq_thermal.c > @@ -65,7 +65,6 @@ struct qoriq_tmu_data; > * Thermal zone data > */ > struct qoriq_sensor { > - struct thermal_zone_device *tzd; > struct qoriq_tmu_data *qdata; > int id; > }; > @@ -114,6 +113,8 @@ static int qoriq_tmu_register_tmu_zone(struct platform_device *pdev) > int id, sites = 0; > > for (id = 0; id < SITES_MAX; id++) { > + struct thermal_zone_device *tzd; > + > qdata->sensor[id] = devm_kzalloc(&pdev->dev, > sizeof(struct qoriq_sensor), GFP_KERNEL); > if (!qdata->sensor[id]) > @@ -121,13 +122,15 @@ static int qoriq_tmu_register_tmu_zone(struct platform_device *pdev) > > qdata->sensor[id]->id = id; > qdata->sensor[id]->qdata = qdata; > - qdata->sensor[id]->tzd = devm_thermal_zone_of_sensor_register( > - &pdev->dev, id, qdata->sensor[id], &tmu_tz_ops); > - if (IS_ERR(qdata->sensor[id]->tzd)) { > - if (PTR_ERR(qdata->sensor[id]->tzd) == -ENODEV) > + > + tzd = devm_thermal_zone_of_sensor_register(&pdev->dev, id, > + qdata->sensor[id], > + &tmu_tz_ops); > + if (IS_ERR(tzd)) { > + if (PTR_ERR(tzd) == -ENODEV) > continue; > else > - return PTR_ERR(qdata->sensor[id]->tzd); > + return PTR_ERR(tzd); > } > > sites |= 0x1 << (15 - id); >
diff --git a/drivers/thermal/qoriq_thermal.c b/drivers/thermal/qoriq_thermal.c index 91f9f49d2776..6d40b9788266 100644 --- a/drivers/thermal/qoriq_thermal.c +++ b/drivers/thermal/qoriq_thermal.c @@ -65,7 +65,6 @@ struct qoriq_tmu_data; * Thermal zone data */ struct qoriq_sensor { - struct thermal_zone_device *tzd; struct qoriq_tmu_data *qdata; int id; }; @@ -114,6 +113,8 @@ static int qoriq_tmu_register_tmu_zone(struct platform_device *pdev) int id, sites = 0; for (id = 0; id < SITES_MAX; id++) { + struct thermal_zone_device *tzd; + qdata->sensor[id] = devm_kzalloc(&pdev->dev, sizeof(struct qoriq_sensor), GFP_KERNEL); if (!qdata->sensor[id]) @@ -121,13 +122,15 @@ static int qoriq_tmu_register_tmu_zone(struct platform_device *pdev) qdata->sensor[id]->id = id; qdata->sensor[id]->qdata = qdata; - qdata->sensor[id]->tzd = devm_thermal_zone_of_sensor_register( - &pdev->dev, id, qdata->sensor[id], &tmu_tz_ops); - if (IS_ERR(qdata->sensor[id]->tzd)) { - if (PTR_ERR(qdata->sensor[id]->tzd) == -ENODEV) + + tzd = devm_thermal_zone_of_sensor_register(&pdev->dev, id, + qdata->sensor[id], + &tmu_tz_ops); + if (IS_ERR(tzd)) { + if (PTR_ERR(tzd) == -ENODEV) continue; else - return PTR_ERR(qdata->sensor[id]->tzd); + return PTR_ERR(tzd); } sites |= 0x1 << (15 - id);
Struct thermal_zone_device reference stored as sensor's private data isn't really used anywhere in the code. Drop it. Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com> Cc: Chris Healy <cphealy@gmail.com> Cc: Lucas Stach <l.stach@pengutronix.de> Cc: Zhang Rui <rui.zhang@intel.com> Cc: Eduardo Valentin <edubezval@gmail.com> Cc: Daniel Lezcano <daniel.lezcano@linaro.org> Cc: Angus Ainslie (Purism) <angus@akkea.ca> Cc: linux-imx@nxp.com Cc: linux-pm@vger.kernel.org Cc: linux-kernel@vger.kernel.org --- drivers/thermal/qoriq_thermal.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-)