Calls to adjust_io_region only happen if !SS_CAP_STATIC_MAP.
Signed-off-by: Dominik Brodowski <linux@brodo.de>
drivers/pcmcia/rsrc_mgr.c | 14 ++++++++++++--
include/pcmcia/ss.h | 6 +++++-
2 files changed, 17 insertions(+), 3 deletions(-)
diff -ruN linux-original/drivers/pcmcia/rsrc_mgr.c linux/drivers/pcmcia/rsrc_mgr.c
--- linux-original/drivers/pcmcia/rsrc_mgr.c 2004-11-07 13:15:50.008800872 +0100
+++ linux/drivers/pcmcia/rsrc_mgr.c 2004-11-07 13:16:05.250483784 +0100
@@ -577,8 +577,8 @@
* Adjust an existing IO region allocation, but making sure that we don't
* encroach outside the resources which the user supplied.
*/
-int adjust_io_region(struct resource *res, unsigned long r_start,
- unsigned long r_end, struct pcmcia_socket *s)
+static int nonstatic_adjust_io_region(struct resource *res, unsigned long r_start,
+ unsigned long r_end, struct pcmcia_socket *s)
{
resource_map_t *m;
int ret = -ENOMEM;
@@ -599,6 +599,14 @@
return ret;
}
+int adjust_io_region(struct resource *res, unsigned long r_start,
+ unsigned long r_end, struct pcmcia_socket *s)
+{
+ if (s->resource_ops->adjust_io_region)
+ return s->resource_ops->adjust_io_region(res, r_start, r_end, s);
+ return -ENOMEM;
+}
+
/*======================================================================
These find ranges of I/O ports or memory addresses that are not
@@ -991,8 +999,10 @@
struct pccard_resource_ops pccard_static_ops = {
.validate_mem = NULL,
+ .adjust_io_region = NULL,
};
struct pccard_resource_ops pccard_nonstatic_ops = {
.validate_mem = pcmcia_nonstatic_validate_mem,
+ .adjust_io_region = nonstatic_adjust_io_region,
};
diff -ruN linux-original/include/pcmcia/ss.h linux/include/pcmcia/ss.h
--- linux-original/include/pcmcia/ss.h 2004-11-07 13:15:50.008800872 +0100
+++ linux/include/pcmcia/ss.h 2004-11-07 13:16:05.251483632 +0100
@@ -116,7 +116,11 @@
};
struct pccard_resource_ops {
- void (*validate_mem) (struct pcmcia_socket *s);
+ void (*validate_mem) (struct pcmcia_socket *s);
+ int (*adjust_io_region) (struct resource *res,
+ unsigned long r_start,
+ unsigned long r_end,
+ struct pcmcia_socket *s);
};
/*