[PATCH 6/9] pcmcia: convert net pcmcia drivers to use new CIS helpers

Dominik Brodowski linux at dominikbrodowski.net
Sun Oct 25 07:05:08 EDT 2009


Ooops. Thanks for noticing this. Fixed (see snippet below).

Thanks!
	Dominik

From: Dominik Brodowski <linux at dominikbrodowski.net>
Date: Sun, 18 Oct 2009 23:54:24 +0200
Subject: [PATCH 07/10] pcmcia: convert net pcmcia drivers to use new CIS helpers

Use the new CIS helpers in net pcmcia drivers, which allows for
a few code cleanups.

This revision does not remove the phys_addr assignment in
3c589_cs.c -- a bug noted by Komuro <komurojun-mbn at nifty.com>

CC: David S. Miller <davem at davemloft.net>
CC: netdev at vger.kernel.org
Signed-off-by: Dominik Brodowski <linux at dominikbrodowski.net>

...

diff --git a/drivers/net/pcmcia/3c589_cs.c b/drivers/net/pcmcia/3c589_cs.c
index 569fb06..fc6123e 100644
--- a/drivers/net/pcmcia/3c589_cs.c
+++ b/drivers/net/pcmcia/3c589_cs.c
@@ -256,22 +256,16 @@ static int tc589_config(struct pcmcia_device *link)
 {
     struct net_device *dev = link->priv;
     struct el3_private *lp = netdev_priv(dev);
-    tuple_t tuple;
-    __le16 buf[32];
     __be16 *phys_addr;
     int last_fn, last_ret, i, j, multi = 0, fifo;
     unsigned int ioaddr;
     char *ram_split[] = {"5:3", "3:1", "1:1", "3:5"};
+    u8 *buf;
+    size_t len;
     
     DEBUG(0, "3c589_config(0x%p)\n", link);
 
     phys_addr = (__be16 *)dev->dev_addr;
-    tuple.Attributes = 0;
-    tuple.TupleData = (cisdata_t *)buf;
-    tuple.TupleDataMax = sizeof(buf);
-    tuple.TupleOffset = 0;
-    tuple.Attributes = TUPLE_RETURN_COMMON;
-
     /* Is this a 3c562? */
     if (link->manf_id != MANFID_3COM)
 	    printk(KERN_INFO "3c589_cs: hmmm, is this really a "



More information about the linux-pcmcia mailing list