diff options
Diffstat (limited to 'drivers/net/wireless')
| -rw-r--r-- | drivers/net/wireless/airo_cs.c | 2 | ||||
| -rw-r--r-- | drivers/net/wireless/b43/pcmcia.c | 2 | ||||
| -rw-r--r-- | drivers/net/wireless/netwave_cs.c | 2 | ||||
| -rw-r--r-- | drivers/net/wireless/ray_cs.c | 6 | ||||
| -rw-r--r-- | drivers/net/wireless/wavelan_cs.c | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/drivers/net/wireless/airo_cs.c b/drivers/net/wireless/airo_cs.c index 2aa6978d76ca..34d775c18a31 100644 --- a/drivers/net/wireless/airo_cs.c +++ b/drivers/net/wireless/airo_cs.c | |||
| @@ -257,7 +257,7 @@ static int airo_cs_config_check(struct pcmcia_device *p_dev, | |||
| 257 | req->Base = mem->win[0].host_addr; | 257 | req->Base = mem->win[0].host_addr; |
| 258 | req->Size = mem->win[0].len; | 258 | req->Size = mem->win[0].len; |
| 259 | req->AccessSpeed = 0; | 259 | req->AccessSpeed = 0; |
| 260 | if (pcmcia_request_window(&p_dev, req, &p_dev->win) != 0) | 260 | if (pcmcia_request_window(p_dev, req, &p_dev->win) != 0) |
| 261 | return -ENODEV; | 261 | return -ENODEV; |
| 262 | map.Page = 0; | 262 | map.Page = 0; |
| 263 | map.CardOffset = mem->win[0].card_addr; | 263 | map.CardOffset = mem->win[0].card_addr; |
diff --git a/drivers/net/wireless/b43/pcmcia.c b/drivers/net/wireless/b43/pcmcia.c index c0a34bbcb8d5..2588358294be 100644 --- a/drivers/net/wireless/b43/pcmcia.c +++ b/drivers/net/wireless/b43/pcmcia.c | |||
| @@ -87,7 +87,7 @@ static int __devinit b43_pcmcia_probe(struct pcmcia_device *dev) | |||
| 87 | win.Base = 0; | 87 | win.Base = 0; |
| 88 | win.Size = SSB_CORE_SIZE; | 88 | win.Size = SSB_CORE_SIZE; |
| 89 | win.AccessSpeed = 250; | 89 | win.AccessSpeed = 250; |
| 90 | res = pcmcia_request_window(&dev, &win, &dev->win); | 90 | res = pcmcia_request_window(dev, &win, &dev->win); |
| 91 | if (res != 0) | 91 | if (res != 0) |
| 92 | goto err_kfree_ssb; | 92 | goto err_kfree_ssb; |
| 93 | 93 | ||
diff --git a/drivers/net/wireless/netwave_cs.c b/drivers/net/wireless/netwave_cs.c index 4a8c62126c55..bd4eff79bd13 100644 --- a/drivers/net/wireless/netwave_cs.c +++ b/drivers/net/wireless/netwave_cs.c | |||
| @@ -759,7 +759,7 @@ static int netwave_pcmcia_config(struct pcmcia_device *link) { | |||
| 759 | req.Attributes = WIN_DATA_WIDTH_8|WIN_MEMORY_TYPE_CM|WIN_ENABLE; | 759 | req.Attributes = WIN_DATA_WIDTH_8|WIN_MEMORY_TYPE_CM|WIN_ENABLE; |
| 760 | req.Base = 0; req.Size = 0x8000; | 760 | req.Base = 0; req.Size = 0x8000; |
| 761 | req.AccessSpeed = mem_speed; | 761 | req.AccessSpeed = mem_speed; |
| 762 | ret = pcmcia_request_window(&link, &req, &link->win); | 762 | ret = pcmcia_request_window(link, &req, &link->win); |
| 763 | if (ret) | 763 | if (ret) |
| 764 | goto failed; | 764 | goto failed; |
| 765 | mem.CardOffset = 0x20000; mem.Page = 0; | 765 | mem.CardOffset = 0x20000; mem.Page = 0; |
diff --git a/drivers/net/wireless/ray_cs.c b/drivers/net/wireless/ray_cs.c index f719ffcb3c74..66e2d10cd754 100644 --- a/drivers/net/wireless/ray_cs.c +++ b/drivers/net/wireless/ray_cs.c | |||
| @@ -438,7 +438,7 @@ static int ray_config(struct pcmcia_device *link) | |||
| 438 | req.Base = 0; | 438 | req.Base = 0; |
| 439 | req.Size = 0x8000; | 439 | req.Size = 0x8000; |
| 440 | req.AccessSpeed = ray_mem_speed; | 440 | req.AccessSpeed = ray_mem_speed; |
| 441 | ret = pcmcia_request_window(&link, &req, &link->win); | 441 | ret = pcmcia_request_window(link, &req, &link->win); |
| 442 | if (ret) | 442 | if (ret) |
| 443 | goto failed; | 443 | goto failed; |
| 444 | mem.CardOffset = 0x0000; | 444 | mem.CardOffset = 0x0000; |
| @@ -454,7 +454,7 @@ static int ray_config(struct pcmcia_device *link) | |||
| 454 | req.Base = 0; | 454 | req.Base = 0; |
| 455 | req.Size = 0x4000; | 455 | req.Size = 0x4000; |
| 456 | req.AccessSpeed = ray_mem_speed; | 456 | req.AccessSpeed = ray_mem_speed; |
| 457 | ret = pcmcia_request_window(&link, &req, &local->rmem_handle); | 457 | ret = pcmcia_request_window(link, &req, &local->rmem_handle); |
| 458 | if (ret) | 458 | if (ret) |
| 459 | goto failed; | 459 | goto failed; |
| 460 | mem.CardOffset = 0x8000; | 460 | mem.CardOffset = 0x8000; |
| @@ -470,7 +470,7 @@ static int ray_config(struct pcmcia_device *link) | |||
| 470 | req.Base = 0; | 470 | req.Base = 0; |
| 471 | req.Size = 0x1000; | 471 | req.Size = 0x1000; |
| 472 | req.AccessSpeed = ray_mem_speed; | 472 | req.AccessSpeed = ray_mem_speed; |
| 473 | ret = pcmcia_request_window(&link, &req, &local->amem_handle); | 473 | ret = pcmcia_request_window(link, &req, &local->amem_handle); |
| 474 | if (ret) | 474 | if (ret) |
| 475 | goto failed; | 475 | goto failed; |
| 476 | mem.CardOffset = 0x0000; | 476 | mem.CardOffset = 0x0000; |
diff --git a/drivers/net/wireless/wavelan_cs.c b/drivers/net/wireless/wavelan_cs.c index d4df25d329d4..f8c5166fffe0 100644 --- a/drivers/net/wireless/wavelan_cs.c +++ b/drivers/net/wireless/wavelan_cs.c | |||
| @@ -3876,7 +3876,7 @@ wv_pcmcia_config(struct pcmcia_device * link) | |||
| 3876 | req.Attributes = WIN_DATA_WIDTH_8|WIN_MEMORY_TYPE_AM|WIN_ENABLE; | 3876 | req.Attributes = WIN_DATA_WIDTH_8|WIN_MEMORY_TYPE_AM|WIN_ENABLE; |
| 3877 | req.Base = req.Size = 0; | 3877 | req.Base = req.Size = 0; |
| 3878 | req.AccessSpeed = mem_speed; | 3878 | req.AccessSpeed = mem_speed; |
| 3879 | i = pcmcia_request_window(&link, &req, &link->win); | 3879 | i = pcmcia_request_window(link, &req, &link->win); |
| 3880 | if (i != 0) | 3880 | if (i != 0) |
| 3881 | break; | 3881 | break; |
| 3882 | 3882 | ||
