[PATCH] pcmcia: validate_mem only for non-statically mapped sockets

validate_mem() does only make sense for !SS_CAP_STATIC_MAP sockets. Therefore,
re-direct validate_mem() calls only for those. The newly added redirection
layer will allow for a "library" module named "rsrc_nonstatic" which contains
the resource database handling code, and it will only need to be loaded for
the drivers which need it.

Signed-off-by: Dominik Brodowski <linux@brodo.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/drivers/pcmcia/cs.c b/drivers/pcmcia/cs.c
index 9c21a58f835e4118ae7b534202b8eb74c7ea119c..590b2a5618907e5ff631d7e115ae0087c0b08007 100644 (file)
--- a/drivers/pcmcia/cs.c
+++ b/drivers/pcmcia/cs.c
@@ -250,7 +250,11 @@ int pcmcia_register_socket(struct pcmcia_socket *socket)
        socket->cis_mem.flags = 0;
        socket->cis_mem.speed = cis_speed;
 
-       /* init resource database */
+       /* init resource handling */
+       if (socket->features & SS_CAP_STATIC_MAP)
+               socket->resource_ops = &pccard_static_ops;
+       else
+               socket->resource_ops = &pccard_nonstatic_ops;
        socket->mem_db.next = &socket->mem_db;
        socket->io_db.next = &socket->io_db;
 

diff --git a/drivers/pcmcia/cs_internal.h b/drivers/pcmcia/cs_internal.h
index f64ca5663f3cc48b2e107653949fea756f27e7e7..764e71bcecaba16e18bd4eb34607f94e043ffad6 100644 (file)
--- a/drivers/pcmcia/cs_internal.h
+++ b/drivers/pcmcia/cs_internal.h
@@ -144,6 +144,8 @@ int try_irq(u_int Attributes, int irq, int specific);
 void undo_irq(u_int Attributes, int irq);
 int adjust_resource_info(client_handle_t handle, adjust_t *adj);
 void release_resource_db(struct pcmcia_socket *s);
+extern struct pccard_resource_ops pccard_static_ops;
+extern struct pccard_resource_ops pccard_nonstatic_ops;
 
 /* In socket_sysfs.c */
 extern struct class_interface pccard_sysfs_interface;

diff --git a/drivers/pcmcia/rsrc_mgr.c b/drivers/pcmcia/rsrc_mgr.c
index d2aa1aabe21911c56d9a1cdca98435446c24e271..1bc69b669477ffa089b34b56b1cb7a8775878035 100644 (file)
--- a/drivers/pcmcia/rsrc_mgr.c
+++ b/drivers/pcmcia/rsrc_mgr.c
@@ -473,11 +473,12 @@ static void validate_mem(struct pcmcia_socket *s, unsigned int probe_mask)
 
 #endif /* CONFIG_PCMCIA_PROBE */
 
+
 /*
  * Locking note: this is the only place where we take
  * both rsrc_sem and skt_sem.
  */
-void pcmcia_validate_mem(struct pcmcia_socket *s)
+static void pcmcia_nonstatic_validate_mem(struct pcmcia_socket *s)
 {
        if (probe_mem) {
                unsigned int probe_mask;
@@ -503,6 +504,11 @@ void pcmcia_validate_mem(struct pcmcia_socket *s)
        }
 }
 
+void pcmcia_validate_mem(struct pcmcia_socket *s)
+{
+       if (s->resource_ops->validate_mem)
+               s->resource_ops->validate_mem(s);
+}
 EXPORT_SYMBOL(pcmcia_validate_mem);
 
 struct pcmcia_align_data {
@@ -981,3 +987,12 @@ void release_resource_db(struct pcmcia_socket *s)
        kfree(p);
     }
 }
+
+
+struct pccard_resource_ops pccard_static_ops = {
+       .validate_mem = NULL,
+};
+
+struct pccard_resource_ops pccard_nonstatic_ops = {
+       .validate_mem = pcmcia_nonstatic_validate_mem,
+};

diff --git a/include/pcmcia/ss.h b/include/pcmcia/ss.h
index fe5bdada22f7124fe29343497d6a7ce36d479363..d872a714fa28a09ffc40043a1160761d296448ca 100644 (file)
--- a/include/pcmcia/ss.h
+++ b/include/pcmcia/ss.h
@@ -115,6 +115,10 @@ struct pccard_operations {
        int (*set_mem_map)(struct pcmcia_socket *sock, struct pccard_mem_map *mem);
 };
 
+struct pccard_resource_ops {
+       void    (*validate_mem) (struct pcmcia_socket *s);
+};
+
 /*
  *  Calls to set up low-level "Socket Services" drivers
  */
@@ -194,6 +198,7 @@ struct pcmcia_socket {
 
        /* socket operations */
        struct pccard_operations *      ops;
+       struct pccard_resource_ops *    resource_ops;
 
        /* Zoom video behaviour is so chip specific its not worth adding
           this to _ops */