From 253d524b348018470c53c8f8382f6d367daede24 Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Wed, 26 Jul 2006 23:04:47 +0000 Subject: 2006-07-27 Stefan Siegl * linux/pcmcia-cs/clients/xirc2ps_cs.c (busy_loop): Replace the code by a call to __udelay. * linux/pcmcia-cs/include/linux/init.h: Adapt to our Linux environment. * linux/pcmcia-cs/include/linux/slab.h: Use `#include', not `#include_next'. * linux/pcmcia-cs/include/pcmcia/mem_op.h: Adapt to our Linux environment and fix GCC 4.0 complaints. * linux/pcmcia-cs/include/pcmcia/version.h: Always assume that CONFIG_PCMCIA is not defined. * linux/pcmcia-cs/modules/cs.c (init_pcmcia_cs): Don't make it static. * linux/pcmcia-cs/modules/ds.c: Use some magic to avoid duplicate definition `io_req_t'. (ds_open, ds_release, ds_read, ds_write, ds_select, ds_poll, ds_fops): Hide functions if MACH is defined. Likewise for the module handling code. (ds_ioctl): Use plain `memcpy' if MACH is defined. (init_pcmcia_ds): Don't register charcater devices if MACH is defined. Include "../glue/ds.c". * linux/pcmcia-cs/modules/i82365.c (test_irq): Adapt to GNU Mach. (init_i82365): Don't make it static. * linux/pcmcia-cs/modules/pci_fixup.c (pci_devices): Don't define if MACH is defined. * linux/pcmcia-cs/wireless/orinoco.c: Adapt to our Linux environment. --- linux/pcmcia-cs/include/linux/init.h | 11 ++++------- linux/pcmcia-cs/include/linux/slab.h | 2 +- linux/pcmcia-cs/include/pcmcia/mem_op.h | 20 ++++++++++---------- linux/pcmcia-cs/include/pcmcia/version.h | 4 ---- 4 files changed, 15 insertions(+), 22 deletions(-) (limited to 'linux/pcmcia-cs/include') diff --git a/linux/pcmcia-cs/include/linux/init.h b/linux/pcmcia-cs/include/linux/init.h index dae55c2..06da72d 100644 --- a/linux/pcmcia-cs/include/linux/init.h +++ b/linux/pcmcia-cs/include/linux/init.h @@ -1,9 +1,6 @@ #ifndef _COMPAT_INIT_H #define _COMPAT_INIT_H -#include - -#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,3,0)) && defined(MODULE) #define __init #define __initdata #define __exit @@ -12,10 +9,10 @@ #define __devinitdata #define __devexit #define __devexitdata -#define module_init(x) int init_module(void) { return x(); } -#define module_exit(x) void cleanup_module(void) { x(); } -#else -#include_next + +#ifndef module_init +#define module_init(x) +#define module_exit(x) #endif #ifndef __devexit_p diff --git a/linux/pcmcia-cs/include/linux/slab.h b/linux/pcmcia-cs/include/linux/slab.h index 960d9c5..634084d 100644 --- a/linux/pcmcia-cs/include/linux/slab.h +++ b/linux/pcmcia-cs/include/linux/slab.h @@ -4,7 +4,7 @@ #include #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,2,0)) -#include_next +#include #else #include_next #endif diff --git a/linux/pcmcia-cs/include/pcmcia/mem_op.h b/linux/pcmcia-cs/include/pcmcia/mem_op.h index 6e7f795..9230faa 100644 --- a/linux/pcmcia-cs/include/pcmcia/mem_op.h +++ b/linux/pcmcia-cs/include/pcmcia/mem_op.h @@ -50,7 +50,7 @@ static inline void copy_pc_to_user(void *to, const void *from, size_t n) n -= odd; while (n) { put_user(readl_ns(from), (int *)to); - (char *)from += 4; (char *)to += 4; n -= 4; + from += 4; to += 4; n -= 4; } while (odd--) put_user(readb((char *)from++), (char *)to++); @@ -63,12 +63,12 @@ static inline void copy_user_to_pc(void *to, const void *from, size_t n) size_t odd = (n & 3); n -= odd; while (n) { - get_user(l, (int *)from); + l = get_user((int *)from); writel_ns(l, to); - (char *)to += 4; (char *)from += 4; n -= 4; + to += 4; from += 4; n -= 4; } while (odd--) { - get_user(c, (char *)from++); + c = get_user((char *)from++); writeb(c, (char *)to++); } } @@ -81,7 +81,7 @@ static inline void copy_from_pc(void *to, const void *from, size_t n) n -= odd; while (n) { *(u_short *)to = readw_ns(from); - (char *)to += 2; (char *)from += 2; n -= 2; + to += 2; from += 2; n -= 2; } if (odd) *(u_char *)to = readb(from); @@ -93,7 +93,7 @@ static inline void copy_to_pc(void *to, const void *from, size_t n) n -= odd; while (n) { writew_ns(*(u_short *)from, to); - (char *)to += 2; (char *)from += 2; n -= 2; + to += 2; from += 2; n -= 2; } if (odd) writeb(*(u_char *)from, to); @@ -105,7 +105,7 @@ static inline void copy_pc_to_user(void *to, const void *from, size_t n) n -= odd; while (n) { put_user(readw_ns(from), (short *)to); - (char *)to += 2; (char *)from += 2; n -= 2; + to += 2; from += 2; n -= 2; } if (odd) put_user(readb(from), (char *)to); @@ -118,12 +118,12 @@ static inline void copy_user_to_pc(void *to, const void *from, size_t n) size_t odd = (n & 1); n -= odd; while (n) { - get_user(s, (short *)from); + s = get_user((short *)from); writew_ns(s, to); - (char *)to += 2; (char *)from += 2; n -= 2; + to += 2; from += 2; n -= 2; } if (odd) { - get_user(c, (char *)from); + c = get_user((char *)from); writeb(c, to); } } diff --git a/linux/pcmcia-cs/include/pcmcia/version.h b/linux/pcmcia-cs/include/pcmcia/version.h index 7f67ee7..bc2aef3 100644 --- a/linux/pcmcia-cs/include/pcmcia/version.h +++ b/linux/pcmcia-cs/include/pcmcia/version.h @@ -5,9 +5,5 @@ #define VERSION(v,p,s) (((v)<<16)+(p<<8)+s) -#ifdef CONFIG_PCMCIA -#include_next -#else #define CS_RELEASE CS_PKG_RELEASE #define CS_RELEASE_CODE CS_PKG_RELEASE_CODE -#endif -- cgit v1.2.3