Skip to content

Commit

Permalink
staging: comedi: remove the comed_alloc_subdevices "allocation failed…
Browse files Browse the repository at this point in the history 
…" messages

Remove all the "allocation failed" debug messages that are displayed
when the comedi_alloc_subdevices call fails.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbot <abbott@mev.co.uk>
Cc: Frank Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Jun 12, 2012
1 parent fba1d0f commit 0e4039f
Show file tree
Hide file tree
Showing 14 changed files with 10 additions and 41 deletions.
6 changes: 1 addition & 5 deletions drivers/staging/comedi/drivers/8255.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -389,12 +389,8 @@ static int dev_8255_attach(struct comedi_device *dev,
}

ret = comedi_alloc_subdevices(dev, i);
if (ret < 0) {
/* FIXME this printk call should give a proper message, the
* below line just maintains previous functionality */
printk("comedi%d: 8255:", dev->minor);
if (ret < 0)
return ret;
}

printk(KERN_INFO "comedi%d: 8255:", dev->minor);

Expand Down
4 changes: 1 addition & 3 deletions drivers/staging/comedi/drivers/adv_pci1723.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -366,10 +366,8 @@ static int pci1723_attach(struct comedi_device *dev,
n_subdevices++;

ret = comedi_alloc_subdevices(dev, n_subdevices);
if (ret < 0) {
printk(" - Allocation failed!\n");
if (ret < 0)
return ret;
}

pci1723_reset(dev);
subdev = 0;
Expand Down
4 changes: 1 addition & 3 deletions drivers/staging/comedi/drivers/amplc_dio200.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1274,10 +1274,8 @@ static int dio200_common_attach(struct comedi_device *dev, unsigned long iobase,
dev->iobase = iobase;
dev->board_name = thisboard->name;
ret = comedi_alloc_subdevices(dev, layout->n_subdevs);
if (ret < 0) {
dev_err(dev->class_dev, "error! out of memory!\n");
if (ret < 0)
return ret;
}
for (n = 0; n < dev->n_subdevices; n++) {
s = &dev->subdevices[n];
switch (layout->sdtype[n]) {
Expand Down
4 changes: 1 addition & 3 deletions drivers/staging/comedi/drivers/amplc_pc236.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -456,10 +456,8 @@ static int pc236_common_attach(struct comedi_device *dev, unsigned long iobase,
dev->iobase = iobase;

ret = comedi_alloc_subdevices(dev, 2);
if (ret < 0) {
dev_err(dev->class_dev, "error! out of memory!\n");
if (ret < 0)
return ret;
}

s = dev->subdevices + 0;
/* digital i/o subdevice (8255) */
Expand Down
4 changes: 1 addition & 3 deletions drivers/staging/comedi/drivers/amplc_pc263.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -228,10 +228,8 @@ static int pc263_common_attach(struct comedi_device *dev, unsigned long iobase)
dev->iobase = iobase;

ret = comedi_alloc_subdevices(dev, 1);
if (ret < 0) {
dev_err(dev->class_dev, "error! out of memory!\n");
if (ret < 0)
return ret;
}

s = dev->subdevices + 0;
/* digital output subdevice */
Expand Down
4 changes: 1 addition & 3 deletions drivers/staging/comedi/drivers/amplc_pci224.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1381,10 +1381,8 @@ static int pci224_attach_common(struct comedi_device *dev,

/* Allocate subdevices. There is only one! */
ret = comedi_alloc_subdevices(dev, 1);
if (ret < 0) {
dev_err(dev->class_dev, "error! out of memory!\n");
if (ret < 0)
return ret;
}

s = dev->subdevices + 0;
/* Analog output subdevice. */
Expand Down
2 changes: 0 additions & 2 deletions drivers/staging/comedi/drivers/dyna_pci10xx.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -330,8 +330,6 @@ static int dyna_pci10xx_attach(struct comedi_device *dev,
devpriv->BADR5 = pci_resource_start(pcidev, 5);

if (comedi_alloc_subdevices(dev, 4) < 0) {
printk(KERN_ERR "comedi: dyna_pci10xx: "
"failed allocating subdevices\n");
mutex_unlock(&start_stop_sem);
return -ENOMEM;
}
Expand Down
4 changes: 1 addition & 3 deletions drivers/staging/comedi/drivers/pcmda12.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -197,10 +197,8 @@ static int pcmda12_attach(struct comedi_device *dev,
* 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) {
printk(KERN_ERR "cannot allocate subdevice data structures\n");
if (comedi_alloc_subdevices(dev, 1) < 0)
return -ENOMEM;
}

s = dev->subdevices;
s->private = NULL;
Expand Down
5 changes: 1 addition & 4 deletions drivers/staging/comedi/drivers/pcmmio.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1077,11 +1077,8 @@ static int pcmmio_attach(struct comedi_device *dev, struct comedi_devconfig *it)
*
* Allocate 1 AI + 1 AO + 2 DIO subdevs (24 lines per DIO)
*/
if (comedi_alloc_subdevices(dev, n_subdevs) < 0) {
printk(KERN_ERR "comedi%d: cannot allocate subdevice data structures\n",
dev->minor);
if (comedi_alloc_subdevices(dev, n_subdevs) < 0)
return -ENOMEM;
}

/* First, AI */
sdev_no = 0;
Expand Down
4 changes: 1 addition & 3 deletions drivers/staging/comedi/drivers/pcmuio.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -807,10 +807,8 @@ static int pcmuio_attach(struct comedi_device *dev, struct comedi_devconfig *it)
* 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) {
dev_dbg(dev->hw_dev, "cannot allocate subdevice data structures\n");
if (comedi_alloc_subdevices(dev, n_subdevs) < 0)
return -ENOMEM;
}

port = 0;
asic = 0;
Expand Down
4 changes: 1 addition & 3 deletions drivers/staging/comedi/drivers/unioxx5.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -468,10 +468,8 @@ static int unioxx5_attach(struct comedi_device *dev,
return -1;
}

if (comedi_alloc_subdevices(dev, n_subd) < 0) {
printk(KERN_ERR "out of memory\n");
if (comedi_alloc_subdevices(dev, n_subd) < 0)
return -ENOMEM;
}

/* initializing each of for same subdevices */
for (i = 0; i < n_subd; i++, iobase += UNIOXX5_SUBDEV_ODDS) {
Expand Down
2 changes: 0 additions & 2 deletions drivers/staging/comedi/drivers/usbdux.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2648,8 +2648,6 @@ static int usbdux_attach_common(struct comedi_device *dev,
/* allocate space for the subdevices */
ret = comedi_alloc_subdevices(dev, n_subdevs);
if (ret < 0) {
dev_err(&udev->interface->dev,
"comedi%d: error alloc space for subdev\n", dev->minor);
up(&udev->sem);
return ret;
}
Expand Down
2 changes: 0 additions & 2 deletions drivers/staging/comedi/drivers/usbduxfast.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1669,8 +1669,6 @@ static int usbduxfast_attach(struct comedi_device *dev,
/* allocate space for the subdevices */
ret = comedi_alloc_subdevices(dev, 1);
if (ret < 0) {
printk(KERN_ERR "comedi%d: usbduxfast: error alloc space for "
"subdev\n", dev->minor);
up(&(usbduxfastsub[index].sem));
up(&start_stop_sem);
return ret;
Expand Down
2 changes: 0 additions & 2 deletions drivers/staging/comedi/drivers/usbduxsigma.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2693,8 +2693,6 @@ static int usbduxsigma_attach(struct comedi_device *dev,
/* allocate space for the subdevices */
ret = comedi_alloc_subdevices(dev, n_subdevs);
if (ret < 0) {
dev_err(&udev->interface->dev,
"comedi%d: no space for subdev\n", dev->minor);
up(&udev->sem);
up(&start_stop_sem);
return ret;
Expand Down

0 comments on commit 0e4039f

Please sign in to comment.