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

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

staging: comedi: me4000: refactor request_irq() during attach 



Do the request_irq() before setting up the subdevices. This removes an
indent level and makes the code a bit cleaner.

Also, remove the dev_warn() noise about the irq.

Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b3403f2e

drivers/staging/comedi/drivers/me4000.c

+13 −16
Original line number Diff line number Diff line
@@ -1505,6 +1505,13 @@ static int me4000_auto_attach(struct comedi_device *dev, 


	me4000_reset(dev);



	if (pcidev->irq > 0) {

		result = request_irq(pcidev->irq, me4000_ai_isr, IRQF_SHARED,

				  dev->board_name, dev);

		if (result == 0)

			dev->irq = pcidev->irq;

	}



	result = comedi_alloc_subdevices(dev, 4);

	if (result)

		return result;
@@ -1525,22 +1532,12 @@ static int me4000_auto_attach(struct comedi_device *dev, 
		s->range_table = &me4000_ai_range;

		s->insn_read = me4000_ai_insn_read;



		if (pcidev->irq > 0) {

			if (request_irq(pcidev->irq, me4000_ai_isr,

					IRQF_SHARED, dev->board_name, dev)) {

				dev_warn(dev->class_dev,

					"request_irq failed\n");

			} else {

		if (dev->irq) {

			dev->read_subdev = s;

			s->subdev_flags |= SDF_CMD_READ;

			s->cancel = me4000_ai_cancel;

			s->do_cmdtest = me4000_ai_do_cmd_test;

			s->do_cmd = me4000_ai_do_cmd;



				dev->irq = pcidev->irq;

			}

		} else {

			dev_warn(dev->class_dev, "No interrupt available\n");

		}

	} else {

		s->type = COMEDI_SUBD_UNUSED;