From patchwork Mon Mar 4 08:15:20 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sachin Kamat X-Patchwork-Id: 2211381 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id E34DADF2F2 for ; Mon, 4 Mar 2013 08:25:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755509Ab3CDIZy (ORCPT ); Mon, 4 Mar 2013 03:25:54 -0500 Received: from mail-da0-f52.google.com ([209.85.210.52]:45425 "EHLO mail-da0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755457Ab3CDIZx (ORCPT ); Mon, 4 Mar 2013 03:25:53 -0500 Received: by mail-da0-f52.google.com with SMTP id x33so2431050dad.25 for ; Mon, 04 Mar 2013 00:25:53 -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=nQNEPZd5QbgEu1niBkGSUP3kXVjNy7W75rk7cdtwDdI=; b=fTwX/O032lJPGoVzRwMRuRhYuJiomLZrj8ry0KXsrD69ieH77/dNatuIao5WYfBSQh ud6YOSRsjtB+j1fgd7QzwB/4ClEA/RTK+j1HMiE47O4oXobwYokh1jjQCrTior7ssCOZ krmcFXhr93FPExoSwdWEX13XW8lu4oSbCRaZOxeCH7qBGaNmL17L7i7tnXvWO0nrBy+j 28OltF1IQbL9ZHw3nPSY/lTqrtWMelPijT6zU4w+q4pNTBPYDeArTNEChj/mso4tyzhC MYfyhU8S05M2rqp00JzCkpA4fPwPv068/ZAoLFxErfFnnowudlfpuZ45PZIwKTUdRqoY tixA== X-Received: by 10.68.221.68 with SMTP id qc4mr16819921pbc.152.1362385553027; Mon, 04 Mar 2013 00:25:53 -0800 (PST) Received: from localhost.localdomain ([115.113.119.130]) by mx.google.com with ESMTPS id 1sm21552973pbg.18.2013.03.04.00.25.50 (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 04 Mar 2013 00:25:52 -0800 (PST) From: Sachin Kamat To: linux-media@vger.kernel.org Cc: g.liakhovetski@gmx.de, sachin.kamat@linaro.org, thierry.reding@avionic-design.de Subject: [PATCH 3/4] [media] soc_camera/sh_mobile_ceu_camera: Convert to devm_ioremap_resource() Date: Mon, 4 Mar 2013 13:45:20 +0530 Message-Id: <1362384921-7344-3-git-send-email-sachin.kamat@linaro.org> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1362384921-7344-1-git-send-email-sachin.kamat@linaro.org> References: <1362384921-7344-1-git-send-email-sachin.kamat@linaro.org> X-Gm-Message-State: ALoCoQnbnkiV+oPBQw6dWOvRHiVKhTbTayvoZgFoxYnfPI3rihdWDHJIgMSnSMztk62C2ZIuWIAG Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@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 Reviewed-by: Thierry Reding --- .../platform/soc_camera/sh_mobile_ceu_camera.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/media/platform/soc_camera/sh_mobile_ceu_camera.c b/drivers/media/platform/soc_camera/sh_mobile_ceu_camera.c index bb08a46..be1af08 100644 --- a/drivers/media/platform/soc_camera/sh_mobile_ceu_camera.c +++ b/drivers/media/platform/soc_camera/sh_mobile_ceu_camera.c @@ -20,6 +20,7 @@ #include #include #include +#include #include #include #include @@ -2110,11 +2111,9 @@ static int sh_mobile_ceu_probe(struct platform_device *pdev) pcdev->max_width = pcdev->pdata->max_width ? : 2560; pcdev->max_height = pcdev->pdata->max_height ? : 1920; - base = devm_request_and_ioremap(&pdev->dev, res); - if (!base) { - dev_err(&pdev->dev, "Unable to ioremap CEU registers.\n"); - return -ENXIO; - } + base = devm_ioremap_resource(&pdev->dev, res); + if (IS_ERR(base)) + return PTR_ERR(base); pcdev->irq = irq; pcdev->base = base;