From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757122Ab1GKGGL (ORCPT ); Mon, 11 Jul 2011 02:06:11 -0400 Received: from mail-iw0-f174.google.com ([209.85.214.174]:64116 "EHLO mail-iw0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756726Ab1GKGGJ (ORCPT ); Mon, 11 Jul 2011 02:06:09 -0400 From: Ravishankar To: gregkh@suse.de, wfp5p@virginia.edu Cc: devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, Ravishankar , Ravishankar Subject: [PATCH 4/4] Staging: comedi: fix brace coding style issue in pcl818.c Date: Mon, 11 Jul 2011 11:48:43 +0530 Message-Id: <1310365123-19287-1-git-send-email-ravishankarkm32@gmail.com> X-Mailer: git-send-email 1.6.5.2 In-Reply-To: <[PATCH 4/4]Staging: comedi:fix brace coding style issue in pcl818.c> References: <[PATCH 4/4]Staging: comedi:fix brace coding style issue in pcl818.c> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Ravishankar This is a patch to the pcl818.c file that fixes up a brace warning found by the checkpatch.pl tool Signed-off-by: Ravishankar --- drivers/staging/comedi/drivers/pcl818.c | 13 +++++-------- 1 files changed, 5 insertions(+), 8 deletions(-) diff --git a/drivers/staging/comedi/drivers/pcl818.c b/drivers/staging/comedi/drivers/pcl818.c index aa11a08..046340e 100644 --- a/drivers/staging/comedi/drivers/pcl818.c +++ b/drivers/staging/comedi/drivers/pcl818.c @@ -1426,9 +1426,8 @@ static int ai_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s, err++; } - if (err) { + if (err) return 4; - } /* step 5: complain about special chanlist considerations */ @@ -1458,11 +1457,10 @@ static int ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) devpriv->ai_timer1 = 0; devpriv->ai_timer2 = 0; - if (cmd->stop_src == TRIG_COUNT) { + if (cmd->stop_src == TRIG_COUNT) devpriv->ai_scans = cmd->stop_arg; - } else { + else devpriv->ai_scans = 0; - } if (cmd->scan_begin_src == TRIG_FOLLOW) { /* mode 1, 3 */ if (cmd->convert_src == TRIG_TIMER) { /* mode 1 */ @@ -1621,11 +1619,10 @@ static int set_rtc_irq_bit(unsigned char bit) save_flags(flags); cli(); val = CMOS_READ(RTC_CONTROL); - if (bit) { + if (bit) val |= RTC_PIE; - } else { + else val &= ~RTC_PIE; - } CMOS_WRITE(val, RTC_CONTROL); CMOS_READ(RTC_INTR_FLAGS); restore_flags(flags); -- 1.6.5.2