From patchwork Sun May 26 12:00:09 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Lad, Prabhakar" X-Patchwork-Id: 2615161 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 C5D6ADFB79 for ; Sun, 26 May 2013 12:04:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752899Ab3EZMC6 (ORCPT ); Sun, 26 May 2013 08:02:58 -0400 Received: from mail-pd0-f180.google.com ([209.85.192.180]:61404 "EHLO mail-pd0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752887Ab3EZMC4 (ORCPT ); Sun, 26 May 2013 08:02:56 -0400 Received: by mail-pd0-f180.google.com with SMTP id 14so3243662pdc.25 for ; Sun, 26 May 2013 05:02:56 -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=JTutoOkRyVNvLEhVu7gYcZ4zFM0nzovGoUuMfPUO3to=; b=r4gWbDjIJGva9lWaFLPhZuTeC8q+G/7QCH94WBgk1QrSNF+8KGxZ6pNhD3SD5W822J o+jo0tf1jQR4vuvxYNfKfs0YwOPh37K5Hxj/ex6wJQh5m+sFHLZiPAyRLvhfeBDKvC8g m23qIXJekTSNrillnLPY/wPWipliPNg1IErUsxnUpkiaJUOKsLXJ9lDz8pPJDXjBzWh/ tN2Fk01HtSafFJZH+s8xJ589GE4XX81/Wq/adNEQuTYBCUqdR+J761tXoHjjn963fmFf QOIsflxMsXYHWW6+b2Ok6robEi8oJJI7Vqsfwf94gqwNXty6jQ4/JoFE6SLJcjT5kFDC Zw9A== X-Received: by 10.68.105.131 with SMTP id gm3mr25545231pbb.168.1369569776278; Sun, 26 May 2013 05:02:56 -0700 (PDT) Received: from localhost.localdomain ([112.79.41.196]) by mx.google.com with ESMTPSA id ri8sm24237417pbc.3.2013.05.26.05.02.48 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Sun, 26 May 2013 05:02:55 -0700 (PDT) From: Prabhakar Lad To: Hans Verkuil , Mauro Carvalho Chehab , LMML , Laurent Pinchart Cc: DLOS , LKML , "Lad, Prabhakar" Subject: [PATCH v3 6/9] media: davinci: vpif_capture: Convert to devm_* api Date: Sun, 26 May 2013 17:30:09 +0530 Message-Id: <1369569612-30915-7-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_request_irq() instead of request_irq(). This ensures more consistent error values and simplifies error paths. Signed-off-by: Lad, Prabhakar Acked-by: Laurent Pinchart --- drivers/media/platform/davinci/vpif_capture.c | 38 ++++++++----------------- 1 files changed, 12 insertions(+), 26 deletions(-) diff --git a/drivers/media/platform/davinci/vpif_capture.c b/drivers/media/platform/davinci/vpif_capture.c index 38c1fba..5e1e5f6 100644 --- a/drivers/media/platform/davinci/vpif_capture.c +++ b/drivers/media/platform/davinci/vpif_capture.c @@ -2082,14 +2082,14 @@ static __init int vpif_probe(struct platform_device *pdev) while ((res = platform_get_resource(pdev, IORESOURCE_IRQ, res_idx))) { for (i = res->start; i <= res->end; i++) { - if (request_irq(i, vpif_channel_isr, IRQF_SHARED, - "VPIF_Capture", (void *) - (&vpif_obj.dev[res_idx]->channel_id))) { - err = -EBUSY; - for (j = 0; j < i; j++) - free_irq(j, (void *) - (&vpif_obj.dev[res_idx]->channel_id)); - goto vpif_int_err; + err = devm_request_irq(&pdev->dev, i, vpif_channel_isr, + IRQF_SHARED, "VPIF_Capture", + (void *)(&vpif_obj.dev[res_idx]-> + channel_id)); + if (err) { + err = -EINVAL; + goto vpif_unregister; + } } res_idx++; @@ -2106,7 +2106,7 @@ static __init int vpif_probe(struct platform_device *pdev) video_device_release(ch->video_dev); } err = -ENOMEM; - goto vpif_int_err; + goto vpif_unregister; } /* Initialize field of video device */ @@ -2207,13 +2207,9 @@ vpif_sd_error: /* Note: does nothing if ch->video_dev == NULL */ video_device_release(ch->video_dev); } -vpif_int_err: +vpif_unregister: v4l2_device_unregister(&vpif_obj.v4l2_dev); - for (i = 0; i < res_idx; i++) { - res = platform_get_resource(pdev, IORESOURCE_IRQ, i); - for (j = res->start; j <= res->end; j++) - free_irq(j, (void *)(&vpif_obj.dev[i]->channel_id)); - } + return err; } @@ -2225,18 +2221,8 @@ vpif_int_err: */ static int vpif_remove(struct platform_device *device) { - struct platform_device *pdev; struct channel_obj *ch; - struct resource *res; - int irq_num, i = 0; - - pdev = container_of(vpif_dev, struct platform_device, dev); - while ((res = platform_get_resource(pdev, IORESOURCE_IRQ, i))) { - for (irq_num = res->start; irq_num <= res->end; irq_num++) - free_irq(irq_num, - (void *)(&vpif_obj.dev[i]->channel_id)); - i++; - } + int i; v4l2_device_unregister(&vpif_obj.v4l2_dev);