diff options
Diffstat (limited to 'drivers/char/rio/rio_linux.h')
| -rw-r--r-- | drivers/char/rio/rio_linux.h | 57 |
1 files changed, 28 insertions, 29 deletions
diff --git a/drivers/char/rio/rio_linux.h b/drivers/char/rio/rio_linux.h index 1fba19d5b66..4ce77fb1fae 100644 --- a/drivers/char/rio/rio_linux.h +++ b/drivers/char/rio/rio_linux.h @@ -37,15 +37,15 @@ struct vpd_prom { - unsigned short id; - char hwrev; - char hwass; - int uniqid; - char myear; - char mweek; - char hw_feature[5]; - char oem_id; - char identifier[16]; + unsigned short id; + char hwrev; + char hwass; + int uniqid; + char myear; + char mweek; + char hw_feature[5]; + char oem_id; + char identifier[16]; }; @@ -75,13 +75,13 @@ struct vpd_prom { (L_ISIG(tty))) -#endif /* __KERNEL__ */ +#endif /* __KERNEL__ */ #define RIO_BOARD_INTR_LOCK 1 -#ifndef RIOCTL_MISC_MINOR +#ifndef RIOCTL_MISC_MINOR /* Allow others to gather this into "major.h" or something like that */ #define RIOCTL_MISC_MINOR 169 #endif @@ -121,39 +121,39 @@ struct vpd_prom { spin_unlock_irqrestore(sem, flags) #define rio_spin_lock(sem) \ - spin_lock(sem) + spin_lock(sem) #define rio_spin_unlock(sem) \ - spin_unlock(sem) + spin_unlock(sem) #endif #ifdef CONFIG_RIO_OLDPCI -static inline void *rio_memcpy_toio (void *dummy, void *dest, void *source, int n) +static inline void *rio_memcpy_toio(void *dummy, void *dest, void *source, int n) { - char *dst = dest; - char *src = source; + char *dst = dest; + char *src = source; - while (n--) { - writeb (*src++, dst++); - (void) readb (dummy); - } + while (n--) { + writeb(*src++, dst++); + (void) readb(dummy); + } - return dest; + return dest; } -static inline void *rio_memcpy_fromio (void *dest, void *source, int n) +static inline void *rio_memcpy_fromio(void *dest, void *source, int n) { - char *dst = dest; - char *src = source; + char *dst = dest; + char *src = source; - while (n--) - *dst++ = readb (src++); + while (n--) + *dst++ = readb(src++); - return dest; + return dest; } #else @@ -179,9 +179,8 @@ static inline void *rio_memcpy_fromio (void *dest, void *source, int n) #define func_exit() rio_dprintk (RIO_DEBUG_FLOW, "rio: exit %s\n", __FUNCTION__) #define func_enter2() rio_dprintk (RIO_DEBUG_FLOW, "rio: enter %s (port %d)\n",__FUNCTION__, port->line) #else -#define rio_dprintk(f, str...) /* nothing */ +#define rio_dprintk(f, str...) /* nothing */ #define func_enter() #define func_exit() #define func_enter2() #endif - |