diff options
| author | Sachin Kamat <sachin.kamat@linaro.org> | 2013-03-04 06:45:34 +0000 |
|---|---|---|
| committer | Zhang Rui <rui.zhang@intel.com> | 2013-03-11 23:09:18 +0800 |
| commit | aa3b5d222da5922ab1883eba3e9d8f92ad148155 (patch) | |
| tree | 6123d3fdc2f6a552c9ce01456e665fb8e454a13e /drivers/thermal | |
| parent | 5095526faf38472bf04af919797a1f01a0ccb558 (diff) | |
| download | linux-stable-aa3b5d222da5922ab1883eba3e9d8f92ad148155.tar.gz linux-stable-aa3b5d222da5922ab1883eba3e9d8f92ad148155.tar.bz2 linux-stable-aa3b5d222da5922ab1883eba3e9d8f92ad148155.zip | |
Thermal: kirkwood: Convert to devm_ioremap_resource()
Use the newly introduced devm_ioremap_resource() instead of
devm_request_and_ioremap() which provides more consistent error handling.
devm_ioremap_resource() provides its own error messages; so all explicit
error messages can be removed from the failure code paths.
Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
Reviewed-by: Thierry Reding <thierry.reding@avionic-design.de>
Acked-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
Diffstat (limited to 'drivers/thermal')
| -rw-r--r-- | drivers/thermal/kirkwood_thermal.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/thermal/kirkwood_thermal.c b/drivers/thermal/kirkwood_thermal.c index 65cb4f09e8f6..e5500edb5285 100644 --- a/drivers/thermal/kirkwood_thermal.c +++ b/drivers/thermal/kirkwood_thermal.c @@ -85,11 +85,9 @@ static int kirkwood_thermal_probe(struct platform_device *pdev) if (!priv) return -ENOMEM; - priv->sensor = devm_request_and_ioremap(&pdev->dev, res); - if (!priv->sensor) { - dev_err(&pdev->dev, "Failed to request_ioremap memory\n"); - return -EADDRNOTAVAIL; - } + priv->sensor = devm_ioremap_resource(&pdev->dev, res); + if (IS_ERR(priv->sensor)) + return PTR_ERR(priv->sensor); thermal = thermal_zone_device_register("kirkwood_thermal", 0, 0, priv, &ops, NULL, 0, 0); |