From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753499AbaIALEf (ORCPT ); Mon, 1 Sep 2014 07:04:35 -0400 Received: from mail.mev.co.uk ([62.49.15.74]:38999 "EHLO mail.mev.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753461AbaIALEb (ORCPT ); Mon, 1 Sep 2014 07:04:31 -0400 From: Ian Abbott To: driverdev-devel@linuxdriverproject.org Cc: Greg Kroah-Hartman , Ian Abbott , H Hartley Sweeten , linux-kernel@vger.kernel.org Subject: [PATCH 23/28] staging: comedi: amplc_pci230: reduce indentation in pci230_ao_inttrig_scan_begin() Date: Mon, 1 Sep 2014 12:03:55 +0100 Message-Id: <1409569440-10979-24-git-send-email-abbotti@mev.co.uk> X-Mailer: git-send-email 2.0.4 In-Reply-To: <1409569440-10979-1-git-send-email-abbotti@mev.co.uk> References: <1409569440-10979-1-git-send-email-abbotti@mev.co.uk> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Signed-off-by: Ian Abbott --- drivers/staging/comedi/drivers/amplc_pci230.c | 35 ++++++++++++--------------- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/drivers/staging/comedi/drivers/amplc_pci230.c b/drivers/staging/comedi/drivers/amplc_pci230.c index 727de3d..a44b056 100644 --- a/drivers/staging/comedi/drivers/amplc_pci230.c +++ b/drivers/staging/comedi/drivers/amplc_pci230.c @@ -1226,28 +1226,25 @@ static int pci230_ao_inttrig_scan_begin(struct comedi_device *dev, return -EINVAL; spin_lock_irqsave(&devpriv->ao_stop_spinlock, irqflags); - if (devpriv->ao_cmd_started) { - /* Perform scan. */ - if (devpriv->hwver < 2) { - /* Not using DAC FIFO. */ - spin_unlock_irqrestore(&devpriv->ao_stop_spinlock, - irqflags); - pci230_handle_ao_nofifo(dev, s); - comedi_event(dev, s); - } else { - /* Using DAC FIFO. */ - /* Read DACSWTRIG register to trigger conversion. */ - inw(devpriv->daqio + PCI230P2_DACSWTRIG); - spin_unlock_irqrestore(&devpriv->ao_stop_spinlock, - irqflags); - } - /* Delay. Should driver be responsible for this? */ - /* XXX TODO: See if DAC busy bit can be used. */ - udelay(8); + if (!devpriv->ao_cmd_started) { + spin_unlock_irqrestore(&devpriv->ao_stop_spinlock, irqflags); + return 1; + } + /* Perform scan. */ + if (devpriv->hwver < 2) { + /* Not using DAC FIFO. */ + spin_unlock_irqrestore(&devpriv->ao_stop_spinlock, irqflags); + pci230_handle_ao_nofifo(dev, s); + comedi_event(dev, s); } else { + /* Using DAC FIFO. */ + /* Read DACSWTRIG register to trigger conversion. */ + inw(devpriv->daqio + PCI230P2_DACSWTRIG); spin_unlock_irqrestore(&devpriv->ao_stop_spinlock, irqflags); } - + /* Delay. Should driver be responsible for this? */ + /* XXX TODO: See if DAC busy bit can be used. */ + udelay(8); return 1; } -- 2.0.4 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 11E901C2BDF for ; Mon, 1 Sep 2014 11:04:31 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 0D3688D876 for ; Mon, 1 Sep 2014 11:04:31 +0000 (UTC) Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 7fkVrYy+97aX for ; Mon, 1 Sep 2014 11:04:30 +0000 (UTC) Received: from mail.mev.co.uk (mail.mev.co.uk [62.49.15.74]) by whitealder.osuosl.org (Postfix) with ESMTP id 6D8618D741 for ; Mon, 1 Sep 2014 11:04:30 +0000 (UTC) From: Ian Abbott Subject: [PATCH 23/28] staging: comedi: amplc_pci230: reduce indentation in pci230_ao_inttrig_scan_begin() Date: Mon, 1 Sep 2014 12:03:55 +0100 Message-Id: <1409569440-10979-24-git-send-email-abbotti@mev.co.uk> In-Reply-To: <1409569440-10979-1-git-send-email-abbotti@mev.co.uk> References: <1409569440-10979-1-git-send-email-abbotti@mev.co.uk> List-Id: Linux Driver Project Developer List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: driverdev-devel-bounces@linuxdriverproject.org Sender: driverdev-devel-bounces@linuxdriverproject.org To: driverdev-devel@linuxdriverproject.org Cc: Greg Kroah-Hartman , Ian Abbott , linux-kernel@vger.kernel.org Signed-off-by: Ian Abbott Reviewed-by: H Hartley Sweeten --- drivers/staging/comedi/drivers/amplc_pci230.c | 35 ++++++++++++--------------- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/drivers/staging/comedi/drivers/amplc_pci230.c b/drivers/staging/comedi/drivers/amplc_pci230.c index 727de3d..a44b056 100644 --- a/drivers/staging/comedi/drivers/amplc_pci230.c +++ b/drivers/staging/comedi/drivers/amplc_pci230.c @@ -1226,28 +1226,25 @@ static int pci230_ao_inttrig_scan_begin(struct comedi_device *dev, return -EINVAL; spin_lock_irqsave(&devpriv->ao_stop_spinlock, irqflags); - if (devpriv->ao_cmd_started) { - /* Perform scan. */ - if (devpriv->hwver < 2) { - /* Not using DAC FIFO. */ - spin_unlock_irqrestore(&devpriv->ao_stop_spinlock, - irqflags); - pci230_handle_ao_nofifo(dev, s); - comedi_event(dev, s); - } else { - /* Using DAC FIFO. */ - /* Read DACSWTRIG register to trigger conversion. */ - inw(devpriv->daqio + PCI230P2_DACSWTRIG); - spin_unlock_irqrestore(&devpriv->ao_stop_spinlock, - irqflags); - } - /* Delay. Should driver be responsible for this? */ - /* XXX TODO: See if DAC busy bit can be used. */ - udelay(8); + if (!devpriv->ao_cmd_started) { + spin_unlock_irqrestore(&devpriv->ao_stop_spinlock, irqflags); + return 1; + } + /* Perform scan. */ + if (devpriv->hwver < 2) { + /* Not using DAC FIFO. */ + spin_unlock_irqrestore(&devpriv->ao_stop_spinlock, irqflags); + pci230_handle_ao_nofifo(dev, s); + comedi_event(dev, s); } else { + /* Using DAC FIFO. */ + /* Read DACSWTRIG register to trigger conversion. */ + inw(devpriv->daqio + PCI230P2_DACSWTRIG); spin_unlock_irqrestore(&devpriv->ao_stop_spinlock, irqflags); } - + /* Delay. Should driver be responsible for this? */ + /* XXX TODO: See if DAC busy bit can be used. */ + udelay(8); return 1; } -- 2.0.4 _______________________________________________ devel mailing list devel@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel