kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

staging: comedi: ni_daq_700: remove the CALLBACK_* code

Browse source 
This driver was originally copied from the 8255 driver. The 8255
uses a callback function to handle the io operations to the device.
In this driver, the callback adds unneeded complexity.

The CALLBACK_ARG for this driver is always 'dev->iobase' and the
CALLBACK_FUNC is always 'subdev_700_cb'.

The callback function is also overly complex for this driver.
It takes a 'dir' parameter to determine if the io is a write or
read, a 'port' parameter that is not used, a 'data' parameter
that is only used for writes, and an 'arg' which is the iobase
of the device.

Unwind all of it and just put the outb()/inb() call in the code
where needed.

This allows getting rid of the private data completely. Refactor
the code based on it's removal.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Frank Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
H Hartley Sweeten 2012-06-22 16:28:33 -07:00 committed by Greg Kroah-Hartman
parent 54be935368
commit 1de0222535
1 changed files with 2 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
drivers/staging/comedi/drivers/ni_daq_700.c
View file

@ -66,28 +66,6 @@ struct dio700_board {
#define DIO_W 0x04
#define DIO_R 0x05
struct subdev_700_struct {
unsigned long cb_arg;
int (*cb_func) (int, int, int, unsigned long);
};
#define CALLBACK_ARG (((struct subdev_700_struct *)s->private)->cb_arg)
#define CALLBACK_FUNC (((struct subdev_700_struct *)s->private)->cb_func)
#define subdevpriv ((struct subdev_700_struct *)s->private)
static int subdev_700_cb(int dir, int port, int data, unsigned long arg)
{
/* port is always A for output and B for input (8255 emu) */
unsigned long iobase = arg;
if (dir) {
outb(data, iobase + DIO_W);
return 0;
} else {
return inb(iobase + DIO_R);
}
}
static int subdev_700_insn(struct comedi_device *dev,
struct comedi_subdevice *s, struct comedi_insn *insn,
unsigned int *data)
@ -97,12 +75,11 @@ static int subdev_700_insn(struct comedi_device *dev,
s->state |= (data[0] & data[1]);
if (data[0] & 0xff)
CALLBACK_FUNC(1, _700_DATA, s->state & 0xff,
CALLBACK_ARG);
outb(s->state & 0xff, dev->iobase + DIO_W);
}
data[1] = s->state & 0xff;
data[1] |= CALLBACK_FUNC(0, _700_DATA, 0, CALLBACK_ARG) << 8;
data[1] |= inb(dev->iobase + DIO_R);
return insn->n;
}
@ -142,16 +119,6 @@ static int subdev_700_init(struct comedi_device *dev,
s->range_table = &range_digital;
s->maxdata = 1;
s->private = kmalloc(sizeof(struct subdev_700_struct), GFP_KERNEL);
if (!s->private)
return -ENOMEM;
CALLBACK_ARG = arg;
if (cb == NULL)
CALLBACK_FUNC = subdev_700_cb;
else
CALLBACK_FUNC = cb;
s->insn_bits = subdev_700_insn;
s->insn_config = subdev_700_insn_config;
@ -161,13 +128,6 @@ static int subdev_700_init(struct comedi_device *dev,
return 0;
}
static void subdev_700_cleanup(struct comedi_device *dev,
struct comedi_subdevice *s)
{
if (s->private)
kfree(s->private);
}
static int dio700_attach(struct comedi_device *dev, struct comedi_devconfig *it)
{
const struct dio700_board *thisboard = comedi_board(dev);
@ -224,8 +184,6 @@ static int dio700_attach(struct comedi_device *dev, struct comedi_devconfig *it)
static void dio700_detach(struct comedi_device *dev)
{
if (dev->subdevices)
subdev_700_cleanup(dev, dev->subdevices + 0);
if (dev->irq)
free_irq(dev->irq, dev);
};