diff options
| author | Dominik Brodowski <linux@dominikbrodowski.net> | 2009-10-18 12:22:32 -0400 |
|---|---|---|
| committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2009-11-08 12:06:32 -0500 |
| commit | 7d2e8d00b47b973c92db4df7444d5e6d3bb945f9 (patch) | |
| tree | 22286fa095d0340245e83ca9c7695f42f65c141a /drivers/net/wireless/b43 | |
| parent | 6ae3b84d979308671bf6f6a2123c258a8603d61c (diff) | |
pcmcia: use pre-determined values
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>
Diffstat (limited to 'drivers/net/wireless/b43')
| -rw-r--r-- | drivers/net/wireless/b43/pcmcia.c | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/drivers/net/wireless/b43/pcmcia.c b/drivers/net/wireless/b43/pcmcia.c index 6c3a74964ab8..cd14b7e8ba80 100644 --- a/drivers/net/wireless/b43/pcmcia.c +++ b/drivers/net/wireless/b43/pcmcia.c | |||
| @@ -65,35 +65,15 @@ static int __devinit b43_pcmcia_probe(struct pcmcia_device *dev) | |||
| 65 | struct ssb_bus *ssb; | 65 | struct ssb_bus *ssb; |
| 66 | win_req_t win; | 66 | win_req_t win; |
| 67 | memreq_t mem; | 67 | memreq_t mem; |
| 68 | tuple_t tuple; | ||
| 69 | cisparse_t parse; | ||
| 70 | int err = -ENOMEM; | 68 | int err = -ENOMEM; |
| 71 | int res = 0; | 69 | int res = 0; |
| 72 | unsigned char buf[64]; | ||
| 73 | 70 | ||
| 74 | ssb = kzalloc(sizeof(*ssb), GFP_KERNEL); | 71 | ssb = kzalloc(sizeof(*ssb), GFP_KERNEL); |
| 75 | if (!ssb) | 72 | if (!ssb) |
| 76 | goto out_error; | 73 | goto out_error; |
| 77 | 74 | ||
| 78 | err = -ENODEV; | 75 | err = -ENODEV; |
| 79 | tuple.DesiredTuple = CISTPL_CONFIG; | ||
| 80 | tuple.Attributes = 0; | ||
| 81 | tuple.TupleData = buf; | ||
| 82 | tuple.TupleDataMax = sizeof(buf); | ||
| 83 | tuple.TupleOffset = 0; | ||
| 84 | 76 | ||
| 85 | res = pcmcia_get_first_tuple(dev, &tuple); | ||
| 86 | if (res != 0) | ||
| 87 | goto err_kfree_ssb; | ||
| 88 | res = pcmcia_get_tuple_data(dev, &tuple); | ||
| 89 | if (res != 0) | ||
| 90 | goto err_kfree_ssb; | ||
| 91 | res = pcmcia_parse_tuple(&tuple, &parse); | ||
| 92 | if (res != 0) | ||
| 93 | goto err_kfree_ssb; | ||
| 94 | |||
| 95 | dev->conf.ConfigBase = parse.config.base; | ||
| 96 | dev->conf.Present = parse.config.rmask[0]; | ||
| 97 | dev->conf.Attributes = CONF_ENABLE_IRQ; | 77 | dev->conf.Attributes = CONF_ENABLE_IRQ; |
| 98 | dev->conf.IntType = INT_MEMORY_AND_IO; | 78 | dev->conf.IntType = INT_MEMORY_AND_IO; |
| 99 | 79 | ||