DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws;
  s=s1024; d=yahoo.com;
  h=X-YMail-OSG:Received:X-Rocket-MIMEInfo:X-Mailer:References:Message-ID:Date:From:Reply-To:Subject:To:Cc:In-Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding;
  b=W9pE+Hd9QN7t6kn60ygk9rjNkmMvsJ90cbKKCum2AXQAg9lN3lmXNfXiAdMyGj8W1xvnwyJTzTvnSlgyavqAXfqKoWlOArNOY25VSCZBO2eLpzL9DlR6P0XogCoFu6Ur3hVFwOe+eSPXQKS/5KfvsWlxfPoz00E7H6yp9tBY28E=;
References: <1393039229-7184-1-git-send-email-chase.southwood@yahoo.com> <1393039279-7229-1-git-send-email-chase.southwood@yahoo.com> <530B539B.8050201@mev.co.uk>
Message-ID: <1393257626.16647.YahooMailNeo@web164001.mail.gq1.yahoo.com>
Date: Mon, 24 Feb 2014 08:00:26 -0800 (PST)
From: Chase Southwood <chase.southwood@yahoo.com>
Reply-To: Chase Southwood <chase.southwood@yahoo.com>
Subject: Re: [PATCH 2/3] Staging: comedi: addi-data: cleanup conditional blocks in hwdrv_apci035.c
To: Ian Abbott <abbotti@mev.co.uk>,
        "gregkh@linuxfoundation.org" <gregkh@linuxfoundation.org>
Cc: Ian Abbott <ian.abbott@mev.co.uk>,
        "hsweeten@visionengravers.com" <hsweeten@visionengravers.com>,
        "devel@driverdev.osuosl.org" <devel@driverdev.osuosl.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
In-Reply-To: <530B539B.8050201@mev.co.uk>
MIME-Version: 1.0
Content-Type: text/plain; charset=iso-8859-1
Content-Transfer-Encoding: 8BIT
Sender: linux-kernel-owner@vger.kernel.org

>On Monday, February 24, 2014 8:13 AM, Ian Abbott <abbotti@mev.co.uk> wrote:

>>On 2014-02-22 03:21, Chase Southwood wrote:
>> There were some conditional blocks that had an unneccesary level of
>> indentation in them.? We can remove this to improve code clarity.
>>
>> Signed-off-by: Chase Southwood <chase.southwood@yahoo.com>
>> ---
>> ? .../comedi/drivers/addi-data/hwdrv_apci035.c? ? ?  | 31 ++++++++++------------
>> ? 1 file changed, 14 insertions(+), 17 deletions(-)
>>
>> diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci035.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci035.c
>> index 7c40535..34e5321 100644
>> --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci035.c
>> +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci035.c
>> @@ -207,23 +207,22 @@ static int i_APCI035_ConfigTimerWatchdog(struct comedi_device *dev,
>> ? ? ? ? ? ui_Command =
>> ? ? ? ? ? ? ? (ui_Command & 0xFFF719E2UL) | ui_Mode << 13UL | 0x10UL;
>>
>> -??? } else {
>> -??? ??? if (data[0] == ADDIDATA_WATCHDOG) {
>> +??? } else if (data[0] == ADDIDATA_WATCHDOG) {
>>
>> -??? ??? ??? /* Set the mode :? ? ? ? ? ?  */
>> -??? ??? ??? /* - Disable the hardware? ?  */
>> -??? ??? ??? /* - Disable the counter mode */
>> -??? ??? ??? /* - Disable the warning? ? ? */
>> -??? ??? ??? /* - Disable the reset? ? ? ? */
>> -??? ??? ??? /* - Disable the timer mode?  */
>> +??? ??? /* Set the mode :? ? ? ? ? ?  */
>> +??? ??? /* - Disable the hardware? ?  */
>> +??? ??? /* - Disable the counter mode */
>> +??? ??? /* - Disable the warning? ? ? */
>> +??? ??? /* - Disable the reset? ? ? ? */
>> +??? ??? /* - Disable the timer mode?  */
>>
>> -??? ??? ??? ui_Command = ui_Command & 0xFFF819E2UL;
>> +??? ??? ui_Command = ui_Command & 0xFFF819E2UL;
>>
>> -??? ??? } else {
>> -??? ??? ??? dev_err(dev->class_dev, "The parameter for Timer/watchdog selection is in error\n");
>> -??? ??? ??? return -EINVAL;
>> -??? ??? }
>> +??? } else {
>> +??? ??? dev_err(dev->class_dev, "The parameter for Timer/watchdog selection is in error\n");
>> +??? ??? return -EINVAL;
>>?  ??? }
>> +
>>?  ??? outl(ui_Command, devpriv->iobase + ((i_WatchdogNbr - 1) * 32) + 12);
>>?  ??? ui_Command = 0;
>>?  ??? ui_Command = inl(devpriv->iobase + ((i_WatchdogNbr - 1) * 32) + 12);
>> @@ -628,10 +627,8 @@ static void v_APCI035_Interrupt(int irq, void *d)
>>?  ??? ??? send_sig(SIGIO, devpriv->tsk_Current, 0);??? /*? send signal to the sample */
>>?  ??? }
>>
>> -??? else {
>> -??? ??? if ((ui_StatusRegister2 & 0x1) == 0x1)
>> -??? ??? ??? send_sig(SIGIO, devpriv->tsk_Current, 0);??? /*? send signal to the sample */
>> -??? }
>> +??? else if ((ui_StatusRegister2 & 0x1) == 0x1)
>> +??? ??? send_sig(SIGIO, devpriv->tsk_Current, 0);??? /*? send signal to the sample */>
>
>The usual style there is to put the "else" or the "else if" on the same 
>line as the preceding closing brace.
>
>Also, if any branch in the if, else if, ..., else chain uses braces, 
>they all should (see the bit that says "This does not apply if only one 
>branch of a conditional statement is a single statement; in the latter 
>case use braces in both branches:" in the CodingStyle).
>

Ah geez, don't know how that else if placement slipped through the cracks...my mistake. ?I've got a revision coming straight away that moves it to the proper place and puts back my overzealous brace deletion.

>
>>
>>?  ??? return;>>
>>?  }
>>
>
>
>-- 
>-=( Ian Abbott @ MEV Ltd.? ? E-mail: <abbotti@mev.co.uk>? ? ? ? )=-
>-=( Tel: +44 (0)161 477 1898?  FAX: +44 (0)161 718 3587? ? ? ?  )=-
>

Thanks,
Chase
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/