From patchwork Sun May 26 12:00:05 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Lad, Prabhakar" X-Patchwork-Id: 2615001 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 1FD4EDFB79 for ; Sun, 26 May 2013 12:02:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752576Ab3EZMCJ (ORCPT ); Sun, 26 May 2013 08:02:09 -0400 Received: from mail-pd0-f181.google.com ([209.85.192.181]:48578 "EHLO mail-pd0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752463Ab3EZMCG (ORCPT ); Sun, 26 May 2013 08:02:06 -0400 Received: by mail-pd0-f181.google.com with SMTP id bv13so3814251pdb.40 for ; Sun, 26 May 2013 05:02:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=SDBvme0GLFUu8VC0lWUDTY65PqeFXpN8V1kVXI/9EK8=; b=PkV8WgETwa1ytPOGDRxZE0JvYqb8aE5TBBIF8Zoym/WyRCBfxucmgfsXyUoj5+SFt8 dLIxtp50ZZsJM6v5a97VcB5C1uHzZzLpWnxpnqbZMF/sOnofsxpQAxi0XzgLD1Zi1R1R Jjf+PDpcJlxFc4QwpcI8jsbJjN/Zm5Rp3/Wwm1AGl/osH0RJ4UI93chWfFY0rnMz7VCa W9mDDRTSqy9D1I5PxEJoXVsACrpqJs3l6PLm+0lx1fFbsq0Hw3eWDcB1IceUH1w9LFBd C6U3YdgsU+SMJifJGqWCXwChaOXqrq3PH0YfPCaJR2NEKdBIgliqRfFH8aI4CkZXFFuZ taKQ== X-Received: by 10.66.21.38 with SMTP id s6mr25432651pae.103.1369569725920; Sun, 26 May 2013 05:02:05 -0700 (PDT) Received: from localhost.localdomain ([112.79.41.196]) by mx.google.com with ESMTPSA id ri8sm24237417pbc.3.2013.05.26.05.01.55 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Sun, 26 May 2013 05:02:05 -0700 (PDT) From: Prabhakar Lad To: Hans Verkuil , Mauro Carvalho Chehab , LMML , Laurent Pinchart Cc: DLOS , LKML , "Lad, Prabhakar" Subject: [PATCH v3 2/9] media: davinci: vpif: Convert to devm_* api Date: Sun, 26 May 2013 17:30:05 +0530 Message-Id: <1369569612-30915-3-git-send-email-prabhakar.csengg@gmail.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1369569612-30915-1-git-send-email-prabhakar.csengg@gmail.com> References: <1369569612-30915-1-git-send-email-prabhakar.csengg@gmail.com> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org From: Lad, Prabhakar Use devm_ioremap_resource instead of reques_mem_region()/ioremap(). This ensures more consistent error values and simplifies error paths. Signed-off-by: Lad, Prabhakar Acked-by: Laurent Pinchart --- drivers/media/platform/davinci/vpif.c | 27 ++++----------------------- 1 files changed, 4 insertions(+), 23 deletions(-) diff --git a/drivers/media/platform/davinci/vpif.c b/drivers/media/platform/davinci/vpif.c index 761c825..f857d8f 100644 --- a/drivers/media/platform/davinci/vpif.c +++ b/drivers/media/platform/davinci/vpif.c @@ -37,8 +37,6 @@ MODULE_LICENSE("GPL"); #define VPIF_CH2_MAX_MODES (15) #define VPIF_CH3_MAX_MODES (02) -static resource_size_t res_len; -static struct resource *res; spinlock_t vpif_lock; void __iomem *vpif_base; @@ -421,23 +419,12 @@ EXPORT_SYMBOL(vpif_channel_getfid); static int vpif_probe(struct platform_device *pdev) { - int status = 0; + static struct resource *res; res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - if (!res) - return -ENOENT; - - res_len = resource_size(res); - - res = request_mem_region(res->start, res_len, res->name); - if (!res) - return -EBUSY; - - vpif_base = ioremap(res->start, res_len); - if (!vpif_base) { - status = -EBUSY; - goto fail; - } + vpif_base = devm_request_and_ioremap(&pdev->dev, res); + if (IS_ERR(vpif_base)) + return PTR_ERR(vpif_base); pm_runtime_enable(&pdev->dev); pm_runtime_get(&pdev->dev); @@ -445,17 +432,11 @@ static int vpif_probe(struct platform_device *pdev) spin_lock_init(&vpif_lock); dev_info(&pdev->dev, "vpif probe success\n"); return 0; - -fail: - release_mem_region(res->start, res_len); - return status; } static int vpif_remove(struct platform_device *pdev) { pm_runtime_disable(&pdev->dev); - iounmap(vpif_base); - release_mem_region(res->start, res_len); return 0; }