pcmcia: clarify alloc_io_space, move it to resource handlers

[firefly-linux-kernel-4.4.55.git] / drivers / pcmcia / rsrc_mgr.c

diff --git a/drivers/pcmcia/rsrc_mgr.c b/drivers/pcmcia/rsrc_mgr.c
index 71838cae890ca3e756142bda1d588567a7988f3a..142efac3c387bbe5fa05bdf5cb3ddc3a8c0edb8b 100644 (file)
--- a/drivers/pcmcia/rsrc_mgr.c
+++ b/drivers/pcmcia/rsrc_mgr.c
@@ -46,11 +46,21 @@ struct resource *pcmcia_make_resource(unsigned long start, unsigned long end,
        return res;
 }
 
+static int static_find_io(struct pcmcia_socket *s, unsigned int attr,
+                       unsigned int *base, unsigned int num,
+                       unsigned int align)
+{
+       if (!s->io_offset)
+               return -EINVAL;
+       *base = s->io_offset | (*base & 0x0fff);
+
+       return 0;
+}
+
 
 struct pccard_resource_ops pccard_static_ops = {
        .validate_mem = NULL,
-       .adjust_io_region = NULL,
-       .find_io = NULL,
+       .find_io = static_find_io,
        .find_mem = NULL,
        .add_io = NULL,
        .add_mem = NULL,