From patchwork Wed Feb 16 20:01:20 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Balbi X-Patchwork-Id: 568331 X-Patchwork-Delegate: tony@atomide.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p1GK1cVo007300 for ; Wed, 16 Feb 2011 20:01:45 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754173Ab1BPUBo (ORCPT ); Wed, 16 Feb 2011 15:01:44 -0500 Received: from na3sys009aog108.obsmtp.com ([74.125.149.199]:47389 "EHLO na3sys009aog108.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753788Ab1BPUBn (ORCPT ); Wed, 16 Feb 2011 15:01:43 -0500 Received: from source ([209.85.214.46]) (using TLSv1) by na3sys009aob108.postini.com ([74.125.148.12]) with SMTP ID DSNKTVwtJvEasDscs3ijMKT5SlT/HIJXcSty@postini.com; Wed, 16 Feb 2011 12:01:43 PST Received: by bwz15 with SMTP id 15so1161580bwz.5 for ; Wed, 16 Feb 2011 12:01:41 -0800 (PST) Received: by 10.204.47.227 with SMTP id o35mr830599bkf.132.1297886501504; Wed, 16 Feb 2011 12:01:41 -0800 (PST) Received: from localhost (cs181221087.pp.htv.fi [82.181.221.87]) by mx.google.com with ESMTPS id rc9sm101419bkb.2.2011.02.16.12.01.39 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 16 Feb 2011 12:01:40 -0800 (PST) From: Felipe Balbi To: Tony Lindgren Cc: Linux OMAP Mailing List , Felipe Balbi Subject: [PATCH 5/6 v2] cbus: retu: tabify retu initialization Date: Wed, 16 Feb 2011 22:01:20 +0200 Message-Id: <1297886481-26098-6-git-send-email-balbi@ti.com> X-Mailer: git-send-email 1.7.4.rc2 In-Reply-To: <1297886481-26098-1-git-send-email-balbi@ti.com> References: <1297886481-26098-1-git-send-email-balbi@ti.com> Organization: Texas Instruments\n Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Wed, 16 Feb 2011 20:01:45 +0000 (UTC) diff --git a/drivers/cbus/retu.c b/drivers/cbus/retu.c index 4c8a7ea..a4c565b 100644 --- a/drivers/cbus/retu.c +++ b/drivers/cbus/retu.c @@ -438,7 +438,6 @@ static int __init retu_probe(struct platform_device *pdev) int ret = -ENOMEM; int rev; - int irq; retu = kzalloc(sizeof(*retu), GFP_KERNEL); if (!retu) { @@ -447,16 +446,14 @@ static int __init retu_probe(struct platform_device *pdev) } platform_set_drvdata(pdev, retu); - the_retu = retu; - mutex_init(&retu->mutex); - - irq = platform_get_irq(pdev, 0); + retu->irq = platform_get_irq(pdev, 0); + retu->irq_base = pdata->irq_base; + retu->irq_end = pdata->irq_end; + retu->devid = pdata->devid; + the_retu = retu; - retu->irq = irq; - retu->irq_base = pdata->irq_base; - retu->irq_end = pdata->irq_end; - retu->devid = pdata->devid; + mutex_init(&retu->mutex); retu_irq_init(retu); @@ -471,14 +468,14 @@ static int __init retu_probe(struct platform_device *pdev) /* Mask all RETU interrupts */ __retu_write_reg(retu, RETU_REG_IMR, 0xffff); - ret = request_threaded_irq(irq, NULL, retu_irq_handler, 0, + ret = request_threaded_irq(retu->irq, NULL, retu_irq_handler, 0, "retu", retu); if (ret < 0) { dev_err(&pdev->dev, "Unable to register IRQ handler\n"); goto err1; } - set_irq_wake(irq, 1); + set_irq_wake(retu->irq, 1); /* Register power off function */ pm_power_off = retu_power_off; @@ -493,7 +490,7 @@ static int __init retu_probe(struct platform_device *pdev) err2: __retu_write_reg(retu, RETU_REG_IMR, 0xffff); - free_irq(irq, retu); + free_irq(retu->irq, retu); err1: kfree(retu); @@ -506,13 +503,11 @@ err0: static int __exit retu_remove(struct platform_device *pdev) { struct retu *retu = platform_get_drvdata(pdev); - int irq; - - irq = platform_get_irq(pdev, 0); /* Mask all RETU interrupts */ __retu_write_reg(retu, RETU_REG_IMR, 0xffff); - free_irq(irq, retu); + + free_irq(retu->irq, retu); retu_irq_exit(retu); kfree(retu); the_retu = NULL;