[13/15] staging: ft1000-pcmcia: delete local_info_t typedef

[Ondrej Zary]

Delete local_info_t typedef along with the struct as its "link" member was
not used. Use link->priv to store net_device directly.

Signed-off-by: Ondrej Zary <linux@xxxxxxxxxxxxxxxxxxxx>

--- a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_cs.c
+++ b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_cs.c
@@ -93,11 +93,6 @@ static void ft1000_release(struct pcmcia_device *link);
 static void ft1000_detach(struct pcmcia_device *link);
 static int  ft1000_attach(struct pcmcia_device *link);
 
-typedef struct local_info_t {
-	struct pcmcia_device *link;
-	struct net_device *dev;
-} local_info_t;
-
 #define MAX_ASIC_RESET_CNT     10
 #define COR_DEFAULT            0x55
 
@@ -115,20 +110,9 @@ static void ft1000_reset(struct pcmcia_device * link)
 
 static int ft1000_attach(struct pcmcia_device *link)
 {
-
-	local_info_t *local;
-
 	DEBUG(0, "ft1000_cs: ft1000_attach()\n");
 
-	local = kzalloc(sizeof(local_info_t), GFP_KERNEL);
-	if (!local) {
-		return -ENOMEM;
-	}
-	local->link = link;
-
-	link->priv = local;
-	local->dev = NULL;
-
+	link->priv = NULL;
 	link->config_flags |= CONF_ENABLE_IRQ | CONF_AUTO_SET_IO;
 
 	return ft1000_config(link);
@@ -146,7 +130,7 @@ static int ft1000_attach(struct pcmcia_device *link)
 
 static void ft1000_detach(struct pcmcia_device *link)
 {
-	struct net_device *dev = ((local_info_t *) link->priv)->dev;
+	struct net_device *dev = link->priv;
 
 	DEBUG(0, "ft1000_cs: ft1000_detach(0x%p)\n", link);
 
@@ -161,7 +145,6 @@ static void ft1000_detach(struct pcmcia_device *link)
 
 	pcmcia_disable_device(link);
 
-	/* This points to the parent local_info_t struct */
 	free_netdev(dev);
 
 }				/* ft1000_detach */
@@ -205,9 +188,8 @@ static int ft1000_config(struct pcmcia_device *link)
 		goto failed;
 	}
 
-	((local_info_t *) link->priv)->dev = init_ft1000_card(link,
-								&ft1000_reset);
-	if (((local_info_t *) link->priv)->dev == NULL) {
+	link->priv = init_ft1000_card(link, &ft1000_reset);
+	if (link->priv == NULL) {
 		printk(KERN_INFO "ft1000: Could not register as network device\n");
 		goto failed;
 	}
@@ -244,7 +226,6 @@ static void ft1000_release(struct pcmcia_device * link)
 	   In a normal driver, additional code may be needed to release
 	   other kernel data structures associated with this device.
 	 */
-	kfree((local_info_t *) link->priv);
 	/* Don't bother checking to see if these succeed or not */
 
 	 pcmcia_disable_device(link);
@@ -264,7 +245,7 @@ static void ft1000_release(struct pcmcia_device * link)
 
 static int ft1000_suspend(struct pcmcia_device *link)
 {
-	struct net_device *dev = ((local_info_t *) link->priv)->dev;
+	struct net_device *dev = link->priv;
 
 	if (link->open)
 		netif_device_detach(dev);

-- 
Ondrej Zary
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/