pcmcia: CodingStyle fixes
[linux-2.6.git] / drivers / pcmcia / rsrc_mgr.c
index 5146093..452c83b 100644 (file)
  * (C) 1999            David A. Hinds
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 
 #include <pcmcia/cs_types.h>
 #include <pcmcia/ss.h>
 #include <pcmcia/cs.h>
+#include <pcmcia/cistpl.h>
 #include "cs_internal.h"
 
-
-#ifdef CONFIG_PCMCIA_PROBE
-
-static int adjust_irq(struct pcmcia_socket *s, adjust_t *adj)
-{
-       int irq;
-       u32 mask;
-
-       irq = adj->resource.irq.IRQ;
-       if ((irq < 0) || (irq > 15))
-               return CS_BAD_IRQ;
-
-       if (adj->Action != REMOVE_MANAGED_RESOURCE)
-               return 0;
-
-       mask = 1 << irq;
-
-       if (!(s->irq_mask & mask))
-               return 0;
-
-       s->irq_mask &= ~mask;
-
-       return 0;
-}
-
-#else
-
-static inline int adjust_irq(struct pcmcia_socket *s, adjust_t *adj) {
-       return CS_SUCCESS;
-}
-
-#endif
-
-
-int pcmcia_adjust_resource_info(adjust_t *adj)
-{
-       struct pcmcia_socket *s;
-       int ret = CS_UNSUPPORTED_FUNCTION;
-       unsigned long flags;
-
-       down_read(&pcmcia_socket_list_rwsem);
-       list_for_each_entry(s, &pcmcia_socket_list, socket_list) {
-
-               if (adj->Resource == RES_IRQ)
-                       ret = adjust_irq(s, adj);
-
-               else if (s->resource_ops->adjust_resource) {
-
-                       /* you can't use the old interface if the new
-                        * one was used before */
-                       spin_lock_irqsave(&s->lock, flags);
-                       if ((s->resource_setup_new) &&
-                           !(s->resource_setup_old)) {
-                               spin_unlock_irqrestore(&s->lock, flags);
-                               continue;
-                       } else if (!(s->resource_setup_old))
-                               s->resource_setup_old = 1;
-                       spin_unlock_irqrestore(&s->lock, flags);
-
-                       ret = s->resource_ops->adjust_resource(s, adj);
-                       if (!ret) {
-                               /* as there's no way we know this is the
-                                * last call to adjust_resource_info, we
-                                * always need to assume this is the latest
-                                * one... */
-                               spin_lock_irqsave(&s->lock, flags);
-                               s->resource_setup_done = 1;
-                               spin_unlock_irqrestore(&s->lock, flags);
-                       }
-               }
-       }
-       up_read(&pcmcia_socket_list_rwsem);
-
-       return (ret);
-}
-EXPORT_SYMBOL(pcmcia_adjust_resource_info);
-
-int pcmcia_validate_mem(struct pcmcia_socket *s)
-{
-       if (s->resource_ops->validate_mem)
-               return s->resource_ops->validate_mem(s);
-       /* if there is no callback, we can assume that everything is OK */
-       return 0;
-}
-EXPORT_SYMBOL(pcmcia_validate_mem);
-
-int pcmcia_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;
-}
-EXPORT_SYMBOL(pcmcia_adjust_io_region);
-
-struct resource *pcmcia_find_io_region(unsigned long base, int num,
-                  unsigned long align, struct pcmcia_socket *s)
-{
-       if (s->resource_ops->find_io)
-               return s->resource_ops->find_io(base, num, align, s);
-       return NULL;
-}
-EXPORT_SYMBOL(pcmcia_find_io_region);
-
-struct resource *pcmcia_find_mem_region(u_long base, u_long num, u_long align,
-                                int low, struct pcmcia_socket *s)
-{
-       if (s->resource_ops->find_mem)
-               return s->resource_ops->find_mem(base, num, align, low, s);
-       return NULL;
-}
-EXPORT_SYMBOL(pcmcia_find_mem_region);
-
-void release_resource_db(struct pcmcia_socket *s)
-{
-       if (s->resource_ops->exit)
-               s->resource_ops->exit(s);
-}
-
-
 static int static_init(struct pcmcia_socket *s)
 {
-       unsigned long flags;
-
        /* the good thing about SS_CAP_STATIC_MAP sockets is
         * that they don't need a resource database */
 
-       spin_lock_irqsave(&s->lock, flags);
        s->resource_setup_done = 1;
-       spin_unlock_irqrestore(&s->lock, flags);
 
        return 0;
 }
@@ -161,7 +37,8 @@ struct pccard_resource_ops pccard_static_ops = {
        .adjust_io_region = NULL,
        .find_io = NULL,
        .find_mem = NULL,
-       .adjust_resource = NULL,
+       .add_io = NULL,
+       .add_mem = NULL,
        .init = static_init,
        .exit = NULL,
 };
@@ -189,32 +66,32 @@ struct pcmcia_align_data {
        unsigned long   offset;
 };
 
-static void pcmcia_align(void *align_data, struct resource *res,
-                       unsigned long size, unsigned long align)
+static resource_size_t pcmcia_align(void *align_data,
+                               const struct resource *res,
+                               resource_size_t size, resource_size_t align)
 {
        struct pcmcia_align_data *data = align_data;
-       unsigned long start;
+       resource_size_t start;
 
        start = (res->start & ~data->mask) + data->offset;
        if (start < res->start)
                start += data->mask + 1;
-       res->start = start;
 
 #ifdef CONFIG_X86
-        if (res->flags & IORESOURCE_IO) {
-                if (start & 0x300) {
-                        start = (start + 0x3ff) & ~0x3ff;
-                        res->start = start;
-                }
-        }
+       if (res->flags & IORESOURCE_IO) {
+               if (start & 0x300)
+                       start = (start + 0x3ff) & ~0x3ff;
+       }
 #endif
 
 #ifdef CONFIG_M68K
-        if (res->flags & IORESOURCE_IO) {
+       if (res->flags & IORESOURCE_IO) {
                if ((res->start + size - 1) >= 1024)
-                       res->start = res->end;
+                       start = res->end;
        }
 #endif
+
+       return start;
 }
 
 
@@ -229,7 +106,7 @@ static struct resource *iodyn_find_io_region(unsigned long base, int num,
                unsigned long align, struct pcmcia_socket *s)
 {
        struct resource *res = make_resource(0, num, IORESOURCE_IO,
-                                            s->dev.class_id);
+                                            dev_name(&s->dev));
        struct pcmcia_align_data data;
        unsigned long min = base;
        int ret;
@@ -261,7 +138,8 @@ struct pccard_resource_ops pccard_iodyn_ops = {
        .adjust_io_region = iodyn_adjust_io_region,
        .find_io = iodyn_find_io_region,
        .find_mem = NULL,
-       .adjust_resource = NULL,
+       .add_io = NULL,
+       .add_mem = NULL,
        .init = static_init,
        .exit = NULL,
 };