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

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

staging: comedi: pcmad: 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 2028bdc4

drivers/staging/comedi/drivers/pcmad.c

+1 −3
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ static int pcmad_attach(struct comedi_device *dev, struct comedi_devconfig *it) 


	iobase = it->options[0];

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

	if (!request_region(iobase, PCMAD_SIZE, "pcmad")) {

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

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

		return -EIO;

	}
@@ -127,8 +127,6 @@ static int pcmad_attach(struct comedi_device *dev, struct comedi_devconfig *it) 
		return -ENOMEM;

	dev->private = devpriv;



	dev->board_name = board->name;



	s = &dev->subdevices[0];

	s->type = COMEDI_SUBD_AI;

	s->subdev_flags = SDF_READABLE | AREF_GROUND;