Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0e4039f3 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman
Browse files

staging: comedi: remove the comed_alloc_subdevices "allocation failed" messages 



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

Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbot <abbott@mev.co.uk>
Cc: Frank Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent fba1d0fa

drivers/staging/comedi/drivers/8255.c

+1 −5
Original line number Diff line number Diff line
@@ -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);

drivers/staging/comedi/drivers/adv_pci1723.c

+1 −3
Original line number Diff line number Diff line
@@ -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;

drivers/staging/comedi/drivers/amplc_dio200.c

+1 −3
Original line number Diff line number Diff line
@@ -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]) {

drivers/staging/comedi/drivers/amplc_pc236.c

+1 −3
Original line number Diff line number Diff line
@@ -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) */

drivers/staging/comedi/drivers/amplc_pc263.c

+1 −3
Original line number Diff line number Diff line
@@ -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 */