Commit 34cfcf9a authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman

staging: comedi: 8255: remove have_irg and refactor subdev_8255_init_irq

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: 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 cc31b1be
...@@ -100,7 +100,6 @@ I/O port base address can be found in the output of 'lspci -v'. ...@@ -100,7 +100,6 @@ I/O port base address can be found in the output of 'lspci -v'.
struct subdev_8255_private { struct subdev_8255_private {
unsigned long iobase; unsigned long iobase;
int (*io) (int, int, int, unsigned long); int (*io) (int, int, int, unsigned long);
int have_irq;
}; };
void subdev_8255_interrupt(struct comedi_device *dev, void subdev_8255_interrupt(struct comedi_device *dev,
...@@ -340,19 +339,15 @@ int subdev_8255_init_irq(struct comedi_device *dev, struct comedi_subdevice *s, ...@@ -340,19 +339,15 @@ int subdev_8255_init_irq(struct comedi_device *dev, struct comedi_subdevice *s,
int (*io) (int, int, int, unsigned long), int (*io) (int, int, int, unsigned long),
unsigned long iobase) unsigned long iobase)
{ {
struct subdev_8255_private *spriv;
int ret; int ret;
ret = subdev_8255_init(dev, s, io, iobase); ret = subdev_8255_init(dev, s, io, iobase);
if (ret < 0) if (ret < 0)
return ret; return ret;
spriv = s->private;
spriv->have_irq = 1;
s->do_cmdtest = subdev_8255_cmdtest; s->do_cmdtest = subdev_8255_cmdtest;
s->do_cmd = subdev_8255_cmd; s->do_cmd = subdev_8255_cmd;
s->cancel = subdev_8255_cancel; s->cancel = subdev_8255_cancel;
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment