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

pcmcia: remove remaining rsrc_mgr indirections 



Move rsrc_mgr indirections only used by the pcmcia module to the
pcmcia module.

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

drivers/pcmcia/cs_internal.h

+7 −8
Original line number Diff line number Diff line
@@ -133,14 +133,6 @@ int pcmcia_insert_card(struct pcmcia_socket *skt); 
struct pcmcia_socket *pcmcia_get_socket(struct pcmcia_socket *skt);

void pcmcia_put_socket(struct pcmcia_socket *skt);



/* rsrc_mgr.c */

int pcmcia_validate_mem(struct pcmcia_socket *s);

struct resource *pcmcia_find_mem_region(u_long base,

					u_long num,

					u_long align,

					int low,

					struct pcmcia_socket *s);



/*

 * Stuff internal to module "pcmcia".

 */
@@ -149,6 +141,13 @@ extern struct bus_type pcmcia_bus_type; 


/* pcmcia_resource.c */

extern int pcmcia_release_configuration(struct pcmcia_device *p_dev);

extern int pcmcia_validate_mem(struct pcmcia_socket *s);

extern struct resource *pcmcia_find_mem_region(u_long base,

					       u_long num,

					       u_long align,

					       int low,

					       struct pcmcia_socket *s);





/* cistpl.c */

extern struct bin_attribute pccard_cis_attr;

drivers/pcmcia/pcmcia_resource.c

+16 −0
Original line number Diff line number Diff line
@@ -60,6 +60,22 @@ static struct resource *pcmcia_find_io_region(unsigned long base, int num, 
	return NULL;

}



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;

}



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;

}





/** alloc_io_space

 *

drivers/pcmcia/rsrc_mgr.c

+0 −20
Original line number Diff line number Diff line
@@ -21,26 +21,6 @@ 
#include <pcmcia/cistpl.h>

#include "cs_internal.h"





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);



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);





static int static_init(struct pcmcia_socket *s)

{

	unsigned long flags;