pcmcia: remove some rsrc_mgr indirections

Remove rsrc_mgr indirections only used by pcmcia_resource.c

Tested-by: Wolfram Sang <w.sang@pengutronix.de>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>

diff --git a/drivers/pcmcia/cs_internal.h b/drivers/pcmcia/cs_internal.h
index 7f86d09a58308e5251f4443e6f447fe52de7118c..ad05e3b59473edadc46496b37cb7429ec2edb44e 100644 (file)
--- a/drivers/pcmcia/cs_internal.h
+++ b/drivers/pcmcia/cs_internal.h
@@ -168,14 +168,6 @@ int pccard_get_tuple_data(struct pcmcia_socket *s, tuple_t *tuple);
 
 /* rsrc_mgr.c */
 int pcmcia_validate_mem(struct pcmcia_socket *s);
-struct resource *pcmcia_find_io_region(unsigned long base,
-                                      int num,
-                                      unsigned long align,
-                                      struct pcmcia_socket *s);
-int pcmcia_adjust_io_region(struct resource *res,
-                           unsigned long r_start,
-                           unsigned long r_end,
-                           struct pcmcia_socket *s);
 struct resource *pcmcia_find_mem_region(u_long base,
                                        u_long num,
                                        u_long align,

diff --git a/drivers/pcmcia/pcmcia_resource.c b/drivers/pcmcia/pcmcia_resource.c
index d5db95644b64f69cc5dc61fc47f11a7abc21bc71..880b0b63b6a373d37086c065ce42ad9fdb6f585e 100644 (file)
--- a/drivers/pcmcia/pcmcia_resource.c
+++ b/drivers/pcmcia/pcmcia_resource.c
@@ -43,6 +43,23 @@ module_param(io_speed, int, 0444);
 static u8 pcmcia_used_irq[NR_IRQS];
 #endif
 
+static int pcmcia_adjust_io_region(struct resource *res, unsigned long start,
+                                  unsigned long end, struct pcmcia_socket *s)
+{
+       if (s->resource_ops->adjust_io_region)
+               return s->resource_ops->adjust_io_region(res, start, end, s);
+       return -ENOMEM;
+}
+
+static 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;
+}
+
 
 /** alloc_io_space
  *

diff --git a/drivers/pcmcia/rsrc_mgr.c b/drivers/pcmcia/rsrc_mgr.c
index 66c780073cd290d450efdfea076caf01560bfb6a..81540c420bbd2fa177ea2378fdbca787794b85fe 100644 (file)
--- a/drivers/pcmcia/rsrc_mgr.c
+++ b/drivers/pcmcia/rsrc_mgr.c
@@ -31,24 +31,6 @@ int pcmcia_validate_mem(struct pcmcia_socket *s)
 }
 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)
 {