From 54be9353682914693074078d203407806f8f3f34 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Fri, 22 Jun 2012 16:26:46 -0700 Subject: [PATCH] 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 Cc: Ian Abbott Cc: Frank Mori Hess Signed-off-by: Greg Kroah-Hartman --- drivers/staging/comedi/drivers/ni_daq_700.c | 5 +---- 1 file changed, 1 insertion(+), 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) -- 2.11.0