From eea6838b1206b0ac90110f1a6f58e101aa496e99 Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hartleys@visionengravers.com>
Date: Tue, 12 Jun 2012 11:59:15 -0700
Subject: [PATCH] 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>
---
drivers/staging/comedi/drivers/addi-data/addi_common.c | 1 -
drivers/staging/comedi/drivers/addi-data/hwdrv_APCI1710.c | 1 -
drivers/staging/comedi/drivers/adq12b.c | 4 ----
drivers/staging/comedi/drivers/amplc_pci224.c | 1 -
drivers/staging/comedi/drivers/amplc_pci230.c | 5 +----
drivers/staging/comedi/drivers/c6xdigio.c | 1 -
drivers/staging/comedi/drivers/cb_pcidas.c | 3 ---
drivers/staging/comedi/drivers/cb_pcidda.c | 3 ---
drivers/staging/comedi/drivers/cb_pcidio.c | 4 ----
drivers/staging/comedi/drivers/cb_pcimdas.c | 4 ----
drivers/staging/comedi/drivers/cb_pcimdda.c | 4 ----
drivers/staging/comedi/drivers/comedi_bond.c | 4 ----
drivers/staging/comedi/drivers/dmm32at.c | 4 ----
drivers/staging/comedi/drivers/dt9812.c | 1 -
drivers/staging/comedi/drivers/ke_counter.c | 1 -
drivers/staging/comedi/drivers/me4000.c | 5 -----
drivers/staging/comedi/drivers/mpc624.c | 1 -
drivers/staging/comedi/drivers/pcmda12.c | 7 -------
drivers/staging/comedi/drivers/pcmmio.c | 7 +------
drivers/staging/comedi/drivers/pcmuio.c | 8 +-------
drivers/staging/comedi/drivers/rtd520.c | 4 ----
drivers/staging/comedi/drivers/s526.c | 4 ----
drivers/staging/comedi/drivers/skel.c | 4 ----
drivers/staging/comedi/drivers/ssv_dnp.c | 3 ---
drivers/staging/comedi/drivers/usbdux.c | 1 -
drivers/staging/comedi/drivers/usbduxfast.c | 1 -
drivers/staging/comedi/drivers/usbduxsigma.c | 1 -
27 files changed, 3 insertions(+), 84 deletions(-)
diff --git a/drivers/staging/comedi/drivers/addi-data/addi_common.c b/drivers/staging/comedi/drivers/addi-data/addi_common.c
index 274990a7cd3f9..46c590b1ad960 100644
--- 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 9632ca182d253..aa390b01475bc 100644
--- 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 ca8892e83db12..afc6815bcc362 100644
--- 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 c64e32821c4d5..1392406d99f08 100644
--- 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 e6598cafb39a2..52f3cb8fb2d1b 100644
--- 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 72b000fad6092..5fa344b269fde 100644
--- 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 435f3aaedf88f..e1bd99a950e43 100644
--- 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 4ab3584365e2d..fedaf55af03db 100644
--- 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 56c1d09188aaf..f2fff4f2080bf 100644
--- 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 6acb3199e6f34..0ada8b91b315e 100644
--- 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 abb6008da4dfc..b401aec893487 100644
--- 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 d56eec48e4c81..96e5b35f4d7c4 100644
--- 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 40d7befec5ea3..6b637a2a48c70 100644
--- 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 56af2f28f98d6..678fa502a7167 100644
--- 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 bcb1eb49a1f73..7c256f4f32d12 100644
--- 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 39100ddddef81..4adb206ebd933 100644
--- 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 48ba6b9f9430b..975033653f0cc 100644
--- 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 e1b30cc5d733a..87faa03819769 100644
--- 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 abaf6c758baf8..31053034b0736 100644
--- 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 e4153bd271726..33ab4c63b3dca 100644
--- 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 7d248a7685b25..445333b2413eb 100644
--- 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 dbbff70dc0ca9..6a30537987c6b 100644
--- 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 16947c8b88037..ca10b1a981532 100644
--- 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 5eaef8434e099..130e4bd5c640a 100644
--- 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 79df200bb6ee4..a6cf13459c619 100644
--- 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 660dd4ee51e0b..f7d4f56c16886 100644
--- 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 f37e96c80b91d..f23fad957e5e7 100644
--- 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);
--
2.30.2