diff options
author | Dominik Brodowski <linux@dominikbrodowski.net> | 2009-11-02 19:31:52 -0500 |
---|---|---|
committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2009-11-28 12:02:58 -0500 |
commit | 6838b03fc6564ea07d0cd87ea6e198d90ab1fc3e (patch) | |
tree | bf14e1ea71482dacfdad97ac9d3f895050946406 /drivers/net/pcmcia | |
parent | 82f88e36004162f49a9340ffbbaebe89016e4835 (diff) |
pcmcia: pcmcia_request_window() doesn't need a pointer to a pointer
pcmcia_request_window() only needs a pointer to struct pcmcia_device, not
a pointer to a pointer.
CC: netdev@vger.kernel.org
CC: linux-wireless@vger.kernel.org
CC: linux-scsi@vger.kernel.org
CC: Jiri Kosina <jkosina@suse.cz>
Acked-by: Karsten Keil <keil@b1-systems.de> (for ISDN)
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'drivers/net/pcmcia')
-rw-r--r-- | drivers/net/pcmcia/fmvj18x_cs.c | 4 | ||||
-rw-r--r-- | drivers/net/pcmcia/ibmtr_cs.c | 4 | ||||
-rw-r--r-- | drivers/net/pcmcia/pcnet_cs.c | 4 | ||||
-rw-r--r-- | drivers/net/pcmcia/smc91c92_cs.c | 2 | ||||
-rw-r--r-- | drivers/net/pcmcia/xirc2ps_cs.c | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/drivers/net/pcmcia/fmvj18x_cs.c b/drivers/net/pcmcia/fmvj18x_cs.c index 6b9c79e4a2c0..85f7c4562707 100644 --- a/drivers/net/pcmcia/fmvj18x_cs.c +++ b/drivers/net/pcmcia/fmvj18x_cs.c | |||
@@ -567,7 +567,7 @@ static int fmvj18x_get_hwinfo(struct pcmcia_device *link, u_char *node_id) | |||
567 | req.Attributes = WIN_DATA_WIDTH_8|WIN_MEMORY_TYPE_AM|WIN_ENABLE; | 567 | req.Attributes = WIN_DATA_WIDTH_8|WIN_MEMORY_TYPE_AM|WIN_ENABLE; |
568 | req.Base = 0; req.Size = 0; | 568 | req.Base = 0; req.Size = 0; |
569 | req.AccessSpeed = 0; | 569 | req.AccessSpeed = 0; |
570 | i = pcmcia_request_window(&link, &req, &link->win); | 570 | i = pcmcia_request_window(link, &req, &link->win); |
571 | if (i != 0) | 571 | if (i != 0) |
572 | return -1; | 572 | return -1; |
573 | 573 | ||
@@ -618,7 +618,7 @@ static int fmvj18x_setup_mfc(struct pcmcia_device *link) | |||
618 | req.Attributes = WIN_DATA_WIDTH_8|WIN_MEMORY_TYPE_AM|WIN_ENABLE; | 618 | req.Attributes = WIN_DATA_WIDTH_8|WIN_MEMORY_TYPE_AM|WIN_ENABLE; |
619 | req.Base = 0; req.Size = 0; | 619 | req.Base = 0; req.Size = 0; |
620 | req.AccessSpeed = 0; | 620 | req.AccessSpeed = 0; |
621 | i = pcmcia_request_window(&link, &req, &link->win); | 621 | i = pcmcia_request_window(link, &req, &link->win); |
622 | if (i != 0) | 622 | if (i != 0) |
623 | return -1; | 623 | return -1; |
624 | 624 | ||
diff --git a/drivers/net/pcmcia/ibmtr_cs.c b/drivers/net/pcmcia/ibmtr_cs.c index 6fc89eba9c8f..14fe5fa35d86 100644 --- a/drivers/net/pcmcia/ibmtr_cs.c +++ b/drivers/net/pcmcia/ibmtr_cs.c | |||
@@ -246,7 +246,7 @@ static int __devinit ibmtr_config(struct pcmcia_device *link) | |||
246 | req.Base = 0; | 246 | req.Base = 0; |
247 | req.Size = 0x2000; | 247 | req.Size = 0x2000; |
248 | req.AccessSpeed = 250; | 248 | req.AccessSpeed = 250; |
249 | ret = pcmcia_request_window(&link, &req, &link->win); | 249 | ret = pcmcia_request_window(link, &req, &link->win); |
250 | if (ret) | 250 | if (ret) |
251 | goto failed; | 251 | goto failed; |
252 | 252 | ||
@@ -263,7 +263,7 @@ static int __devinit ibmtr_config(struct pcmcia_device *link) | |||
263 | req.Base = 0; | 263 | req.Base = 0; |
264 | req.Size = sramsize * 1024; | 264 | req.Size = sramsize * 1024; |
265 | req.AccessSpeed = 250; | 265 | req.AccessSpeed = 250; |
266 | ret = pcmcia_request_window(&link, &req, &info->sram_win_handle); | 266 | ret = pcmcia_request_window(link, &req, &info->sram_win_handle); |
267 | if (ret) | 267 | if (ret) |
268 | goto failed; | 268 | goto failed; |
269 | 269 | ||
diff --git a/drivers/net/pcmcia/pcnet_cs.c b/drivers/net/pcmcia/pcnet_cs.c index 518b094c9f6d..d06a0ce7cb89 100644 --- a/drivers/net/pcmcia/pcnet_cs.c +++ b/drivers/net/pcmcia/pcnet_cs.c | |||
@@ -317,7 +317,7 @@ static hw_info_t *get_hwinfo(struct pcmcia_device *link) | |||
317 | req.Attributes = WIN_DATA_WIDTH_8|WIN_MEMORY_TYPE_AM|WIN_ENABLE; | 317 | req.Attributes = WIN_DATA_WIDTH_8|WIN_MEMORY_TYPE_AM|WIN_ENABLE; |
318 | req.Base = 0; req.Size = 0; | 318 | req.Base = 0; req.Size = 0; |
319 | req.AccessSpeed = 0; | 319 | req.AccessSpeed = 0; |
320 | i = pcmcia_request_window(&link, &req, &link->win); | 320 | i = pcmcia_request_window(link, &req, &link->win); |
321 | if (i != 0) | 321 | if (i != 0) |
322 | return NULL; | 322 | return NULL; |
323 | 323 | ||
@@ -1491,7 +1491,7 @@ static int setup_shmem_window(struct pcmcia_device *link, int start_pg, | |||
1491 | req.Attributes |= WIN_USE_WAIT; | 1491 | req.Attributes |= WIN_USE_WAIT; |
1492 | req.Base = 0; req.Size = window_size; | 1492 | req.Base = 0; req.Size = window_size; |
1493 | req.AccessSpeed = mem_speed; | 1493 | req.AccessSpeed = mem_speed; |
1494 | ret = pcmcia_request_window(&link, &req, &link->win); | 1494 | ret = pcmcia_request_window(link, &req, &link->win); |
1495 | if (ret) | 1495 | if (ret) |
1496 | goto failed; | 1496 | goto failed; |
1497 | 1497 | ||
diff --git a/drivers/net/pcmcia/smc91c92_cs.c b/drivers/net/pcmcia/smc91c92_cs.c index 4ceaa45d7d81..c6ca3764ab6d 100644 --- a/drivers/net/pcmcia/smc91c92_cs.c +++ b/drivers/net/pcmcia/smc91c92_cs.c | |||
@@ -472,7 +472,7 @@ static int mhz_mfc_config(struct pcmcia_device *link) | |||
472 | req.Attributes = WIN_DATA_WIDTH_8|WIN_MEMORY_TYPE_AM|WIN_ENABLE; | 472 | req.Attributes = WIN_DATA_WIDTH_8|WIN_MEMORY_TYPE_AM|WIN_ENABLE; |
473 | req.Base = req.Size = 0; | 473 | req.Base = req.Size = 0; |
474 | req.AccessSpeed = 0; | 474 | req.AccessSpeed = 0; |
475 | i = pcmcia_request_window(&link, &req, &link->win); | 475 | i = pcmcia_request_window(link, &req, &link->win); |
476 | if (i != 0) | 476 | if (i != 0) |
477 | return -ENODEV; | 477 | return -ENODEV; |
478 | 478 | ||
diff --git a/drivers/net/pcmcia/xirc2ps_cs.c b/drivers/net/pcmcia/xirc2ps_cs.c index 9bc4d6002ae0..265852ab1a2d 100644 --- a/drivers/net/pcmcia/xirc2ps_cs.c +++ b/drivers/net/pcmcia/xirc2ps_cs.c | |||
@@ -926,7 +926,7 @@ xirc2ps_config(struct pcmcia_device * link) | |||
926 | req.Attributes = WIN_DATA_WIDTH_8|WIN_MEMORY_TYPE_AM|WIN_ENABLE; | 926 | req.Attributes = WIN_DATA_WIDTH_8|WIN_MEMORY_TYPE_AM|WIN_ENABLE; |
927 | req.Base = req.Size = 0; | 927 | req.Base = req.Size = 0; |
928 | req.AccessSpeed = 0; | 928 | req.AccessSpeed = 0; |
929 | if ((err = pcmcia_request_window(&link, &req, &link->win))) | 929 | if ((err = pcmcia_request_window(link, &req, &link->win))) |
930 | goto config_error; | 930 | goto config_error; |
931 | 931 | ||
932 | local->dingo_ccr = ioremap(req.Base,0x1000) + 0x0800; | 932 | local->dingo_ccr = ioremap(req.Base,0x1000) + 0x0800; |