staging: comedi: remove the "Allocate the subdevice..." comments

These comments are redundant. The function name 'comedi_alloc_subdevices'
provides this information.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <ian@mev.co.uk>
Cc: Frank Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/comedi/drivers/addi-data/addi_common.c b/drivers/staging/comedi/drivers/addi-data/addi_common.c
index 274990a7cd3f98a77153e4f9606e81103bf04ecf..46c590b1ad96036e6bd32e6984e2b818ca6ef5fc 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/addi_common.c
+++ b/drivers/staging/comedi/drivers/addi-data/addi_common.c
@@ -1686,7 +1686,6 @@ static int i_ADDI_Attach(struct comedi_device *dev, struct comedi_devconfig *it)
                devpriv->s_BoardInfos.ui_Address = io_addr[2];
 #endif
        } else {
-               /* Update-0.7.57->0.7.68dev->n_subdevices = 7; */
                n_subdevices = 7;
                ret = comedi_alloc_subdevices(dev, n_subdevices);
                if (ret < 0)

diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_APCI1710.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_APCI1710.c
index 9632ca182d253ffb6b850da1f2c236907e1eb896..aa390b01475bce69b2ea7eade14646c36583f5ba 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_APCI1710.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_APCI1710.c
@@ -62,7 +62,6 @@ void i_ADDI_AttachPCI1710(struct comedi_device *dev)
        int ret = 0;
        int n_subdevices = 9;
 
-       /* Update-0.7.57->0.7.68dev->n_subdevices = 9; */
        ret = comedi_alloc_subdevices(dev, n_subdevices);
        if (ret < 0)
                return;

diff --git a/drivers/staging/comedi/drivers/adq12b.c b/drivers/staging/comedi/drivers/adq12b.c
index ca8892e83db1279bac73f9e9673c05116a1a693a..afc6815bcc362abd4856562257d4005e794ed8b0 100644 (file)
--- a/drivers/staging/comedi/drivers/adq12b.c
+++ b/drivers/staging/comedi/drivers/adq12b.c
@@ -267,10 +267,6 @@ static int adq12b_attach(struct comedi_device *dev, struct comedi_devconfig *it)
        devpriv->last_channel = -1;
        devpriv->last_range = -1;
 
-/*
- * Allocate the subdevice structures.  alloc_subdevice() is a
- * convenient macro defined in comedidev.h.
- */
        if (comedi_alloc_subdevices(dev, 3) < 0)
                return -ENOMEM;
 

diff --git a/drivers/staging/comedi/drivers/amplc_pci224.c b/drivers/staging/comedi/drivers/amplc_pci224.c
index c64e32821c4d5c9a3185b42d707e697b79839c94..1392406d99f08f3a106c7198834fedaf52406e08 100644 (file)
--- a/drivers/staging/comedi/drivers/amplc_pci224.c
+++ b/drivers/staging/comedi/drivers/amplc_pci224.c
@@ -1379,7 +1379,6 @@ static int pci224_attach_common(struct comedi_device *dev,
        outw(devpriv->daccon | PCI224_DACCON_FIFORESET,
             dev->iobase + PCI224_DACCON);
 
-       /* Allocate subdevices.  There is only one!  */
        ret = comedi_alloc_subdevices(dev, 1);
        if (ret < 0)
                return ret;

diff --git a/drivers/staging/comedi/drivers/amplc_pci230.c b/drivers/staging/comedi/drivers/amplc_pci230.c
index e6598cafb39a23fe729af001e6c9a8a393d5c636..52f3cb8fb2d1bd1e7995642dbbdfab5387a2c39b 100644 (file)
--- a/drivers/staging/comedi/drivers/amplc_pci230.c
+++ b/drivers/staging/comedi/drivers/amplc_pci230.c
@@ -2839,10 +2839,7 @@ static int pci230_attach_common(struct comedi_device *dev,
                dev_dbg(dev->class_dev, "registered irq %u\n",
                        devpriv->pci_dev->irq);
        }
-       /*
-        * Allocate the subdevice structures.  alloc_subdevice() is a
-        * convenient macro defined in comedidev.h.
-        */
+
        if (comedi_alloc_subdevices(dev, 3) < 0)
                return -ENOMEM;
        s = dev->subdevices + 0;

diff --git a/drivers/staging/comedi/drivers/c6xdigio.c b/drivers/staging/comedi/drivers/c6xdigio.c
index 72b000fad609203f8c7cdc6f9770efb2753a4de9..5fa344b269fdeaa0bbebbfcbc96a72949ed7503c 100644 (file)
--- a/drivers/staging/comedi/drivers/c6xdigio.c
+++ b/drivers/staging/comedi/drivers/c6xdigio.c
@@ -433,7 +433,6 @@ static int c6xdigio_attach(struct comedi_device *dev,
        dev->iobase = iobase;
        dev->board_name = "c6xdigio";
 
-       /* 3 subdevices with encoder_init write */
        result = comedi_alloc_subdevices(dev, 2);
        if (result < 0)
                return result;

diff --git a/drivers/staging/comedi/drivers/cb_pcidas.c b/drivers/staging/comedi/drivers/cb_pcidas.c
index 435f3aaedf88fafe9bd7cbda240771ed121705b8..e1bd99a950e43f253d950eca5b3c6e03edf91cf8 100644 (file)
--- a/drivers/staging/comedi/drivers/cb_pcidas.c
+++ b/drivers/staging/comedi/drivers/cb_pcidas.c
@@ -614,9 +614,6 @@ found:
        /* Initialize dev->board_name */
        dev->board_name = thisboard->name;
 
-/*
- * Allocate the subdevice structures.
- */
        if (comedi_alloc_subdevices(dev, 7) < 0)
                return -ENOMEM;
 

diff --git a/drivers/staging/comedi/drivers/cb_pcidda.c b/drivers/staging/comedi/drivers/cb_pcidda.c
index 4ab3584365e2dd649770acf0f6d831e1d6b68d0e..fedaf55af03dbedc4b1ce1430d7f962966ae4f12 100644 (file)
--- a/drivers/staging/comedi/drivers/cb_pcidda.c
+++ b/drivers/staging/comedi/drivers/cb_pcidda.c
@@ -333,9 +333,6 @@ found:
  */
        dev->board_name = thisboard->name;
 
-/*
- * Allocate the subdevice structures.
- */
        if (comedi_alloc_subdevices(dev, 3) < 0)
                return -ENOMEM;
 

diff --git a/drivers/staging/comedi/drivers/cb_pcidio.c b/drivers/staging/comedi/drivers/cb_pcidio.c
index 56c1d09188aafcf506422b023e1b8227ff70bd91..f2fff4f2080bfd1a51a54e5416c957947f8a08f0 100644 (file)
--- a/drivers/staging/comedi/drivers/cb_pcidio.c
+++ b/drivers/staging/comedi/drivers/cb_pcidio.c
@@ -177,10 +177,6 @@ found:
            pci_resource_start(devpriv->pci_dev,
                               pcidio_boards[index].dioregs_badrindex);
 
-/*
- * Allocate the subdevice structures.  alloc_subdevice() is a
- * convenient macro defined in comedidev.h.
- */
        if (comedi_alloc_subdevices(dev, thisboard->n_8255) < 0)
                return -ENOMEM;
 

diff --git a/drivers/staging/comedi/drivers/cb_pcimdas.c b/drivers/staging/comedi/drivers/cb_pcimdas.c
index 6acb3199e6f34f468542a4ec2f7dfcde6a0902fc..0ada8b91b315ebbb53fb21ea9e8d454cbc38e86e 100644 (file)
--- a/drivers/staging/comedi/drivers/cb_pcimdas.c
+++ b/drivers/staging/comedi/drivers/cb_pcimdas.c
@@ -269,10 +269,6 @@ found:
        /* Initialize dev->board_name */
        dev->board_name = thisboard->name;
 
-/*
- * Allocate the subdevice structures.  alloc_subdevice() is a
- * convenient macro defined in comedidev.h.
- */
        if (comedi_alloc_subdevices(dev, 3) < 0)
                return -ENOMEM;
 

diff --git a/drivers/staging/comedi/drivers/cb_pcimdda.c b/drivers/staging/comedi/drivers/cb_pcimdda.c
index abb6008da4dfc27ba41f75bb96a43743f6d090a2..b401aec893487cafc3e7688d20e48f624ccfe49d 100644 (file)
--- a/drivers/staging/comedi/drivers/cb_pcimdda.c
+++ b/drivers/staging/comedi/drivers/cb_pcimdda.c
@@ -236,10 +236,6 @@ static int attach(struct comedi_device *dev, struct comedi_devconfig *it)
  */
        dev->board_name = thisboard->name;
 
-/*
- * Allocate the subdevice structures.  alloc_subdevice() is a
- * convenient macro defined in comedidev.h.
- */
        if (comedi_alloc_subdevices(dev, 2) < 0)
                return -ENOMEM;
 

diff --git a/drivers/staging/comedi/drivers/comedi_bond.c b/drivers/staging/comedi/drivers/comedi_bond.c
index d56eec48e4c81064522eecabd0aa967fa6e1a466..96e5b35f4d7c468451c4c2c8318b4e14224dc788 100644 (file)
--- a/drivers/staging/comedi/drivers/comedi_bond.c
+++ b/drivers/staging/comedi/drivers/comedi_bond.c
@@ -358,10 +358,6 @@ static int bonding_attach(struct comedi_device *dev,
         */
        dev->board_name = devpriv->name;
 
-       /*
-        * Allocate the subdevice structures.  alloc_subdevice() is a
-        * convenient macro defined in comedidev.h.
-        */
        if (comedi_alloc_subdevices(dev, 1) < 0)
                return -ENOMEM;
 

diff --git a/drivers/staging/comedi/drivers/dmm32at.c b/drivers/staging/comedi/drivers/dmm32at.c
index 40d7befec5ea35071fbb9834799f4a5169ea2e66..6b637a2a48c70552ca87daa565ad8c55d2e1b54c 100644 (file)
--- a/drivers/staging/comedi/drivers/dmm32at.c
+++ b/drivers/staging/comedi/drivers/dmm32at.c
@@ -371,10 +371,6 @@ static int dmm32at_attach(struct comedi_device *dev,
        if (alloc_private(dev, sizeof(struct dmm32at_private)) < 0)
                return -ENOMEM;
 
-/*
- * Allocate the subdevice structures.  alloc_subdevice() is a
- * convenient macro defined in comedidev.h.
- */
        if (comedi_alloc_subdevices(dev, 3) < 0)
                return -ENOMEM;
 

diff --git a/drivers/staging/comedi/drivers/dt9812.c b/drivers/staging/comedi/drivers/dt9812.c
index 56af2f28f98d6879f6875877b9e37c856247f63c..678fa502a716795ed35256130aedd2a1adcf760a 100644 (file)
--- a/drivers/staging/comedi/drivers/dt9812.c
+++ b/drivers/staging/comedi/drivers/dt9812.c
@@ -1035,7 +1035,6 @@ static int dt9812_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 
        devpriv->serial = it->options[0];
 
-       /* Allocate subdevices */
        if (comedi_alloc_subdevices(dev, 4) < 0)
                return -ENOMEM;
 

diff --git a/drivers/staging/comedi/drivers/ke_counter.c b/drivers/staging/comedi/drivers/ke_counter.c
index bcb1eb49a1f73b8e59724f353c30ad6e315193a7..7c256f4f32d12a4f2b78e64a32e1ff796c323d5b 100644 (file)
--- a/drivers/staging/comedi/drivers/ke_counter.c
+++ b/drivers/staging/comedi/drivers/ke_counter.c
@@ -189,7 +189,6 @@ found:
        io_base = pci_resource_start(pci_device, 0);
        dev->iobase = io_base;
 
-       /* allocate the subdevice structures */
        error = comedi_alloc_subdevices(dev, 1);
        if (error < 0)
                return error;

diff --git a/drivers/staging/comedi/drivers/me4000.c b/drivers/staging/comedi/drivers/me4000.c
index 39100ddddef815ceefd943e23f6eacadff7580ec..4adb206ebd933618053e811ea7756599a65c10ef 100644 (file)
--- a/drivers/staging/comedi/drivers/me4000.c
+++ b/drivers/staging/comedi/drivers/me4000.c
@@ -2190,11 +2190,6 @@ static int me4000_attach(struct comedi_device *dev, struct comedi_devconfig *it)
        if (result)
                return result;
 
-       /*
-        * Allocate the subdevice structures.  alloc_subdevice() is a
-        * convenient macro defined in comedidev.h.  It relies on
-        * n_subdevices being set correctly.
-        */
        if (comedi_alloc_subdevices(dev, 4) < 0)
                return -ENOMEM;
 

diff --git a/drivers/staging/comedi/drivers/mpc624.c b/drivers/staging/comedi/drivers/mpc624.c
index 48ba6b9f9430b0b331040be1df9d5a76146fd1c6..975033653f0ccf7567b2cf391804d5b14cd43e52 100644 (file)
--- a/drivers/staging/comedi/drivers/mpc624.c
+++ b/drivers/staging/comedi/drivers/mpc624.c
@@ -348,7 +348,6 @@ static int mpc624_attach(struct comedi_device *dev, struct comedi_devconfig *it)
                devpriv->ulConvertionRate = MPC624_SPEED_3_52_kHz;
        }
 
-       /*  Subdevices structures */
        if (comedi_alloc_subdevices(dev, 1) < 0)
                return -ENOMEM;
 

diff --git a/drivers/staging/comedi/drivers/pcmda12.c b/drivers/staging/comedi/drivers/pcmda12.c
index e1b30cc5d733a757f2011c551cc15d3f5adafeae..87faa03819769d0415edc3df25d7b3dca5e11cd7 100644 (file)
--- a/drivers/staging/comedi/drivers/pcmda12.c
+++ b/drivers/staging/comedi/drivers/pcmda12.c
@@ -190,13 +190,6 @@ static int pcmda12_attach(struct comedi_device *dev,
 
        devpriv->simultaneous_xfer_mode = it->options[1];
 
-       /*
-        * Allocate the subdevice structures.  alloc_subdevice() is a
-        * convenient macro defined in comedidev.h.
-        *
-        * Allocate 2 subdevs (32 + 16 DIO lines) or 3 32 DIO subdevs for the
-        * 96-channel version of the board.
-        */
        if (comedi_alloc_subdevices(dev, 1) < 0)
                return -ENOMEM;
 

diff --git a/drivers/staging/comedi/drivers/pcmmio.c b/drivers/staging/comedi/drivers/pcmmio.c
index abaf6c758baf841704dccf6ebf0ed6e8026f6147..31053034b0736533fb8312937f8a4032663ca18a 100644 (file)
--- a/drivers/staging/comedi/drivers/pcmmio.c
+++ b/drivers/staging/comedi/drivers/pcmmio.c
@@ -1071,12 +1071,7 @@ static int pcmmio_attach(struct comedi_device *dev, struct comedi_devconfig *it)
                                dev->minor);
                return -ENOMEM;
        }
-       /*
-        * Allocate the subdevice structures.  alloc_subdevice() is a
-        * convenient macro defined in comedidev.h.
-        *
-        * Allocate 1 AI + 1 AO + 2 DIO subdevs (24 lines per DIO)
-        */
+
        if (comedi_alloc_subdevices(dev, n_subdevs) < 0)
                return -ENOMEM;
 

diff --git a/drivers/staging/comedi/drivers/pcmuio.c b/drivers/staging/comedi/drivers/pcmuio.c
index e4153bd27172660c54582e7a52eb3b4b9a0ae60a..33ab4c63b3dca7a5a0e8c23a81ad926ae1b04337 100644 (file)
--- a/drivers/staging/comedi/drivers/pcmuio.c
+++ b/drivers/staging/comedi/drivers/pcmuio.c
@@ -800,13 +800,7 @@ static int pcmuio_attach(struct comedi_device *dev, struct comedi_devconfig *it)
                dev_warn(dev->hw_dev, "cannot allocate subdevice private data structures\n");
                return -ENOMEM;
        }
-       /*
-        * Allocate the subdevice structures.  alloc_subdevice() is a
-        * convenient macro defined in comedidev.h.
-        *
-        * Allocate 2 subdevs (32 + 16 DIO lines) or 3 32 DIO subdevs for the
-        * 96-channel version of the board.
-        */
+
        if (comedi_alloc_subdevices(dev, n_subdevs) < 0)
                return -ENOMEM;
 

diff --git a/drivers/staging/comedi/drivers/rtd520.c b/drivers/staging/comedi/drivers/rtd520.c
index 7d248a7685b25481b9bb7d410e459691aa16ff01..445333b2413eb96b6c50758f7d60281cfdac0331 100644 (file)
--- a/drivers/staging/comedi/drivers/rtd520.c
+++ b/drivers/staging/comedi/drivers/rtd520.c
@@ -1999,10 +1999,6 @@ static int rtd_attach(struct comedi_device *dev, struct comedi_devconfig *it)
        /* Show board configuration */
        printk(KERN_INFO "%s:", dev->board_name);
 
-       /*
-        * Allocate the subdevice structures.  alloc_subdevice() is a
-        * convenient macro defined in comedidev.h.
-        */
        if (comedi_alloc_subdevices(dev, 4) < 0)
                return -ENOMEM;
 

diff --git a/drivers/staging/comedi/drivers/s526.c b/drivers/staging/comedi/drivers/s526.c
index dbbff70dc0ca9777d28841299cabcf60720812ad..6a30537987c6be903e39bde6d056f103405d0c8e 100644 (file)
--- a/drivers/staging/comedi/drivers/s526.c
+++ b/drivers/staging/comedi/drivers/s526.c
@@ -774,10 +774,6 @@ static int s526_attach(struct comedi_device *dev, struct comedi_devconfig *it)
        if (alloc_private(dev, sizeof(struct s526_private)) < 0)
                return -ENOMEM;
 
-/*
- * Allocate the subdevice structures.  alloc_subdevice() is a
- * convenient macro defined in comedidev.h.
- */
        if (comedi_alloc_subdevices(dev, 4) < 0)
                return -ENOMEM;
 

diff --git a/drivers/staging/comedi/drivers/skel.c b/drivers/staging/comedi/drivers/skel.c
index 16947c8b88037caa5accf815a5fea2dd828a29b7..ca10b1a981532904b0e5721306bcfbfc68eb3cfc 100644 (file)
--- a/drivers/staging/comedi/drivers/skel.c
+++ b/drivers/staging/comedi/drivers/skel.c
@@ -233,10 +233,6 @@ static int skel_attach(struct comedi_device *dev, struct comedi_devconfig *it)
        if (alloc_private(dev, sizeof(struct skel_private)) < 0)
                return -ENOMEM;
 
-/*
- * Allocate the subdevice structures.  alloc_subdevice() is a
- * convenient macro defined in comedidev.h.
- */
        if (comedi_alloc_subdevices(dev, 3) < 0)
                return -ENOMEM;
 

diff --git a/drivers/staging/comedi/drivers/ssv_dnp.c b/drivers/staging/comedi/drivers/ssv_dnp.c
index 5eaef8434e099f48e8eb58740fe839ce208828e9..130e4bd5c640aa39301dbd2bf703c781a91d6a74 100644 (file)
--- a/drivers/staging/comedi/drivers/ssv_dnp.c
+++ b/drivers/staging/comedi/drivers/ssv_dnp.c
@@ -197,9 +197,6 @@ static int dnp_attach(struct comedi_device *dev, struct comedi_devconfig *it)
        if (alloc_private(dev, sizeof(struct dnp_private_data)) < 0)
                return -ENOMEM;
 
-       /* Allocate the subdevice structures. alloc_subdevice() is a         */
-       /* convenient macro defined in comedidev.h.                          */
-
        if (comedi_alloc_subdevices(dev, 1) < 0)
                return -ENOMEM;
 

diff --git a/drivers/staging/comedi/drivers/usbdux.c b/drivers/staging/comedi/drivers/usbdux.c
index 79df200bb6ee4ee80675a0170ba344db738dfc7a..a6cf13459c6193615e673781fc7e533dedb2153a 100644 (file)
--- a/drivers/staging/comedi/drivers/usbdux.c
+++ b/drivers/staging/comedi/drivers/usbdux.c
@@ -2645,7 +2645,6 @@ static int usbdux_attach_common(struct comedi_device *dev,
                n_subdevs = 4;
        }
 
-       /* allocate space for the subdevices */
        ret = comedi_alloc_subdevices(dev, n_subdevs);
        if (ret < 0) {
                up(&udev->sem);

diff --git a/drivers/staging/comedi/drivers/usbduxfast.c b/drivers/staging/comedi/drivers/usbduxfast.c
index 660dd4ee51e0b1991ce4b8ae8f7985080213b1f8..f7d4f56c1688635dffda2b7df0b97debeac834b0 100644 (file)
--- a/drivers/staging/comedi/drivers/usbduxfast.c
+++ b/drivers/staging/comedi/drivers/usbduxfast.c
@@ -1666,7 +1666,6 @@ static int usbduxfast_attach(struct comedi_device *dev,
 
        dev->board_name = BOARDNAME;
 
-       /* allocate space for the subdevices */
        ret = comedi_alloc_subdevices(dev, 1);
        if (ret < 0) {
                up(&(usbduxfastsub[index].sem));

diff --git a/drivers/staging/comedi/drivers/usbduxsigma.c b/drivers/staging/comedi/drivers/usbduxsigma.c
index f37e96c80b91d9a050f3fc6b48b82cc946b52510..f23fad957e5e7cb6503ecbd3801d572188fc712a 100644 (file)
--- a/drivers/staging/comedi/drivers/usbduxsigma.c
+++ b/drivers/staging/comedi/drivers/usbduxsigma.c
@@ -2690,7 +2690,6 @@ static int usbduxsigma_attach(struct comedi_device *dev,
                n_subdevs = 3;
        }
 
-       /* allocate space for the subdevices */
        ret = comedi_alloc_subdevices(dev, n_subdevs);
        if (ret < 0) {
                up(&udev->sem);