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

staging: comedi: pcl711: cleanup dev->board_name usage 



This legacy driver does no additional probing so the dev->board_name
will already be properly initialized by the comedi core before calling
the (*attach) function.

Remove the unnecessary initialization of dev->board_name and use it
when requesting the resources instead of the open-coded strings.

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

drivers/staging/comedi/drivers/pcl711.c

+3 −6
Original line number Diff line number Diff line
@@ -459,16 +459,12 @@ static int pcl711_attach(struct comedi_device *dev, struct comedi_devconfig *it) 


	iobase = it->options[0];

	printk(KERN_INFO "comedi%d: pcl711: 0x%04lx ", dev->minor, iobase);

	if (!request_region(iobase, PCL711_SIZE, "pcl711")) {

	if (!request_region(iobase, PCL711_SIZE, dev->board_name)) {

		printk("I/O port conflict\n");

		return -EIO;

	}

	dev->iobase = iobase;



	/* there should be a sanity check here */



	dev->board_name = board->name;



	/* grab our IRQ */

	irq = it->options[1];

	if (irq > board->maxirq) {
@@ -476,7 +472,8 @@ static int pcl711_attach(struct comedi_device *dev, struct comedi_devconfig *it) 
		return -EINVAL;

	}

	if (irq) {

		if (request_irq(irq, pcl711_interrupt, 0, "pcl711", dev)) {

		if (request_irq(irq, pcl711_interrupt, 0, dev->board_name,

			        dev)) {

			printk(KERN_ERR "unable to allocate irq %u\n", irq);

			return -EINVAL;

		} else {