On Monday, March 11, 2013 10:55:00 PM Zhang Rui wrote: > On Mon, 2013-03-11 at 09:35 +0200, Silviu-Mihai Popescu wrote: > > Convert all uses of devm_request_and_ioremap() to the newly introduced > > devm_ioremap_resource() 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: Silviu-Mihai Popescu <[email protected]> > > --- > > drivers/cpufreq/kirkwood-cpufreq.c | 8 +++----- > > drivers/cpuidle/cpuidle-kirkwood.c | 6 +++--- > > drivers/thermal/kirkwood_thermal.c | 8 +++----- > > 3 files changed, 9 insertions(+), 13 deletions(-) > > > > diff --git a/drivers/cpufreq/kirkwood-cpufreq.c > > b/drivers/cpufreq/kirkwood-cpufreq.c > > index 0e83e3c..6052476 100644 > > --- a/drivers/cpufreq/kirkwood-cpufreq.c > > +++ b/drivers/cpufreq/kirkwood-cpufreq.c > > @@ -175,11 +175,9 @@ static int kirkwood_cpufreq_probe(struct > > platform_device *pdev) > > dev_err(&pdev->dev, "Cannot get memory resource\n"); > > return -ENODEV; > > } > > - priv.base = devm_request_and_ioremap(&pdev->dev, res); > > - if (!priv.base) { > > - dev_err(&pdev->dev, "Cannot ioremap\n"); > > - return -EADDRNOTAVAIL; > > - } > > + priv.base = devm_ioremap_resource(&pdev->dev, res); > > + if (IS_ERR(priv.base)) > > + return PTR_ERR(priv.base); > > > > np = of_find_node_by_path("/cpus/cpu@0"); > > if (!np) > > diff --git a/drivers/cpuidle/cpuidle-kirkwood.c > > b/drivers/cpuidle/cpuidle-kirkwood.c > > index 670aa1e..53aad73 100644 > > --- a/drivers/cpuidle/cpuidle-kirkwood.c > > +++ b/drivers/cpuidle/cpuidle-kirkwood.c > > @@ -66,9 +66,9 @@ static int kirkwood_cpuidle_probe(struct platform_device > > *pdev) > > if (res == NULL) > > return -EINVAL; > > > > - ddr_operation_base = devm_request_and_ioremap(&pdev->dev, res); > > - if (!ddr_operation_base) > > - return -EADDRNOTAVAIL; > > + ddr_operation_base = devm_ioremap_resource(&pdev->dev, res); > > + if (IS_ERR(ddr_operation_base)) > > + return PTR_ERR(ddr_operation_base); > > > > device = &per_cpu(kirkwood_cpuidle_device, smp_processor_id()); > > device->state_count = KIRKWOOD_MAX_STATES; > > 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); > > there is already a fix for kirkwood_thermal.c at > http://marc.info/?l=linux-pm&m=136238017027514&w=2 > and it has been applied to thermal -next. > > would you please refreshed the patch?
Are you going to take that patch into your tree, then? Rafael -- I speak only for myself. Rafael J. Wysocki, Intel Open Source Technology Center. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
