[<prev] [next>] [day] [month] [year] [list]
Message-ID: <201206221638.46382.hartleys@visionengravers.com>
Date: Fri, 22 Jun 2012 16:38:45 -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 29/31] staging: comedi: ni_daq_700: remove unneeded pcmcia private data
The pcmcia device-specific data is not longer needed by this
driver. Remove it.
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 | 17 -----------------
1 file changed, 17 deletions(-)
diff --git a/drivers/staging/comedi/drivers/ni_daq_700.c b/drivers/staging/comedi/drivers/ni_daq_700.c
index b02ed37..f8465a2 100644
--- a/drivers/staging/comedi/drivers/ni_daq_700.c
+++ b/drivers/staging/comedi/drivers/ni_daq_700.c
@@ -210,24 +210,10 @@ failed:
}
-struct local_info_t {
- struct pcmcia_device *link;
- struct bus_operations *bus;
-};
-
static int dio700_cs_attach(struct pcmcia_device *link)
{
- struct local_info_t *local;
-
dev_dbg(&link->dev, "%s\n", __func__);
- /* Allocate space for private device-specific data */
- local = kzalloc(sizeof(struct local_info_t), GFP_KERNEL);
- if (!local)
- return -ENOMEM;
- local->link = link;
- link->priv = local;
-
pcmcia_cur_dev = link;
dio700_config(link);
@@ -238,9 +224,6 @@ static int dio700_cs_attach(struct pcmcia_device *link)
static void dio700_cs_detach(struct pcmcia_device *link)
{
dio700_release(link);
-
- /* This points to the parent struct local_info_t struct */
- kfree(link->priv);
}
static int dio700_cs_suspend(struct pcmcia_device *link)
--
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