From: H Hartley Sweeten <hartleys@visionengravers.com>
Date: Fri, 22 Jun 2012 23:38:45 +0000 (-0700)
Subject: staging: comedi: ni_daq_700: remove unneeded pcmcia private data
X-Git-Tag: next-20120724~21^2~608
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=d2d2a6f27564d101192610abaae94177471c755b;p=karo-tx-linux.git

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@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>
---

diff --git a/drivers/staging/comedi/drivers/ni_daq_700.c b/drivers/staging/comedi/drivers/ni_daq_700.c
index b02ed37b55b4..f8465a2bfc87 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)