[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <201206221626.47010.hartleys@visionengravers.com>
Date: Fri, 22 Jun 2012 16:26:46 -0700
From: H Hartley Sweeten <hartleys@...ionengravers.com>
To: Linux Kernel <linux-kernel@...r.kernel.org>
CC: <devel@...verdev.osuosl.org>, <abbotti@....co.uk>,
<fmhess@...rs.sourceforge.net>, <gregkh@...uxfoundation.org>
Subject: [PATCH 17/31] 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@...ionengravers.com>
Cc: Ian Abbott <abbotti@....co.uk>
Cc: Frank Mori Hess <fmhess@...rs.sourceforge.net>
Cc: Greg Kroah-hartman <gregkh@...uxfoundation.org>
---
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 2f84934..525f076 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)
--
1.7.11
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists