diff options
author | Dominik Brodowski <linux@dominikbrodowski.de> | 2005-01-11 03:28:50 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-01-11 03:28:50 -0800 |
commit | 83b52fe651c487d60a3e7e55770bbde73a16a10c (patch) | |
tree | e1d4b31c4faa159f14137a98bf1d2f61b7585c75 /drivers | |
parent | 1b55e603e08a16ed866a91433fc1b44eb9a1e16d (diff) | |
download | history-83b52fe651c487d60a3e7e55770bbde73a16a10c.tar.gz |
[PATCH] pcmcia: adjust_ and release_resources only for non-statically mapped sockets
re-direct calls to adjust_resource_info for MEM and IO.
Signed-off-by: Dominik Brodowski <linux@brodo.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/pcmcia/rsrc_mgr.c | 34 |
1 files changed, 25 insertions, 9 deletions
diff --git a/drivers/pcmcia/rsrc_mgr.c b/drivers/pcmcia/rsrc_mgr.c index ea52d03e9f4bec..ff67766d0a073e 100644 --- a/drivers/pcmcia/rsrc_mgr.c +++ b/drivers/pcmcia/rsrc_mgr.c @@ -940,6 +940,17 @@ static int adjust_irq(adjust_t *adj) /*====================================================================*/ +static int nonstatic_adjust_resource_info(struct pcmcia_socket *s, adjust_t *adj) +{ + switch (adj->Resource) { + case RES_MEMORY_RANGE: + return adjust_memory(s, adj); + case RES_IO_RANGE: + return adjust_io(s, adj); + } + return CS_UNSUPPORTED_FUNCTION; +} + int pcmcia_adjust_resource_info(adjust_t *adj) { struct pcmcia_socket *s; @@ -950,14 +961,8 @@ int pcmcia_adjust_resource_info(adjust_t *adj) down_read(&pcmcia_socket_list_rwsem); list_for_each_entry(s, &pcmcia_socket_list, socket_list) { - switch (adj->Resource) { - case RES_MEMORY_RANGE: - ret = adjust_memory(s, adj); - break; - case RES_IO_RANGE: - ret = adjust_io(s, adj); - break; - } + if (s->resource_ops->adjust_resource) + ret = s->resource_ops->adjust_resource(s, adj); } up_read(&pcmcia_socket_list_rwsem); @@ -967,7 +972,7 @@ EXPORT_SYMBOL(pcmcia_adjust_resource_info); /*====================================================================*/ -void release_resource_db(struct pcmcia_socket *s) +static void nonstatic_release_resource_db(struct pcmcia_socket *s) { resource_map_t *p, *q; @@ -982,6 +987,7 @@ void release_resource_db(struct pcmcia_socket *s) } + void pcmcia_validate_mem(struct pcmcia_socket *s) { if (s->resource_ops->validate_mem) @@ -1013,12 +1019,20 @@ struct resource *find_mem_region(u_long base, u_long num, u_long align, return NULL; } +void release_resource_db(struct pcmcia_socket *s) +{ + if (s->resource_ops->exit) + s->resource_ops->exit(s); +} + struct pccard_resource_ops pccard_static_ops = { .validate_mem = NULL, .adjust_io_region = NULL, .find_io = NULL, .find_mem = NULL, + .adjust_resource = NULL, + .exit = NULL, }; struct pccard_resource_ops pccard_nonstatic_ops = { @@ -1026,4 +1040,6 @@ struct pccard_resource_ops pccard_nonstatic_ops = { .adjust_io_region = nonstatic_adjust_io_region, .find_io = nonstatic_find_io_region, .find_mem = nonstatic_find_mem_region, + .adjust_resource = nonstatic_adjust_resource_info, + .exit = nonstatic_release_resource_db, }; |