From patchwork Fri Mar 22 22:25:05 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ezequiel Garcia X-Patchwork-Id: 2323051 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 F0953400E6 for ; Fri, 22 Mar 2013 22:25:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1423411Ab3CVWZm (ORCPT ); Fri, 22 Mar 2013 18:25:42 -0400 Received: from mail.free-electrons.com ([94.23.35.102]:33431 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1423359Ab3CVWZm (ORCPT ); Fri, 22 Mar 2013 18:25:42 -0400 Received: by mail.free-electrons.com (Postfix, from userid 106) id 11039143C; Fri, 22 Mar 2013 23:25:41 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on mail.free-electrons.com X-Spam-Level: X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,SHORTCIRCUIT, URIBL_BLOCKED shortcircuit=ham autolearn=disabled version=3.3.2 Received: from localhost.localdomain (20.222.3.200.ros.express.com.ar [200.3.222.20]) by mail.free-electrons.com (Postfix) with ESMTPA id 6BCE27DE; Fri, 22 Mar 2013 23:25:38 +0100 (CET) From: Ezequiel Garcia To: , Cc: Jason Cooper , Lior Amsalem , Zhang Rui , Nobuhiro Iwamatsu , Thomas Petazzoni , Gregory Clement , Sebastian Hesselbarth , Andrew Lunn , Ezequiel Garcia Subject: [PATCH v2 05/14] thermal: mvebu: Convert to devm_ioremap_resource() Date: Fri, 22 Mar 2013 19:25:05 -0300 Message-Id: <1363991114-4225-6-git-send-email-ezequiel.garcia@free-electrons.com> X-Mailer: git-send-email 1.7.8.6 In-Reply-To: <1363991114-4225-1-git-send-email-ezequiel.garcia@free-electrons.com> References: <1363991114-4225-1-git-send-email-ezequiel.garcia@free-electrons.com> Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org Convert devm_request_and_ioremap() to the newly introduced devm_ioremap_resource() which provides more consistent error handling. Signed-off-by: Ezequiel Garcia Acked-by: Eduardo Valentin --- drivers/thermal/mvebu_thermal.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/thermal/mvebu_thermal.c b/drivers/thermal/mvebu_thermal.c index 1f502ed..2aeaf75 100644 --- a/drivers/thermal/mvebu_thermal.c +++ b/drivers/thermal/mvebu_thermal.c @@ -86,11 +86,9 @@ static int mvebu_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("mvebu_thermal", 0, 0, priv, &ops, NULL, 0, 0);