Skip to content

Commit

Permalink
staging: comedi: 8255: remove have_irg and refactor subdev_8255_init_irq
Browse files Browse the repository at this point in the history
The have_irq variable in the 8255 private data is not used by the driver,
remove it.  This removes the need to access the private data in the
subdev_8255_init_irq function.

Also, add a bit of whitespace to improve the readability.

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>
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Jun 14, 2012
1 parent cc31b1b commit 34cfcf9
Showing 1 changed file with 3 additions and 8 deletions.
11 changes: 3 additions & 8 deletions drivers/staging/comedi/drivers/8255.c
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,6 @@ I/O port base address can be found in the output of 'lspci -v'.
struct subdev_8255_private {
unsigned long iobase;
int (*io) (int, int, int, unsigned long);
int have_irq;
};

void subdev_8255_interrupt(struct comedi_device *dev,
Expand Down Expand Up @@ -340,19 +339,15 @@ int subdev_8255_init_irq(struct comedi_device *dev, struct comedi_subdevice *s,
int (*io) (int, int, int, unsigned long),
unsigned long iobase)
{
struct subdev_8255_private *spriv;
int ret;

ret = subdev_8255_init(dev, s, io, iobase);
if (ret < 0)
return ret;
spriv = s->private;

spriv->have_irq = 1;

s->do_cmdtest = subdev_8255_cmdtest;
s->do_cmd = subdev_8255_cmd;
s->cancel = subdev_8255_cancel;
s->do_cmdtest = subdev_8255_cmdtest;
s->do_cmd = subdev_8255_cmd;
s->cancel = subdev_8255_cancel;

return 0;
}
Expand Down

0 comments on commit 34cfcf9

Please sign in to comment.