| Message ID | 1362379534-30662-3-git-send-email-sachin.kamat@linaro.org (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Delegated to: | Zhang Rui |
| Headers | show |
On Mon, Mar 04, 2013 at 12:15:34PM +0530, Sachin Kamat wrote: > 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> > --- > 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 65cb4f0..e5500ed 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); Reviewed-by: Thierry Reding <thierry.reding@avionic-design.de>
On Mon, Mar 4, 2013 at 4:06 PM, Thierry Reding <thierry.reding@avionic-design.de> wrote: > On Mon, Mar 04, 2013 at 12:15:34PM +0530, Sachin Kamat wrote: >> 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> >> --- >> 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 65cb4f0..e5500ed 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); > > Reviewed-by: Thierry Reding <thierry.reding@avionic-design.de> Acked-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
On Mon, 2013-03-04 at 12:15 +0530, Sachin Kamat wrote: > 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> applied to thermal -next tree. thanks, rui > --- > 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 65cb4f0..e5500ed 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); -- To unsubscribe from this list: send the line "unsubscribe linux-pm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/thermal/kirkwood_thermal.c b/drivers/thermal/kirkwood_thermal.c index 65cb4f0..e5500ed 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);
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> --- drivers/thermal/kirkwood_thermal.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-)