From patchwork Mon Mar 11 07:35:19 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Silviu-Mihai Popescu X-Patchwork-Id: 2247161 X-Patchwork-Delegate: rui.zhang@intel.com Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 517484020C for ; Mon, 11 Mar 2013 07:35:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752270Ab3CKHfZ (ORCPT ); Mon, 11 Mar 2013 03:35:25 -0400 Received: from mail-we0-f169.google.com ([74.125.82.169]:51354 "EHLO mail-we0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751673Ab3CKHfY (ORCPT ); Mon, 11 Mar 2013 03:35:24 -0400 Received: by mail-we0-f169.google.com with SMTP id t11so3303938wey.28 for ; Mon, 11 Mar 2013 00:35:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer; bh=3m0Q8hT7RM700F7FM6YVx8BiLQtaHqD7DDzcRsgGq1w=; b=vO1i7mUkagm7zChrALkR0izXMisYaQMjn6sZTOZaYzCruPHwWPd1PupGys37xvlZho IpOoMcFVuYgem2q81omPONMxbkVvyBKwqu9y+o8J5tVCOUd/svqyoPDZzB2W7nwtmoSV BScq90S6LPISHKABXQRXmUAX7MBq963y0DO8iBv3UeYPPepUSASXl+GgoiGx8jNuMhvo IQZy8TssPaBpFdYEahiliio5U9eUCYL3injPM+mv4upIsBQzmtLC3+U7B5yhFDJrvD99 pethP8HkSgadDGzvn3P+S7/6+00CHLnWDSIO0YRHJYL8NSmU/XpKbqSDhNwUghH2RXHW QcBg== X-Received: by 10.180.97.233 with SMTP id ed9mr10276147wib.32.1362987323163; Mon, 11 Mar 2013 00:35:23 -0700 (PDT) Received: from localhost.localdomain (p5.eregie.pub.ro. [141.85.0.105]) by mx.google.com with ESMTPS id c15sm15203172wiw.3.2013.03.11.00.35.21 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 11 Mar 2013 00:35:22 -0700 (PDT) From: Silviu-Mihai Popescu To: cpufreq@vger.kernel.org Cc: rjw@sisk.pl, rui.zhang@intel.com, 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, Silviu-Mihai Popescu Subject: [PATCH] kirkwood: fix coccicheck warnings Date: Mon, 11 Mar 2013 09:35:19 +0200 Message-Id: <1362987319-6369-1-git-send-email-silviupopescu1990@gmail.com> X-Mailer: git-send-email 1.7.9.5 Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org 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 Acked-by: Andrew Lunn Acked-by: Jason Cooper Acked-by: Viresh Kumar --- 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);