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 <[email protected]>
Cc: Ian Abbott <[email protected]>
Cc: Frank Mori Hess <[email protected]>
Cc: Greg Kroah-Hartman <[email protected]>
---
drivers/staging/comedi/drivers/8255.c | 11 +++--------
1 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/drivers/staging/comedi/drivers/8255.c b/drivers/staging/comedi/drivers/8255.c
index 52b9817..da86a04 100644
--- a/drivers/staging/comedi/drivers/8255.c
+++ b/drivers/staging/comedi/drivers/8255.c
@@ -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,
@@ -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;
}
--
1.7.7