Merge branch 'for-2.6.31' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6

[pandora-kernel.git] / drivers / staging / comedi / drivers / addi-data / hwdrv_APCI1710.c

diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_APCI1710.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_APCI1710.c
index 176bd86..47517a9 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_APCI1710.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_APCI1710.c
@@ -1,15 +1,15 @@
-/**
+//**
 @verbatim
 
 Copyright (C) 2004,2005  ADDI-DATA GmbH for the source code of this module.
 
-        ADDI-DATA GmbH
-        Dieselstrasse 3
-        D-77833 Ottersweier
-        Tel: +19(0)7223/9493-0
-        Fax: +49(0)7223/9493-92
-        http://www.addi-data-com
-        info@addi-data.com
+       ADDI-DATA GmbH
+       Dieselstrasse 3
+       D-77833 Ottersweier
+       Tel: +19(0)7223/9493-0
+       Fax: +49(0)7223/9493-92
+       http://www.addi-data-com
+       info@addi-data.com
 
 This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
 
@@ -63,14 +63,15 @@ void i_ADDI_AttachPCI1710(struct comedi_device *dev)
        int n_subdevices = 9;
 
        /* Update-0.7.57->0.7.68dev->n_subdevices = 9; */
-       if ((ret = alloc_subdevices(dev, n_subdevices)) < 0)
+       ret = alloc_subdevices(dev, n_subdevices);
+       if (ret < 0)
                return;
 
        /*  Allocate and Initialise Timer Subdevice Structures */
        s = dev->subdevices + 0;
 
        s->type = COMEDI_SUBD_TIMER;
-       s->subdev_flags = SDF_WRITEABLE | SDF_RT | SDF_GROUND | SDF_COMMON;
+       s->subdev_flags = SDF_WRITEABLE | SDF_GROUND | SDF_COMMON;
        s->n_chan = 3;
        s->maxdata = 0;
        s->len_chanlist = 3;
@@ -85,7 +86,7 @@ void i_ADDI_AttachPCI1710(struct comedi_device *dev)
 
        s->type = COMEDI_SUBD_DIO;
        s->subdev_flags =
-               SDF_WRITEABLE | SDF_READABLE | SDF_RT | SDF_GROUND | SDF_COMMON;
+               SDF_WRITEABLE | SDF_READABLE | SDF_GROUND | SDF_COMMON;
        s->n_chan = 7;
        s->maxdata = 1;
        s->len_chanlist = 7;
@@ -99,7 +100,7 @@ void i_ADDI_AttachPCI1710(struct comedi_device *dev)
        s = dev->subdevices + 2;
 
        s->type = COMEDI_SUBD_CHRONO;
-       s->subdev_flags = SDF_WRITEABLE | SDF_RT | SDF_GROUND | SDF_COMMON;
+       s->subdev_flags = SDF_WRITEABLE | SDF_GROUND | SDF_COMMON;
        s->n_chan = 4;
        s->maxdata = 0;
        s->len_chanlist = 4;
@@ -113,7 +114,7 @@ void i_ADDI_AttachPCI1710(struct comedi_device *dev)
        s = dev->subdevices + 3;
        s->type = COMEDI_SUBD_PWM;
        s->subdev_flags =
-               SDF_WRITEABLE | SDF_READABLE | SDF_RT | SDF_GROUND | SDF_COMMON;
+               SDF_WRITEABLE | SDF_READABLE | SDF_GROUND | SDF_COMMON;
        s->n_chan = 3;
        s->maxdata = 1;
        s->len_chanlist = 3;
@@ -128,7 +129,7 @@ void i_ADDI_AttachPCI1710(struct comedi_device *dev)
        s = dev->subdevices + 4;
        s->type = COMEDI_SUBD_TTLIO;
        s->subdev_flags =
-               SDF_WRITEABLE | SDF_READABLE | SDF_RT | SDF_GROUND | SDF_COMMON;
+               SDF_WRITEABLE | SDF_READABLE | SDF_GROUND | SDF_COMMON;
        s->n_chan = 8;
        s->maxdata = 1;
        s->len_chanlist = 8;
@@ -142,7 +143,7 @@ void i_ADDI_AttachPCI1710(struct comedi_device *dev)
        s = dev->subdevices + 5;
        s->type = COMEDI_SUBD_TOR;
        s->subdev_flags =
-               SDF_WRITEABLE | SDF_READABLE | SDF_RT | SDF_GROUND | SDF_COMMON;
+               SDF_WRITEABLE | SDF_READABLE | SDF_GROUND | SDF_COMMON;
        s->n_chan = 8;
        s->maxdata = 1;
        s->len_chanlist = 8;
@@ -157,7 +158,7 @@ void i_ADDI_AttachPCI1710(struct comedi_device *dev)
        s = dev->subdevices + 6;
        s->type = COMEDI_SUBD_SSI;
        s->subdev_flags =
-               SDF_WRITEABLE | SDF_READABLE | SDF_RT | SDF_GROUND | SDF_COMMON;
+               SDF_WRITEABLE | SDF_READABLE | SDF_GROUND | SDF_COMMON;
        s->n_chan = 4;
        s->maxdata = 1;
        s->len_chanlist = 4;
@@ -170,7 +171,7 @@ void i_ADDI_AttachPCI1710(struct comedi_device *dev)
        s = dev->subdevices + 7;
        s->type = COMEDI_SUBD_PULSEENCODER;
        s->subdev_flags =
-               SDF_WRITEABLE | SDF_READABLE | SDF_RT | SDF_GROUND | SDF_COMMON;
+               SDF_WRITEABLE | SDF_READABLE | SDF_GROUND | SDF_COMMON;
        s->n_chan = 4;
        s->maxdata = 1;
        s->len_chanlist = 4;
@@ -184,7 +185,7 @@ void i_ADDI_AttachPCI1710(struct comedi_device *dev)
        s = dev->subdevices + 8;
        s->type = COMEDI_SUBD_INCREMENTALCOUNTER;
        s->subdev_flags =
-               SDF_WRITEABLE | SDF_READABLE | SDF_RT | SDF_GROUND | SDF_COMMON;
+               SDF_WRITEABLE | SDF_READABLE | SDF_GROUND | SDF_COMMON;
        s->n_chan = 500;
        s->maxdata = 1;
        s->len_chanlist = 500;