From patchwork Mon Mar 4 06:45:33 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sachin Kamat X-Patchwork-Id: 2210761 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 804AB3FCF2 for ; Mon, 4 Mar 2013 06:56:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750990Ab3CDG4G (ORCPT ); Mon, 4 Mar 2013 01:56:06 -0500 Received: from mail-da0-f43.google.com ([209.85.210.43]:50097 "EHLO mail-da0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750727Ab3CDG4F (ORCPT ); Mon, 4 Mar 2013 01:56:05 -0500 Received: by mail-da0-f43.google.com with SMTP id u36so2417206dak.16 for ; Sun, 03 Mar 2013 22:56:05 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:x-gm-message-state; bh=qxqcbOCA9wmQzFeA5yDpOzrdIdxcQQJOuRB1BLFmWac=; b=B45QamP+083s0cOmGPw1ZMIS3TeORjEXaY7FmJj8Hcjl9FqR6fJSd16h7tTNchSjaI OUhq3pKWb3tFqk79KszY0hQMJkqdZeADhi3sNQFSKIyApQWFoeISfHzwXc0VH4LBOmrb fyjOKNr1c5OonDbxYoNFk26PVxhDfcCVBf3Oth1TIi6UxzV1AhP82n1/+ABjLxZcrEMM mpwZC7JTtLoFlVv9YSDi3RrIEFunSnKsAfbMvxVPR9Kd7zTFONP9xL2akoZl3XF/imN7 9RaZIiZJIWh0csyIxY2IUO/3AwO+Y7u9A7F7easJm3QcM6MdeIEtAcGDEcMkW0RnSYRR 6PrA== X-Received: by 10.66.230.132 with SMTP id sy4mr13121706pac.94.1362380164906; Sun, 03 Mar 2013 22:56:04 -0800 (PST) Received: from localhost.localdomain ([115.113.119.130]) by mx.google.com with ESMTPS id ou3sm4051252pbc.7.2013.03.03.22.56.02 (version=TLSv1 cipher=RC4-SHA bits=128/128); Sun, 03 Mar 2013 22:56:04 -0800 (PST) From: Sachin Kamat To: linux-pm@vger.kernel.org Cc: rui.zhang@intel.com, thierry.reding@avionic-design.de, sachin.kamat@linaro.org, Kuninori Morimoto Subject: [PATCH 2/3] Thermal: rcar: Convert to devm_ioremap_resource() Date: Mon, 4 Mar 2013 12:15:33 +0530 Message-Id: <1362379534-30662-2-git-send-email-sachin.kamat@linaro.org> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1362379534-30662-1-git-send-email-sachin.kamat@linaro.org> References: <1362379534-30662-1-git-send-email-sachin.kamat@linaro.org> X-Gm-Message-State: ALoCoQk3rgIm+tHXTI4kE6zjy4Ht1W+OspRBbUJ5YpMfHIcQLepCgsLxKtvGrK2ytAbyE6auiWld Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org 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 Cc: Kuninori Morimoto Reviewed-by: Thierry Reding --- drivers/thermal/rcar_thermal.c | 16 ++++++---------- 1 files changed, 6 insertions(+), 10 deletions(-) diff --git a/drivers/thermal/rcar_thermal.c b/drivers/thermal/rcar_thermal.c index 28f0919..b28990a 100644 --- a/drivers/thermal/rcar_thermal.c +++ b/drivers/thermal/rcar_thermal.c @@ -399,11 +399,9 @@ static int rcar_thermal_probe(struct platform_device *pdev) /* * rcar_has_irq_support() will be enabled */ - common->base = devm_request_and_ioremap(dev, res); - if (!common->base) { - dev_err(dev, "Unable to ioremap thermal register\n"); - return -ENOMEM; - } + common->base = devm_ioremap_resource(dev, res); + if (IS_ERR(common->base)) + return PTR_ERR(common->base); /* enable temperature comparation */ rcar_thermal_common_write(common, ENR, 0x00030303); @@ -422,11 +420,9 @@ static int rcar_thermal_probe(struct platform_device *pdev) return -ENOMEM; } - priv->base = devm_request_and_ioremap(dev, res); - if (!priv->base) { - dev_err(dev, "Unable to ioremap priv register\n"); - return -ENOMEM; - } + priv->base = devm_ioremap_resource(dev, res); + if (IS_ERR(priv->base)) + return PTR_ERR(priv->base); priv->common = common; priv->id = i;