From patchwork Wed Apr 7 16:04:13 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Balbi X-Patchwork-Id: 91061 X-Patchwork-Delegate: tony@atomide.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o37G5HI7005510 for ; Wed, 7 Apr 2010 16:05:18 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932815Ab0DGQFR (ORCPT ); Wed, 7 Apr 2010 12:05:17 -0400 Received: from smtp.nokia.com ([192.100.122.230]:58470 "EHLO mgw-mx03.nokia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932621Ab0DGQFP (ORCPT ); Wed, 7 Apr 2010 12:05:15 -0400 Received: from esebh105.NOE.Nokia.com (esebh105.ntc.nokia.com [172.21.138.211]) by mgw-mx03.nokia.com (Switch-3.3.3/Switch-3.3.3) with ESMTP id o37G4kcG004699 for ; Wed, 7 Apr 2010 19:05:12 +0300 Received: from vaebh104.NOE.Nokia.com ([10.160.244.30]) by esebh105.NOE.Nokia.com with Microsoft SMTPSVC(6.0.3790.3959); Wed, 7 Apr 2010 19:05:09 +0300 Received: from mgw-da02.ext.nokia.com ([147.243.128.26]) by vaebh104.NOE.Nokia.com over TLS secured channel with Microsoft SMTPSVC(6.0.3790.3959); Wed, 7 Apr 2010 19:05:07 +0300 Received: from localhost.localdomain (esdhcp04088.research.nokia.com [172.21.40.88]) by mgw-da02.ext.nokia.com (Switch-3.3.3/Switch-3.3.3) with ESMTP id o37G4YN6015130; Wed, 7 Apr 2010 19:05:04 +0300 From: felipe.balbi@nokia.com To: Linux OMAP Mailing List Cc: Felipe Balbi Subject: [RFC PATCH 22/37] cbus: tahvo: don't assign ret inside if () Date: Wed, 7 Apr 2010 19:04:13 +0300 Message-Id: <1270656268-7034-23-git-send-email-felipe.balbi@nokia.com> X-Mailer: git-send-email 1.7.0.rc0.33.g7c3932 In-Reply-To: <1270656268-7034-1-git-send-email-felipe.balbi@nokia.com> References: <1270656268-7034-1-git-send-email-felipe.balbi@nokia.com> X-OriginalArrivalTime: 07 Apr 2010 16:05:08.0311 (UTC) FILETIME=[18210670:01CAD66C] X-Nokia-AV: Clean 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.3 (demeter.kernel.org [140.211.167.41]); Wed, 07 Apr 2010 16:05:19 +0000 (UTC) diff --git a/drivers/cbus/tahvo.c b/drivers/cbus/tahvo.c index e14108f..fc25a89 100644 --- a/drivers/cbus/tahvo.c +++ b/drivers/cbus/tahvo.c @@ -340,7 +340,8 @@ static int __devinit tahvo_probe(struct device *dev) return -ENODEV; } - if ((ret = gpio_request(tahvo_irq_pin, "TAHVO irq")) < 0) { + ret = gpio_request(tahvo_irq_pin, "TAHVO irq"); + if (ret) { printk(KERN_ERR PFX "Unable to reserve IRQ GPIO\n"); return ret; } @@ -424,10 +425,12 @@ static int __init tahvo_init(void) init_completion(&device_release); - if ((ret = driver_register(&tahvo_driver)) < 0) + ret = driver_register(&tahvo_driver); + if (ret) return ret; - if ((ret = platform_device_register(&tahvo_device)) < 0) { + ret = platform_device_register(&tahvo_device); + if (ret) { driver_unregister(&tahvo_driver); return ret; }