Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753961Ab3CKRC2 (ORCPT ); Mon, 11 Mar 2013 13:02:28 -0400 Received: from mail-ob0-f174.google.com ([209.85.214.174]:47620 "EHLO mail-ob0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753234Ab3CKRC0 (ORCPT ); Mon, 11 Mar 2013 13:02:26 -0400 MIME-Version: 1.0 In-Reply-To: <9281321.Y04oYVrc0i@vostro.rjw.lan> References: <1362987319-6369-1-git-send-email-silviupopescu1990@gmail.com> <1363013700.2291.83.camel@rzhang1-mobl4> <9281321.Y04oYVrc0i@vostro.rjw.lan> Date: Mon, 11 Mar 2013 19:02:22 +0200 Message-ID: Subject: Re: [PATCH] kirkwood: fix coccicheck warnings From: Silviu Popescu To: "Rafael J. Wysocki" Cc: Zhang Rui , cpufreq@vger.kernel.org, andrew@lunn.ch, jason@lakedaemon.net, rob.lee@linaro.org, len.brown@intel.com, khilman@ti.com, linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 4029 Lines: 93 On Mon, Mar 11, 2013 at 7:03 PM, Rafael J. Wysocki wrote: > 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 >> > --- >> > 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? Hello, I have sent a second version of the patch which does not modify kirkwood_thermal.c. Therefore the existing patch and the one I resent can be applied independently. -- Silviu Popescu -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/