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

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

staging: comedi: ni_daq_700: Remove bustype variable from the boardinfo 



This driver is only used for pcmcia type devices. There is no need for
the 'bustype' check. Remove the variable from the boardinfo and refactor
the code based on it's removal.

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

drivers/staging/comedi/drivers/ni_daq_700.c

+6 −21
Original line number Diff line number Diff line
@@ -55,21 +55,16 @@ static struct pcmcia_device *pcmcia_cur_dev; 


#define DIO700_SIZE 8		/*  size of io region used by board */



enum dio700_bustype { pcmcia_bustype };



struct dio700_board {

	const char *name;

	enum dio700_bustype bustype;	/*  PCMCIA */

};



static const struct dio700_board dio700_boards[] = {

	{

	 .name = "daqcard-700",

	 .bustype = pcmcia_bustype,

	 },

	{

	 .name = "ni_daq_700",

	 .bustype = pcmcia_bustype,

	 },

};
@@ -200,9 +195,6 @@ static int dio700_attach(struct comedi_device *dev, struct comedi_devconfig *it) 
	struct pcmcia_device *link;

	int ret;



	/*  get base address, irq etc. based on bustype */

	switch (thisboard->bustype) {

	case pcmcia_bustype:

	link = pcmcia_cur_dev;	/* XXX hack */

	if (!link)

		return -EIO;
@@ -210,12 +202,7 @@ static int dio700_attach(struct comedi_device *dev, struct comedi_devconfig *it) 
#ifdef incomplete

	irq = link->irq;

#endif

		break;

	default:

		printk(KERN_ERR "bug! couldn't determine board type\n");

		return -EINVAL;

		break;

	}



	printk(KERN_ERR "comedi%d: ni_daq_700: %s, io 0x%lx", dev->minor,

	       thisboard->name, iobase);

#ifdef incomplete
@@ -255,8 +242,6 @@ static void dio700_detach(struct comedi_device *dev) 
{

	if (dev->subdevices)

		subdev_700_cleanup(dev, dev->subdevices + 0);

	if (thisboard->bustype != pcmcia_bustype && dev->iobase)

		release_region(dev->iobase, DIO700_SIZE);

	if (dev->irq)

		free_irq(dev->irq, dev);

};