]> git.karo-electronics.de Git - linux-beck.git/commitdiff
staging: comedi: ni_daq_700: remove unused private data variable
authorH Hartley Sweeten <hartleys@visionengravers.com>
Fri, 22 Jun 2012 23:26:46 +0000 (16:26 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 23 Jun 2012 03:55:07 +0000 (20:55 -0700)
The 'have_irq' variable is not needed since this driver doesn't
use interrupts. Remove it.

The kfree(s->private) needs to remain to free the memory allocated
in subdev_700_init().

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>
drivers/staging/comedi/drivers/ni_daq_700.c

index 2f849342d74831992435abe04d7617b4c5bec3d1..525f076c9a6d642e050f43d6a6435189d1adc291 100644 (file)
@@ -69,7 +69,6 @@ struct dio700_board {
 struct subdev_700_struct {
        unsigned long cb_arg;
        int (*cb_func) (int, int, int, unsigned long);
-       int have_irq;
 };
 
 #define CALLBACK_ARG   (((struct subdev_700_struct *)s->private)->cb_arg)
@@ -166,9 +165,7 @@ static void subdev_700_cleanup(struct comedi_device *dev,
                               struct comedi_subdevice *s)
 {
        if (s->private)
-               if (subdevpriv->have_irq)
-
-                       kfree(s->private);
+               kfree(s->private);
 }
 
 static int dio700_attach(struct comedi_device *dev, struct comedi_devconfig *it)