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

Komuro komurojun-mbn at nifty.com
Sun Oct 25 04:51:57 EDT 2009



Hi,
 

Please don't remove the line below in 3c589_cs.c
    phys_addr = (__be16 *)dev->dev_addr;


+++ b/drivers/net/pcmcia/3c589_cs.c
@@ -256,22 +256,15 @@ 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;
+    __be16 *phys_addr = NULL;
     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;         <<<< Here!
-    tuple.Attributes = 0;
-    tuple.TupleData = (cisdata_t *)buf;
-    tuple.TupleDataMax = sizeof(buf);
-    tuple.TupleOffset = 0;
-    tuple.Attributes = TUPLE_RETURN_COMMON;

Best Regards
Komuro




More information about the linux-pcmcia mailing list