Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1a8d4663 authored by Dominik Brodowski's avatar Dominik Brodowski Committed by Linus Torvalds
Browse files

[PATCH] pcmcia: move pcmcia resource handling out of cs.c 



Move the 16-bit PCMICA resource handling from pcmcia_core.o to pcmcia.o.

Signed-off-by: default avatarDominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent e6ea0b9e

drivers/pcmcia/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ pcmcia_core-y += cs.o cistpl.o rsrc_mgr.o socket_sysfs.o 
pcmcia_core-$(CONFIG_CARDBUS)			+= cardbus.o

obj-$(CONFIG_PCCARD)				+= pcmcia_core.o



pcmcia-y					+= ds.o pcmcia_compat.o

pcmcia-y					+= ds.o pcmcia_compat.o pcmcia_resource.o

pcmcia-$(CONFIG_PCMCIA_IOCTL)			+= pcmcia_ioctl.o

obj-$(CONFIG_PCMCIA)				+= pcmcia.o

drivers/pcmcia/cistpl.c

+4 −0
Original line number Diff line number Diff line
@@ -182,6 +182,8 @@ int pcmcia_read_cis_mem(struct pcmcia_socket *s, int attr, u_int addr, 
	  *(u_char *)(ptr+2), *(u_char *)(ptr+3));

    return 0;

}

EXPORT_SYMBOL(pcmcia_read_cis_mem);





void pcmcia_write_cis_mem(struct pcmcia_socket *s, int attr, u_int addr,

		   u_int len, void *ptr)
@@ -239,6 +241,8 @@ void pcmcia_write_cis_mem(struct pcmcia_socket *s, int attr, u_int addr, 
	}

    }

}

EXPORT_SYMBOL(pcmcia_write_cis_mem);





/*======================================================================

drivers/pcmcia/cs.c

+0 −935

File changed.

Preview size limit exceeded, changes collapsed.

drivers/pcmcia/pcmcia_resource.c

0 → 100644
+989 −0

File added.

Preview size limit exceeded, changes collapsed.

drivers/pcmcia/rsrc_mgr.c

+3 −0
Original line number Diff line number Diff line
@@ -112,6 +112,7 @@ int pcmcia_adjust_io_region(struct resource *res, unsigned long r_start, 
		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)
@@ -120,6 +121,7 @@ struct resource *pcmcia_find_io_region(unsigned long base, int num, 
		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)
@@ -128,6 +130,7 @@ struct resource *pcmcia_find_mem_region(u_long base, u_long num, u_long align, 
		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)

{