aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/pcmcia/smc91c92_cs.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/pcmcia/smc91c92_cs.c')
-rw-r--r--drivers/net/pcmcia/smc91c92_cs.c24
1 files changed, 0 insertions, 24 deletions
diff --git a/drivers/net/pcmcia/smc91c92_cs.c b/drivers/net/pcmcia/smc91c92_cs.c
index bf408482443e..530df8883fe5 100644
--- a/drivers/net/pcmcia/smc91c92_cs.c
+++ b/drivers/net/pcmcia/smc91c92_cs.c
@@ -959,10 +959,6 @@ static int smc91c92_config(struct pcmcia_device *link)
959{ 959{
960 struct net_device *dev = link->priv; 960 struct net_device *dev = link->priv;
961 struct smc_private *smc = netdev_priv(dev); 961 struct smc_private *smc = netdev_priv(dev);
962 struct smc_cfg_mem *cfg_mem;
963 tuple_t *tuple;
964 cisparse_t *parse;
965 u_char *buf;
966 char *name; 962 char *name;
967 int i, j, rev; 963 int i, j, rev;
968 kio_addr_t ioaddr; 964 kio_addr_t ioaddr;
@@ -970,24 +966,6 @@ static int smc91c92_config(struct pcmcia_device *link)
970 966
971 DEBUG(0, "smc91c92_config(0x%p)\n", link); 967 DEBUG(0, "smc91c92_config(0x%p)\n", link);
972 968
973 cfg_mem = kmalloc(sizeof(struct smc_cfg_mem), GFP_KERNEL);
974 if (!cfg_mem)
975 goto config_failed;
976
977 tuple = &cfg_mem->tuple;
978 parse = &cfg_mem->parse;
979 buf = cfg_mem->buf;
980
981 tuple->Attributes = tuple->TupleOffset = 0;
982 tuple->TupleData = (cisdata_t *)buf;
983 tuple->TupleDataMax = 64;
984
985 tuple->DesiredTuple = CISTPL_CONFIG;
986 i = first_tuple(link, tuple, parse);
987 CS_EXIT_TEST(i, ParseTuple, config_failed);
988 link->conf.ConfigBase = parse->config.base;
989 link->conf.Present = parse->config.rmask[0];
990
991 smc->manfid = link->manf_id; 969 smc->manfid = link->manf_id;
992 smc->cardid = link->card_id; 970 smc->cardid = link->card_id;
993 971
@@ -1119,14 +1097,12 @@ static int smc91c92_config(struct pcmcia_device *link)
1119 printk(KERN_NOTICE " No MII transceivers found!\n"); 1097 printk(KERN_NOTICE " No MII transceivers found!\n");
1120 } 1098 }
1121 } 1099 }
1122 kfree(cfg_mem);
1123 return 0; 1100 return 0;
1124 1101
1125config_undo: 1102config_undo:
1126 unregister_netdev(dev); 1103 unregister_netdev(dev);
1127config_failed: /* CS_EXIT_TEST() calls jump to here... */ 1104config_failed: /* CS_EXIT_TEST() calls jump to here... */
1128 smc91c92_release(link); 1105 smc91c92_release(link);
1129 kfree(cfg_mem);
1130 return -ENODEV; 1106 return -ENODEV;
1131} /* smc91c92_config */ 1107} /* smc91c92_config */
1132 1108