| Message ID | 1362379534-30662-1-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:32PM +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: Andrew Lunn <andrew@lunn.ch> > --- > drivers/thermal/dove_thermal.c | 16 ++++++---------- > 1 files changed, 6 insertions(+), 10 deletions(-) > > diff --git a/drivers/thermal/dove_thermal.c b/drivers/thermal/dove_thermal.c > index 7b0bfa0..3078c40 100644 > --- a/drivers/thermal/dove_thermal.c > +++ b/drivers/thermal/dove_thermal.c > @@ -143,22 +143,18 @@ static int dove_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); > > res = platform_get_resource(pdev, IORESOURCE_MEM, 1); > if (!res) { > dev_err(&pdev->dev, "Failed to get platform resource\n"); > return -ENODEV; > } > - priv->control = devm_request_and_ioremap(&pdev->dev, res); > - if (!priv->control) { > - dev_err(&pdev->dev, "Failed to request_ioremap memory\n"); > - return -EADDRNOTAVAIL; > - } > + priv->control = devm_ioremap_resource(&pdev->dev, res); > + if (IS_ERR(priv->control)) > + return PTR_ERR(priv->control); > > ret = dove_init_sensor(priv); > if (ret) { Reviewed-by: Thierry Reding <thierry.reding@avionic-design.de>
Hi Zhang, On 4 March 2013 12:36, Thierry Reding <thierry.reding@avionic-design.de> wrote: > On Mon, Mar 04, 2013 at 12:15:32PM +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: Andrew Lunn <andrew@lunn.ch> > > > Reviewed-by: Thierry Reding <thierry.reding@avionic-design.de> Did you get a chance to review this series?
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: Andrew Lunn <andrew@lunn.ch> applied to thermal -next tree. thanks, rui > --- > drivers/thermal/dove_thermal.c | 16 ++++++---------- > 1 files changed, 6 insertions(+), 10 deletions(-) > > diff --git a/drivers/thermal/dove_thermal.c b/drivers/thermal/dove_thermal.c > index 7b0bfa0..3078c40 100644 > --- a/drivers/thermal/dove_thermal.c > +++ b/drivers/thermal/dove_thermal.c > @@ -143,22 +143,18 @@ static int dove_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); > > res = platform_get_resource(pdev, IORESOURCE_MEM, 1); > if (!res) { > dev_err(&pdev->dev, "Failed to get platform resource\n"); > return -ENODEV; > } > - priv->control = devm_request_and_ioremap(&pdev->dev, res); > - if (!priv->control) { > - dev_err(&pdev->dev, "Failed to request_ioremap memory\n"); > - return -EADDRNOTAVAIL; > - } > + priv->control = devm_ioremap_resource(&pdev->dev, res); > + if (IS_ERR(priv->control)) > + return PTR_ERR(priv->control); > > ret = dove_init_sensor(priv); > if (ret) { -- 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/dove_thermal.c b/drivers/thermal/dove_thermal.c index 7b0bfa0..3078c40 100644 --- a/drivers/thermal/dove_thermal.c +++ b/drivers/thermal/dove_thermal.c @@ -143,22 +143,18 @@ static int dove_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); res = platform_get_resource(pdev, IORESOURCE_MEM, 1); if (!res) { dev_err(&pdev->dev, "Failed to get platform resource\n"); return -ENODEV; } - priv->control = devm_request_and_ioremap(&pdev->dev, res); - if (!priv->control) { - dev_err(&pdev->dev, "Failed to request_ioremap memory\n"); - return -EADDRNOTAVAIL; - } + priv->control = devm_ioremap_resource(&pdev->dev, res); + if (IS_ERR(priv->control)) + return PTR_ERR(priv->control); ret = dove_init_sensor(priv); if (ret) {
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: Andrew Lunn <andrew@lunn.ch> --- drivers/thermal/dove_thermal.c | 16 ++++++---------- 1 files changed, 6 insertions(+), 10 deletions(-)