From: Andrey Smirnov <andrew.smirnov@gmail.com>
To: linux-pm@vger.kernel.org
Cc: Andrey Smirnov <andrew.smirnov@gmail.com>,
Chris Healy <cphealy@gmail.com>,
Lucas Stach <l.stach@pengutronix.de>,
Zhang Rui <rui.zhang@intel.com>,
Eduardo Valentin <edubezval@gmail.com>,
Daniel Lezcano <daniel.lezcano@linaro.org>,
Angus Ainslie <angus@akkea.ca>,
linux-imx@nxp.com, linux-kernel@vger.kernel.org
Subject: [PATCH v3 07/13] thermal: qoriq: Pass data to qoriq_tmu_calibration() directly
Date: Sun, 31 Mar 2019 21:14:12 -0700 [thread overview]
Message-ID: <20190401041418.5999-8-andrew.smirnov@gmail.com> (raw)
In-Reply-To: <20190401041418.5999-1-andrew.smirnov@gmail.com>
We can simplify error cleanup code if instead of passing a "struct
platform_device *" to qoriq_tmu_calibration() and deriving a bunch of
pointers from it, we pass those pointers directly. This way we won't
be force to call platform_set_drvdata() as early in qoriq_tmu_probe()
and consequently would be able to drop the "err_iomap" error path.
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 | 22 +++++++++-------------
1 file changed, 9 insertions(+), 13 deletions(-)
diff --git a/drivers/thermal/qoriq_thermal.c b/drivers/thermal/qoriq_thermal.c
index 24a2a57f61c9..a3ddb55740e4 100644
--- a/drivers/thermal/qoriq_thermal.c
+++ b/drivers/thermal/qoriq_thermal.c
@@ -139,16 +139,16 @@ static int qoriq_tmu_register_tmu_zone(struct device *dev,
return 0;
}
-static int qoriq_tmu_calibration(struct platform_device *pdev)
+static int qoriq_tmu_calibration(struct device *dev,
+ struct qoriq_tmu_data *data)
{
int i, val, len;
u32 range[4];
const u32 *calibration;
- struct device_node *np = pdev->dev.of_node;
- struct qoriq_tmu_data *data = platform_get_drvdata(pdev);
+ struct device_node *np = dev->of_node;
if (of_property_read_u32_array(np, "fsl,tmu-range", range, 4)) {
- dev_err(&pdev->dev, "missing calibration range.\n");
+ dev_err(dev, "missing calibration range.\n");
return -ENODEV;
}
@@ -160,7 +160,7 @@ static int qoriq_tmu_calibration(struct platform_device *pdev)
calibration = of_get_property(np, "fsl,tmu-calibration", &len);
if (calibration == NULL || len % 8) {
- dev_err(&pdev->dev, "invalid calibration data.\n");
+ dev_err(dev, "invalid calibration data.\n");
return -ENODEV;
}
@@ -198,20 +198,17 @@ static int qoriq_tmu_probe(struct platform_device *pdev)
if (!data)
return -ENOMEM;
- platform_set_drvdata(pdev, data);
-
data->little_endian = of_property_read_bool(np, "little-endian");
data->regs = of_iomap(np, 0);
if (!data->regs) {
dev_err(dev, "Failed to get memory region\n");
- ret = -ENODEV;
- goto err_iomap;
+ return -ENODEV;
}
qoriq_tmu_init_device(data); /* TMU initialization */
- ret = qoriq_tmu_calibration(pdev); /* TMU calibration */
+ ret = qoriq_tmu_calibration(dev, data); /* TMU calibration */
if (ret < 0)
goto err_tmu;
@@ -222,14 +219,13 @@ static int qoriq_tmu_probe(struct platform_device *pdev)
goto err_iomap;
}
+ platform_set_drvdata(pdev, data);
+
return 0;
err_tmu:
iounmap(data->regs);
-err_iomap:
- platform_set_drvdata(pdev, NULL);
-
return ret;
}
--
2.20.1
next prev parent reply other threads:[~2019-04-01 4:14 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-01 4:14 [PATCH v3 00/13] QorIQ TMU multi-sensor and HWMON support Andrey Smirnov
2019-04-01 4:14 ` [PATCH v3 01/13] thermal: qoriq: Remove unnecessary DT node is NULL check Andrey Smirnov
2019-04-04 3:21 ` Daniel Lezcano
2019-04-05 17:51 ` Andrey Smirnov
2019-04-11 16:52 ` Daniel Lezcano
2019-04-01 4:14 ` [PATCH v3 02/13] thermal: qoriq: Add local struct device pointer Andrey Smirnov
2019-04-04 3:11 ` Daniel Lezcano
2019-04-01 4:14 ` [PATCH v3 03/13] thermal: qoriq: Don't store struct thermal_zone_device reference Andrey Smirnov
2019-04-04 3:23 ` Daniel Lezcano
2019-04-01 4:14 ` [PATCH v3 04/13] thermal: qoriq: Add local struct qoriq_sensor pointer Andrey Smirnov
2019-04-04 3:28 ` Daniel Lezcano
2019-04-05 17:57 ` Andrey Smirnov
2019-04-01 4:14 ` [PATCH v3 05/13] thermal: qoriq: Embed per-sensor data into struct qoriq_tmu_data Andrey Smirnov
2019-04-04 7:57 ` Daniel Lezcano
2019-04-04 8:06 ` [PATCH RFC 1/2] thermal/drivers/of: Add a get_temp_id callback function Daniel Lezcano
2019-04-04 8:06 ` [PATCH RFC 2/2] thermal/drivers/qoriq: Use the get_temp_id() Daniel Lezcano
2019-04-13 8:18 ` [PATCH RFC 1/2] thermal/drivers/of: Add a get_temp_id callback function Andrey Smirnov
2019-04-13 8:28 ` Daniel Lezcano
2019-04-05 18:00 ` [PATCH v3 05/13] thermal: qoriq: Embed per-sensor data into struct qoriq_tmu_data Andrey Smirnov
2019-04-11 16:54 ` Daniel Lezcano
2019-04-01 4:14 ` [PATCH v3 06/13] thermal: qoriq: Pass data to qoriq_tmu_register_tmu_zone() directly Andrey Smirnov
2019-04-04 8:09 ` Daniel Lezcano
2019-04-01 4:14 ` Andrey Smirnov [this message]
2019-04-04 8:11 ` [PATCH v3 07/13] thermal: qoriq: Pass data to qoriq_tmu_calibration() directly Daniel Lezcano
2019-04-05 18:04 ` Andrey Smirnov
2019-04-01 4:14 ` [PATCH v3 08/13] thermal: qoriq: Convert driver to use devm_ioremap() Andrey Smirnov
2019-04-04 8:23 ` Daniel Lezcano
2019-04-05 18:14 ` Andrey Smirnov
2019-04-01 4:14 ` [PATCH v3 09/13] thermal: qoriq: Convert driver to use regmap API Andrey Smirnov
2019-04-04 8:47 ` Daniel Lezcano
2019-04-05 18:24 ` Andrey Smirnov
2019-04-11 13:00 ` Daniel Lezcano
2019-04-01 4:14 ` [PATCH v3 10/13] thermal: qoriq: Enable all sensors before registering them Andrey Smirnov
2019-04-04 9:08 ` Daniel Lezcano
2019-04-01 4:14 ` [PATCH v3 11/13] thermal: qoriq: Do not report invalid temperature reading Andrey Smirnov
2019-04-04 9:05 ` Daniel Lezcano
2019-04-05 18:30 ` Andrey Smirnov
2019-04-01 4:14 ` [PATCH v3 12/13] thermal_hwmon: Add devres wrapper for thermal_add_hwmon_sysfs() Andrey Smirnov
2019-04-04 9:10 ` Daniel Lezcano
2019-04-01 4:14 ` [PATCH v3 13/13] thermal: qoriq: Add hwmon support Andrey Smirnov
2019-04-04 9:11 ` Daniel Lezcano
2019-04-05 18:38 ` Andrey Smirnov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190401041418.5999-8-andrew.smirnov@gmail.com \
--to=andrew.smirnov@gmail.com \
--cc=angus@akkea.ca \
--cc=cphealy@gmail.com \
--cc=daniel.lezcano@linaro.org \
--cc=edubezval@gmail.com \
--cc=l.stach@pengutronix.de \
--cc=linux-imx@nxp.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=rui.zhang@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).