diff options
| author | H Hartley Sweeten <hartleys@visionengravers.com> | 2012-06-22 16:26:46 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-06-22 20:55:07 -0700 |
| commit | 54be9353682914693074078d203407806f8f3f34 (patch) | |
| tree | 3bc46cea37130f86710792c767bc699a1dd4674e /drivers/staging/comedi/drivers/ni_daq_700.c | |
| parent | 109d5d54e0e5d93d1fcc4acb186981459d152977 (diff) | |
staging: comedi: ni_daq_700: remove unused private data variable
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>
Diffstat (limited to 'drivers/staging/comedi/drivers/ni_daq_700.c')
| -rw-r--r-- | drivers/staging/comedi/drivers/ni_daq_700.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/staging/comedi/drivers/ni_daq_700.c b/drivers/staging/comedi/drivers/ni_daq_700.c index 2f849342d748..525f076c9a6d 100644 --- a/drivers/staging/comedi/drivers/ni_daq_700.c +++ b/drivers/staging/comedi/drivers/ni_daq_700.c @@ -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) |