Commit f9c316f4 authored by Dominik Brodowski's avatar Dominik Brodowski
Browse files

pcmcia: remove some rsrc_mgr indirections 



Remove rsrc_mgr indirections only used by pcmcia_resource.c

Tested-by: default avatarWolfram Sang <w.sang@pengutronix.de>
Signed-off-by: default avatarDominik Brodowski <linux@dominikbrodowski.net>
parent 385ee871

drivers/pcmcia/cs_internal.h

+0 −8
Original line number Diff line number Diff line
@@ -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,

drivers/pcmcia/pcmcia_resource.c

+17 −0
Original line number Diff line number Diff line
@@ -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

 *

drivers/pcmcia/rsrc_mgr.c

+0 −18
Original line number Diff line number Diff line
@@ -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)

{