forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

pcmcia: use pre-determined values

Browse source 
A few PCMCIA network drivers can make use of values provided by the pcmcia
core, instead of tedious, independent CIS parsing.

xirc32ps_cs.c: manf_id

hostap_cs.c: multifunction count

b43/pcmcia.c: ConfigBase address and "Present"

smc91c92_cs.c:  By default, mhz_setup() can use VERS_1 as it is stored
in struct pcmcia_device. Only some cards require workarounds, such as
reading out VERS_1 twice.

CC: David S. Miller <davem@davemloft.net>
CC: netdev@vger.kernel.org
CC: linux-wireless@vger.kernel.org
Acked-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
This commit is contained in:
Dominik Brodowski 2009-10-18 18:22:32 +02:00
parent 6ae3b84d97
commit 7d2e8d00b4
4 changed files with 19 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

12
drivers/net/pcmcia/xirc2ps_cs.c
View file

@ -792,13 +792,12 @@ xirc2ps_config(struct pcmcia_device * link)
tuple.TupleOffset = 0;
/* Is this a valid card */
tuple.DesiredTuple = CISTPL_MANFID;
if ((err=first_tuple(link, &tuple, &parse))) {
if (link->has_manf_id == 0) {
printk(KNOT_XIRC "manfid not found in CIS\n");
goto failure;
}
switch(parse.manfid.manf) {
switch (link->manf_id) {
case MANFID_XIRCOM:
local->manf_str = "Xircom";
break;
@ -822,6 +821,13 @@ xirc2ps_config(struct pcmcia_device * link)
}
DEBUG(0, "found %s card\n", local->manf_str);
/* needed for the additional fields to be parsed by set_card_type() */
tuple.DesiredTuple = CISTPL_MANFID;
err = first_tuple(link, &tuple, &parse)
if (err) {
printk(KNOT_XIRC "manfid not found in CIS\n");
goto failure;
}
if (!set_card_type(link, buf)) {
printk(KNOT_XIRC "this card is not supported\n");
goto failure;