From: Daniel Lezcano <daniel.lezcano@linaro.org>
To: Andrey Smirnov <andrew.smirnov@gmail.com>, linux-pm@vger.kernel.org
Cc: Chris Healy <cphealy@gmail.com>,
Lucas Stach <l.stach@pengutronix.de>,
Zhang Rui <rui.zhang@intel.com>,
Eduardo Valentin <edubezval@gmail.com>,
Angus Ainslie <angus@akkea.ca>,
linux-imx@nxp.com, linux-kernel@vger.kernel.org
Subject: Re: [PATCH v3 08/13] thermal: qoriq: Convert driver to use devm_ioremap()
Date: Thu, 4 Apr 2019 10:23:27 +0200 [thread overview]
Message-ID: <4d17af42-9db4-685e-799d-7b7981344129@linaro.org> (raw)
In-Reply-To: <20190401041418.5999-9-andrew.smirnov@gmail.com>
On 01/04/2019 06:14, Andrey Smirnov wrote:
> Convert driver to use devm_ioremap() to simplify memory deallocation
> and error handling code. No functional change intended.
>
> 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 | 20 ++++++++++----------
> 1 file changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/thermal/qoriq_thermal.c b/drivers/thermal/qoriq_thermal.c
> index a3ddb55740e4..4f9a2543f9c3 100644
> --- a/drivers/thermal/qoriq_thermal.c
> +++ b/drivers/thermal/qoriq_thermal.c
> @@ -192,6 +192,7 @@ static int qoriq_tmu_probe(struct platform_device *pdev)
> struct qoriq_tmu_data *data;
> struct device_node *np = pdev->dev.of_node;
> struct device *dev = &pdev->dev;
> + struct resource *io;
>
> data = devm_kzalloc(dev, sizeof(struct qoriq_tmu_data),
> GFP_KERNEL);
> @@ -200,7 +201,13 @@ static int qoriq_tmu_probe(struct platform_device *pdev)
>
> data->little_endian = of_property_read_bool(np, "little-endian");
>
> - data->regs = of_iomap(np, 0);
> + io = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> + if (!io) {
> + dev_err(dev, "Failed to get memory region\n");
> + return -ENODEV;
> + }
> +
> + data->regs = devm_ioremap(dev, io->start, resource_size(io));
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
base = devm_ioremap_resource(&pdev->dev, res);
?
> if (!data->regs) {
> dev_err(dev, "Failed to get memory region\n");
> return -ENODEV;
> @@ -210,23 +217,17 @@ static int qoriq_tmu_probe(struct platform_device *pdev)
>
> ret = qoriq_tmu_calibration(dev, data); /* TMU calibration */
> if (ret < 0)
> - goto err_tmu;
> + return ret;
>
> ret = qoriq_tmu_register_tmu_zone(dev, data);
> if (ret < 0) {
> dev_err(dev, "Failed to register sensors\n");
> - ret = -ENODEV;
> - goto err_iomap;
> + return -ENODEV;
> }
>
> platform_set_drvdata(pdev, data);
>
> return 0;
> -
> -err_tmu:
> - iounmap(data->regs);
> -
> - return ret;
> }
>
> static int qoriq_tmu_remove(struct platform_device *pdev)
> @@ -236,7 +237,6 @@ static int qoriq_tmu_remove(struct platform_device *pdev)
> /* Disable monitoring */
> tmu_write(data, TMR_DISABLE, &data->regs->tmr);
>
> - iounmap(data->regs);
> platform_set_drvdata(pdev, NULL);
>
> return 0;
>
--
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs
Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog
next prev parent reply other threads:[~2019-04-04 8:23 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 ` [PATCH v3 07/13] thermal: qoriq: Pass data to qoriq_tmu_calibration() directly Andrey Smirnov
2019-04-04 8:11 ` 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 [this message]
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=4d17af42-9db4-685e-799d-7b7981344129@linaro.org \
--to=daniel.lezcano@linaro.org \
--cc=andrew.smirnov@gmail.com \
--cc=angus@akkea.ca \
--cc=cphealy@gmail.com \
--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).