diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2007-10-11 23:46:15 +0100 | 
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2007-10-11 23:46:15 +0100 | 
| commit | 49a89efbbbcc178a39555c43bd59a7593c429664 (patch) | |
| tree | 93ab78ec340d3f2fe23f9f853edd0bd62dcc64bb /arch/mips/kernel | |
| parent | 10cc3529072d5415fb040018a8a99aa7a60190b6 (diff) | |
| download | olio-linux-3.10-49a89efbbbcc178a39555c43bd59a7593c429664.tar.xz olio-linux-3.10-49a89efbbbcc178a39555c43bd59a7593c429664.zip  | |
[MIPS] Fix "no space between function name and open parenthesis" warnings.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/kernel')
| -rw-r--r-- | arch/mips/kernel/cpu-bugs64.c | 2 | ||||
| -rw-r--r-- | arch/mips/kernel/gdb-stub.c | 4 | ||||
| -rw-r--r-- | arch/mips/kernel/i8259.c | 2 | ||||
| -rw-r--r-- | arch/mips/kernel/irixelf.c | 32 | ||||
| -rw-r--r-- | arch/mips/kernel/irixinv.c | 42 | ||||
| -rw-r--r-- | arch/mips/kernel/irixioctl.c | 2 | ||||
| -rw-r--r-- | arch/mips/kernel/irq-msc01.c | 4 | ||||
| -rw-r--r-- | arch/mips/kernel/kspd.c | 10 | ||||
| -rw-r--r-- | arch/mips/kernel/linux32.c | 14 | ||||
| -rw-r--r-- | arch/mips/kernel/mips-mt.c | 2 | ||||
| -rw-r--r-- | arch/mips/kernel/process.c | 4 | ||||
| -rw-r--r-- | arch/mips/kernel/ptrace.c | 50 | ||||
| -rw-r--r-- | arch/mips/kernel/ptrace32.c | 16 | ||||
| -rw-r--r-- | arch/mips/kernel/signal32.c | 44 | ||||
| -rw-r--r-- | arch/mips/kernel/signal_n32.c | 4 | ||||
| -rw-r--r-- | arch/mips/kernel/smp-mt.c | 2 | ||||
| -rw-r--r-- | arch/mips/kernel/smtc.c | 4 | ||||
| -rw-r--r-- | arch/mips/kernel/syscall.c | 58 | ||||
| -rw-r--r-- | arch/mips/kernel/sysirix.c | 20 | ||||
| -rw-r--r-- | arch/mips/kernel/time.c | 2 | ||||
| -rw-r--r-- | arch/mips/kernel/traps.c | 26 | ||||
| -rw-r--r-- | arch/mips/kernel/unaligned.c | 2 | 
22 files changed, 173 insertions, 173 deletions
diff --git a/arch/mips/kernel/cpu-bugs64.c b/arch/mips/kernel/cpu-bugs64.c index 6648fde20b9..af78456d413 100644 --- a/arch/mips/kernel/cpu-bugs64.c +++ b/arch/mips/kernel/cpu-bugs64.c @@ -29,7 +29,7 @@ static inline void align_mod(const int align, const int mod)  		".endr\n\t"  		".set	pop"  		: -		: GCC_IMM_ASM (align), GCC_IMM_ASM (mod)); +		: GCC_IMM_ASM(align), GCC_IMM_ASM(mod));  }  static inline void mult_sh_align_mod(long *v1, long *v2, long *w, diff --git a/arch/mips/kernel/gdb-stub.c b/arch/mips/kernel/gdb-stub.c index cb5623aad55..989d06c3827 100644 --- a/arch/mips/kernel/gdb-stub.c +++ b/arch/mips/kernel/gdb-stub.c @@ -733,7 +733,7 @@ static int kgdb_smp_call_kgdb_wait(void)   * returns 1 if you should skip the instruction at the trap address, 0   * otherwise.   */ -void handle_exception (struct gdb_regs *regs) +void handle_exception(struct gdb_regs *regs)  {  	int trap;			/* Trap type */  	int sigval; @@ -917,7 +917,7 @@ void handle_exception (struct gdb_regs *regs)  				&& hexToInt(&ptr, &length)) {  				if (mem2hex((char *)addr, output_buffer, length, 1))  					break; -				strcpy (output_buffer, "E03"); +				strcpy(output_buffer, "E03");  			} else  				strcpy(output_buffer,"E01");  			break; diff --git a/arch/mips/kernel/i8259.c b/arch/mips/kernel/i8259.c index b6e5bb41b06..a860b21e63e 100644 --- a/arch/mips/kernel/i8259.c +++ b/arch/mips/kernel/i8259.c @@ -329,7 +329,7 @@ static struct resource pic2_io_resource = {   * driver compatibility reasons interrupts 0 - 15 to be the i8259   * interrupts even if the hardware uses a different interrupt numbering.   */ -void __init init_i8259_irqs (void) +void __init init_i8259_irqs(void)  {  	int i; diff --git a/arch/mips/kernel/irixelf.c b/arch/mips/kernel/irixelf.c index 403d96f99e7..e3b4b547a82 100644 --- a/arch/mips/kernel/irixelf.c +++ b/arch/mips/kernel/irixelf.c @@ -203,8 +203,8 @@ static unsigned long * create_irix_tables(char * p, int argc, int envc,  	 * Put the ELF interpreter info on the stack  	 */  #define NEW_AUX_ENT(nr, id, val) \ -	  __put_user ((id), sp+(nr*2)); \ -	  __put_user ((val), sp+(nr*2+1)); \ +	  __put_user((id), sp+(nr*2)); \ +	  __put_user((val), sp+(nr*2+1)); \  	sp -= 2;  	NEW_AUX_ENT(0, AT_NULL, 0); @@ -212,17 +212,17 @@ static unsigned long * create_irix_tables(char * p, int argc, int envc,  	if (exec) {  		sp -= 11*2; -		NEW_AUX_ENT (0, AT_PHDR, load_addr + exec->e_phoff); -		NEW_AUX_ENT (1, AT_PHENT, sizeof (struct elf_phdr)); -		NEW_AUX_ENT (2, AT_PHNUM, exec->e_phnum); -		NEW_AUX_ENT (3, AT_PAGESZ, ELF_EXEC_PAGESIZE); -		NEW_AUX_ENT (4, AT_BASE, interp_load_addr); -		NEW_AUX_ENT (5, AT_FLAGS, 0); -		NEW_AUX_ENT (6, AT_ENTRY, (elf_addr_t) exec->e_entry); -		NEW_AUX_ENT (7, AT_UID, (elf_addr_t) current->uid); -		NEW_AUX_ENT (8, AT_EUID, (elf_addr_t) current->euid); -		NEW_AUX_ENT (9, AT_GID, (elf_addr_t) current->gid); -		NEW_AUX_ENT (10, AT_EGID, (elf_addr_t) current->egid); +		NEW_AUX_ENT(0, AT_PHDR, load_addr + exec->e_phoff); +		NEW_AUX_ENT(1, AT_PHENT, sizeof(struct elf_phdr)); +		NEW_AUX_ENT(2, AT_PHNUM, exec->e_phnum); +		NEW_AUX_ENT(3, AT_PAGESZ, ELF_EXEC_PAGESIZE); +		NEW_AUX_ENT(4, AT_BASE, interp_load_addr); +		NEW_AUX_ENT(5, AT_FLAGS, 0); +		NEW_AUX_ENT(6, AT_ENTRY, (elf_addr_t) exec->e_entry); +		NEW_AUX_ENT(7, AT_UID, (elf_addr_t) current->uid); +		NEW_AUX_ENT(8, AT_EUID, (elf_addr_t) current->euid); +		NEW_AUX_ENT(9, AT_GID, (elf_addr_t) current->gid); +		NEW_AUX_ENT(10, AT_EGID, (elf_addr_t) current->egid);  	}  #undef NEW_AUX_ENT @@ -581,7 +581,7 @@ static void irix_map_prda_page(void)  	struct prda *pp;  	down_write(¤t->mm->mmap_sem); -	v =  do_brk (PRDA_ADDRESS, PAGE_SIZE); +	v =  do_brk(PRDA_ADDRESS, PAGE_SIZE);  	up_write(¤t->mm->mmap_sem);  	if (v < 0) @@ -815,7 +815,7 @@ out_free_interp:  	kfree(elf_interpreter);  out_free_file:  out_free_ph: -	kfree (elf_phdata); +	kfree(elf_phdata);  	goto out;  } @@ -1232,7 +1232,7 @@ static int irix_core_dump(long signr, struct pt_regs * regs, struct file *file)  	strlcpy(psinfo.pr_fname, current->comm, sizeof(psinfo.pr_fname));  	/* Try to dump the FPU. */ -	prstatus.pr_fpvalid = dump_fpu (regs, &fpu); +	prstatus.pr_fpvalid = dump_fpu(regs, &fpu);  	if (!prstatus.pr_fpvalid) {  		numnote--;  	} else { diff --git a/arch/mips/kernel/irixinv.c b/arch/mips/kernel/irixinv.c index de8584f6231..cf2dcd3d6a9 100644 --- a/arch/mips/kernel/irixinv.c +++ b/arch/mips/kernel/irixinv.c @@ -14,7 +14,7 @@ int inventory_items = 0;  static inventory_t inventory [MAX_INVENTORY]; -void add_to_inventory (int class, int type, int controller, int unit, int state) +void add_to_inventory(int class, int type, int controller, int unit, int state)  {  	inventory_t *ni = &inventory [inventory_items]; @@ -30,7 +30,7 @@ void add_to_inventory (int class, int type, int controller, int unit, int state)  	inventory_items++;  } -int dump_inventory_to_user (void __user *userbuf, int size) +int dump_inventory_to_user(void __user *userbuf, int size)  {  	inventory_t *inv  = &inventory [0];  	inventory_t __user *user = userbuf; @@ -45,7 +45,7 @@ int dump_inventory_to_user (void __user *userbuf, int size)  			return -EFAULT;  		user++;  	} -	return inventory_items * sizeof (inventory_t); +	return inventory_items * sizeof(inventory_t);  }  int __init init_inventory(void) @@ -55,24 +55,24 @@ int __init init_inventory(void)  	 * most likely this will not let just anyone run the X server  	 * until we put the right values all over the place  	 */ -	add_to_inventory (10, 3, 0, 0, 16400); -	add_to_inventory (1, 1, 150, -1, 12); -	add_to_inventory (1, 3, 0, 0, 8976); -	add_to_inventory (1, 2, 0, 0, 8976); -	add_to_inventory (4, 8, 0, 0, 2); -	add_to_inventory (5, 5, 0, 0, 1); -	add_to_inventory (3, 3, 0, 0, 32768); -	add_to_inventory (3, 4, 0, 0, 32768); -	add_to_inventory (3, 8, 0, 0, 524288); -	add_to_inventory (3, 9, 0, 0, 64); -	add_to_inventory (3, 1, 0, 0, 67108864); -	add_to_inventory (12, 3, 0, 0, 16); -	add_to_inventory (8, 7, 17, 0, 16777472); -	add_to_inventory (8, 0, 0, 0, 1); -	add_to_inventory (2, 1, 0, 13, 2); -	add_to_inventory (2, 2, 0, 2, 0); -	add_to_inventory (2, 2, 0, 1, 0); -	add_to_inventory (7, 14, 0, 0, 6); +	add_to_inventory(10, 3, 0, 0, 16400); +	add_to_inventory(1, 1, 150, -1, 12); +	add_to_inventory(1, 3, 0, 0, 8976); +	add_to_inventory(1, 2, 0, 0, 8976); +	add_to_inventory(4, 8, 0, 0, 2); +	add_to_inventory(5, 5, 0, 0, 1); +	add_to_inventory(3, 3, 0, 0, 32768); +	add_to_inventory(3, 4, 0, 0, 32768); +	add_to_inventory(3, 8, 0, 0, 524288); +	add_to_inventory(3, 9, 0, 0, 64); +	add_to_inventory(3, 1, 0, 0, 67108864); +	add_to_inventory(12, 3, 0, 0, 16); +	add_to_inventory(8, 7, 17, 0, 16777472); +	add_to_inventory(8, 0, 0, 0, 1); +	add_to_inventory(2, 1, 0, 13, 2); +	add_to_inventory(2, 2, 0, 2, 0); +	add_to_inventory(2, 2, 0, 1, 0); +	add_to_inventory(7, 14, 0, 0, 6);  	return 0;  } diff --git a/arch/mips/kernel/irixioctl.c b/arch/mips/kernel/irixioctl.c index 30f9eb09db3..2bde200d5ad 100644 --- a/arch/mips/kernel/irixioctl.c +++ b/arch/mips/kernel/irixioctl.c @@ -238,7 +238,7 @@ asmlinkage int irix_ioctl(int fd, unsigned long cmd, unsigned long arg)  		       current->comm, current->pid, cmd);  		do_exit(255);  #else -		error = sys_ioctl (fd, cmd, arg); +		error = sys_ioctl(fd, cmd, arg);  #endif  	} diff --git a/arch/mips/kernel/irq-msc01.c b/arch/mips/kernel/irq-msc01.c index 1ecdd50bfc6..4edc7e451d9 100644 --- a/arch/mips/kernel/irq-msc01.c +++ b/arch/mips/kernel/irq-msc01.c @@ -99,7 +99,7 @@ void ll_msc_irq(void)  }  void -msc_bind_eic_interrupt (unsigned int irq, unsigned int set) +msc_bind_eic_interrupt(unsigned int irq, unsigned int set)  {  	MSCIC_WRITE(MSC01_IC_RAMW,  		    (irq<<MSC01_IC_RAMW_ADDR_SHF) | (set<<MSC01_IC_RAMW_DATA_SHF)); @@ -130,7 +130,7 @@ void __init init_msc_irqs(unsigned long icubase, unsigned int irqbase, msc_irqma  {  	extern void (*board_bind_eic_interrupt)(unsigned int irq, unsigned int regset); -	_icctrl_msc = (unsigned long) ioremap (icubase, 0x40000); +	_icctrl_msc = (unsigned long) ioremap(icubase, 0x40000);  	/* Reset interrupt controller - initialises all registers to 0 */  	MSCIC_WRITE(MSC01_IC_RST, MSC01_IC_RST_RST_BIT); diff --git a/arch/mips/kernel/kspd.c b/arch/mips/kernel/kspd.c index cb9a14a1ca5..1ed17660654 100644 --- a/arch/mips/kernel/kspd.c +++ b/arch/mips/kernel/kspd.c @@ -118,11 +118,11 @@ struct apsp_table syscall_command_table[] = {  static int sp_syscall(int num, int arg0, int arg1, int arg2, int arg3)  { -	register long int _num  __asm__ ("$2") = num; -	register long int _arg0  __asm__ ("$4") = arg0; -	register long int _arg1  __asm__ ("$5") = arg1; -	register long int _arg2  __asm__ ("$6") = arg2; -	register long int _arg3  __asm__ ("$7") = arg3; +	register long int _num  __asm__("$2") = num; +	register long int _arg0  __asm__("$4") = arg0; +	register long int _arg1  __asm__("$5") = arg1; +	register long int _arg2  __asm__("$6") = arg2; +	register long int _arg3  __asm__("$7") = arg3;  	mm_segment_t old_fs; diff --git a/arch/mips/kernel/linux32.c b/arch/mips/kernel/linux32.c index 135d9a5fe33..a6de17081ca 100644 --- a/arch/mips/kernel/linux32.c +++ b/arch/mips/kernel/linux32.c @@ -300,13 +300,13 @@ asmlinkage int sys32_sched_rr_get_interval(compat_pid_t pid,  {  	struct timespec t;  	int ret; -	mm_segment_t old_fs = get_fs (); +	mm_segment_t old_fs = get_fs(); -	set_fs (KERNEL_DS); +	set_fs(KERNEL_DS);  	ret = sys_sched_rr_get_interval(pid, (struct timespec __user *)&t); -	set_fs (old_fs); +	set_fs(old_fs);  	if (put_user (t.tv_sec, &interval->tv_sec) || -	    __put_user (t.tv_nsec, &interval->tv_nsec)) +	    __put_user(t.tv_nsec, &interval->tv_nsec))  		return -EFAULT;  	return ret;  } @@ -314,7 +314,7 @@ asmlinkage int sys32_sched_rr_get_interval(compat_pid_t pid,  #ifdef CONFIG_SYSVIPC  asmlinkage long -sys32_ipc (u32 call, int first, int second, int third, u32 ptr, u32 fifth) +sys32_ipc(u32 call, int first, int second, int third, u32 ptr, u32 fifth)  {  	int version, err; @@ -373,7 +373,7 @@ sys32_ipc (u32 call, int first, int second, int third, u32 ptr, u32 fifth)  #else  asmlinkage long -sys32_ipc (u32 call, int first, int second, int third, u32 ptr, u32 fifth) +sys32_ipc(u32 call, int first, int second, int third, u32 ptr, u32 fifth)  {  	return -ENOSYS;  } @@ -505,7 +505,7 @@ asmlinkage int sys32_ustat(dev_t dev, struct ustat32 __user * ubuf32)  	set_fs(KERNEL_DS);  	err = sys_ustat(dev, (struct ustat __user *)&tmp); -	set_fs (old_fs); +	set_fs(old_fs);  	if (err)  		goto out; diff --git a/arch/mips/kernel/mips-mt.c b/arch/mips/kernel/mips-mt.c index 56750b02ab4..3d6b1ec1f32 100644 --- a/arch/mips/kernel/mips-mt.c +++ b/arch/mips/kernel/mips-mt.c @@ -236,7 +236,7 @@ void mips_mt_set_cpuoptions(void)  	if (oconfig7 != nconfig7) {  		__asm__ __volatile("sync");  		write_c0_config7(nconfig7); -		ehb (); +		ehb();  		printk("Config7: 0x%08x\n", read_c0_config7());  	} diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c index f99bb408543..11cb264f59c 100644 --- a/arch/mips/kernel/process.c +++ b/arch/mips/kernel/process.c @@ -202,13 +202,13 @@ void elf_dump_regs(elf_greg_t *gp, struct pt_regs *regs)  #endif  } -int dump_task_regs (struct task_struct *tsk, elf_gregset_t *regs) +int dump_task_regs(struct task_struct *tsk, elf_gregset_t *regs)  {  	elf_dump_regs(*regs, task_pt_regs(tsk));  	return 1;  } -int dump_task_fpu (struct task_struct *t, elf_fpregset_t *fpr) +int dump_task_fpu(struct task_struct *t, elf_fpregset_t *fpr)  {  	memcpy(fpr, &t->thread.fpu, sizeof(current->thread.fpu)); diff --git a/arch/mips/kernel/ptrace.c b/arch/mips/kernel/ptrace.c index bbd57b20b43..58aa6fec114 100644 --- a/arch/mips/kernel/ptrace.c +++ b/arch/mips/kernel/ptrace.c @@ -54,7 +54,7 @@ void ptrace_disable(struct task_struct *child)   * for 32-bit kernels and for 32-bit processes on a 64-bit kernel.   * Registers are sign extended to fill the available space.   */ -int ptrace_getregs (struct task_struct *child, __s64 __user *data) +int ptrace_getregs(struct task_struct *child, __s64 __user *data)  {  	struct pt_regs *regs;  	int i; @@ -65,13 +65,13 @@ int ptrace_getregs (struct task_struct *child, __s64 __user *data)  	regs = task_pt_regs(child);  	for (i = 0; i < 32; i++) -		__put_user (regs->regs[i], data + i); -	__put_user (regs->lo, data + EF_LO - EF_R0); -	__put_user (regs->hi, data + EF_HI - EF_R0); -	__put_user (regs->cp0_epc, data + EF_CP0_EPC - EF_R0); -	__put_user (regs->cp0_badvaddr, data + EF_CP0_BADVADDR - EF_R0); -	__put_user (regs->cp0_status, data + EF_CP0_STATUS - EF_R0); -	__put_user (regs->cp0_cause, data + EF_CP0_CAUSE - EF_R0); +		__put_user(regs->regs[i], data + i); +	__put_user(regs->lo, data + EF_LO - EF_R0); +	__put_user(regs->hi, data + EF_HI - EF_R0); +	__put_user(regs->cp0_epc, data + EF_CP0_EPC - EF_R0); +	__put_user(regs->cp0_badvaddr, data + EF_CP0_BADVADDR - EF_R0); +	__put_user(regs->cp0_status, data + EF_CP0_STATUS - EF_R0); +	__put_user(regs->cp0_cause, data + EF_CP0_CAUSE - EF_R0);  	return 0;  } @@ -81,7 +81,7 @@ int ptrace_getregs (struct task_struct *child, __s64 __user *data)   * the 64-bit format.  On a 32-bit kernel only the lower order half   * (according to endianness) will be used.   */ -int ptrace_setregs (struct task_struct *child, __s64 __user *data) +int ptrace_setregs(struct task_struct *child, __s64 __user *data)  {  	struct pt_regs *regs;  	int i; @@ -92,17 +92,17 @@ int ptrace_setregs (struct task_struct *child, __s64 __user *data)  	regs = task_pt_regs(child);  	for (i = 0; i < 32; i++) -		__get_user (regs->regs[i], data + i); -	__get_user (regs->lo, data + EF_LO - EF_R0); -	__get_user (regs->hi, data + EF_HI - EF_R0); -	__get_user (regs->cp0_epc, data + EF_CP0_EPC - EF_R0); +		__get_user(regs->regs[i], data + i); +	__get_user(regs->lo, data + EF_LO - EF_R0); +	__get_user(regs->hi, data + EF_HI - EF_R0); +	__get_user(regs->cp0_epc, data + EF_CP0_EPC - EF_R0);  	/* badvaddr, status, and cause may not be written.  */  	return 0;  } -int ptrace_getfpregs (struct task_struct *child, __u32 __user *data) +int ptrace_getfpregs(struct task_struct *child, __u32 __user *data)  {  	int i;  	unsigned int tmp; @@ -113,13 +113,13 @@ int ptrace_getfpregs (struct task_struct *child, __u32 __user *data)  	if (tsk_used_math(child)) {  		fpureg_t *fregs = get_fpu_regs(child);  		for (i = 0; i < 32; i++) -			__put_user (fregs[i], i + (__u64 __user *) data); +			__put_user(fregs[i], i + (__u64 __user *) data);  	} else {  		for (i = 0; i < 32; i++) -			__put_user ((__u64) -1, i + (__u64 __user *) data); +			__put_user((__u64) -1, i + (__u64 __user *) data);  	} -	__put_user (child->thread.fpu.fcr31, data + 64); +	__put_user(child->thread.fpu.fcr31, data + 64);  	preempt_disable();  	if (cpu_has_fpu) { @@ -142,12 +142,12 @@ int ptrace_getfpregs (struct task_struct *child, __u32 __user *data)  		tmp = 0;  	}  	preempt_enable(); -	__put_user (tmp, data + 65); +	__put_user(tmp, data + 65);  	return 0;  } -int ptrace_setfpregs (struct task_struct *child, __u32 __user *data) +int ptrace_setfpregs(struct task_struct *child, __u32 __user *data)  {  	fpureg_t *fregs;  	int i; @@ -158,9 +158,9 @@ int ptrace_setfpregs (struct task_struct *child, __u32 __user *data)  	fregs = get_fpu_regs(child);  	for (i = 0; i < 32; i++) -		__get_user (fregs[i], i + (__u64 __user *) data); +		__get_user(fregs[i], i + (__u64 __user *) data); -	__get_user (child->thread.fpu.fcr31, data + 64); +	__get_user(child->thread.fpu.fcr31, data + 64);  	/* FIR may not be written.  */ @@ -390,19 +390,19 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)  		}  	case PTRACE_GETREGS: -		ret = ptrace_getregs (child, (__u64 __user *) data); +		ret = ptrace_getregs(child, (__u64 __user *) data);  		break;  	case PTRACE_SETREGS: -		ret = ptrace_setregs (child, (__u64 __user *) data); +		ret = ptrace_setregs(child, (__u64 __user *) data);  		break;  	case PTRACE_GETFPREGS: -		ret = ptrace_getfpregs (child, (__u32 __user *) data); +		ret = ptrace_getfpregs(child, (__u32 __user *) data);  		break;  	case PTRACE_SETFPREGS: -		ret = ptrace_setfpregs (child, (__u32 __user *) data); +		ret = ptrace_setfpregs(child, (__u32 __user *) data);  		break;  	case PTRACE_SYSCALL: /* continue and stop at next (return from) syscall */ diff --git a/arch/mips/kernel/ptrace32.c b/arch/mips/kernel/ptrace32.c index d9a39c16945..f2bffed94fa 100644 --- a/arch/mips/kernel/ptrace32.c +++ b/arch/mips/kernel/ptrace32.c @@ -36,11 +36,11 @@  #include <asm/uaccess.h>  #include <asm/bootinfo.h> -int ptrace_getregs (struct task_struct *child, __s64 __user *data); -int ptrace_setregs (struct task_struct *child, __s64 __user *data); +int ptrace_getregs(struct task_struct *child, __s64 __user *data); +int ptrace_setregs(struct task_struct *child, __s64 __user *data); -int ptrace_getfpregs (struct task_struct *child, __u32 __user *data); -int ptrace_setfpregs (struct task_struct *child, __u32 __user *data); +int ptrace_getfpregs(struct task_struct *child, __u32 __user *data); +int ptrace_setfpregs(struct task_struct *child, __u32 __user *data);  /*   * Tracing a 32-bit process with a 64-bit strace and vice versa will not @@ -346,19 +346,19 @@ asmlinkage int sys32_ptrace(int request, int pid, int addr, int data)  		}  	case PTRACE_GETREGS: -		ret = ptrace_getregs (child, (__u64 __user *) (__u64) data); +		ret = ptrace_getregs(child, (__u64 __user *) (__u64) data);  		break;  	case PTRACE_SETREGS: -		ret = ptrace_setregs (child, (__u64 __user *) (__u64) data); +		ret = ptrace_setregs(child, (__u64 __user *) (__u64) data);  		break;  	case PTRACE_GETFPREGS: -		ret = ptrace_getfpregs (child, (__u32 __user *) (__u64) data); +		ret = ptrace_getfpregs(child, (__u32 __user *) (__u64) data);  		break;  	case PTRACE_SETFPREGS: -		ret = ptrace_setfpregs (child, (__u32 __user *) (__u64) data); +		ret = ptrace_setfpregs(child, (__u32 __user *) (__u64) data);  		break;  	case PTRACE_SYSCALL: /* continue and stop at next (return from) syscall */ diff --git a/arch/mips/kernel/signal32.c b/arch/mips/kernel/signal32.c index 64b612a0a62..572c610db1b 100644 --- a/arch/mips/kernel/signal32.c +++ b/arch/mips/kernel/signal32.c @@ -261,11 +261,11 @@ static inline int put_sigset(const sigset_t *kbuf, compat_sigset_t __user *ubuf)  	default:  		__put_sigset_unknown_nsig();  	case 2: -		err |= __put_user (kbuf->sig[1] >> 32, &ubuf->sig[3]); -		err |= __put_user (kbuf->sig[1] & 0xffffffff, &ubuf->sig[2]); +		err |= __put_user(kbuf->sig[1] >> 32, &ubuf->sig[3]); +		err |= __put_user(kbuf->sig[1] & 0xffffffff, &ubuf->sig[2]);  	case 1: -		err |= __put_user (kbuf->sig[0] >> 32, &ubuf->sig[1]); -		err |= __put_user (kbuf->sig[0] & 0xffffffff, &ubuf->sig[0]); +		err |= __put_user(kbuf->sig[0] >> 32, &ubuf->sig[1]); +		err |= __put_user(kbuf->sig[0] & 0xffffffff, &ubuf->sig[0]);  	}  	return err; @@ -283,12 +283,12 @@ static inline int get_sigset(sigset_t *kbuf, const compat_sigset_t __user *ubuf)  	default:  		__get_sigset_unknown_nsig();  	case 2: -		err |= __get_user (sig[3], &ubuf->sig[3]); -		err |= __get_user (sig[2], &ubuf->sig[2]); +		err |= __get_user(sig[3], &ubuf->sig[3]); +		err |= __get_user(sig[2], &ubuf->sig[2]);  		kbuf->sig[1] = sig[2] | (sig[3] << 32);  	case 1: -		err |= __get_user (sig[1], &ubuf->sig[1]); -		err |= __get_user (sig[0], &ubuf->sig[0]); +		err |= __get_user(sig[1], &ubuf->sig[1]); +		err |= __get_user(sig[0], &ubuf->sig[0]);  		kbuf->sig[0] = sig[0] | (sig[1] << 32);  	} @@ -412,10 +412,10 @@ asmlinkage int sys32_sigaltstack(nabi_no_regargs struct pt_regs regs)  			return -EFAULT;  	} -	set_fs (KERNEL_DS); +	set_fs(KERNEL_DS);  	ret = do_sigaltstack(uss ? (stack_t __user *)&kss : NULL,  			     uoss ? (stack_t __user *)&koss : NULL, usp); -	set_fs (old_fs); +	set_fs(old_fs);  	if (!ret && uoss) {  		if (!access_ok(VERIFY_WRITE, uoss, sizeof(*uoss))) @@ -559,9 +559,9 @@ asmlinkage void sys32_rt_sigreturn(nabi_no_regargs struct pt_regs regs)  	/* It is more difficult to avoid calling this function than to  	   call it and ignore errors.  */  	old_fs = get_fs(); -	set_fs (KERNEL_DS); +	set_fs(KERNEL_DS);  	do_sigaltstack((stack_t __user *)&st, NULL, regs.regs[29]); -	set_fs (old_fs); +	set_fs(old_fs);  	/*  	 * Don't let your children do this ... @@ -746,11 +746,11 @@ asmlinkage int sys32_rt_sigprocmask(int how, compat_sigset_t __user *set,  	if (set && get_sigset(&new_set, set))  		return -EFAULT; -	set_fs (KERNEL_DS); +	set_fs(KERNEL_DS);  	ret = sys_rt_sigprocmask(how, set ? (sigset_t __user *)&new_set : NULL,  				 oset ? (sigset_t __user *)&old_set : NULL,  				 sigsetsize); -	set_fs (old_fs); +	set_fs(old_fs);  	if (!ret && oset && put_sigset(&old_set, oset))  		return -EFAULT; @@ -765,9 +765,9 @@ asmlinkage int sys32_rt_sigpending(compat_sigset_t __user *uset,  	sigset_t set;  	mm_segment_t old_fs = get_fs(); -	set_fs (KERNEL_DS); +	set_fs(KERNEL_DS);  	ret = sys_rt_sigpending((sigset_t __user *)&set, sigsetsize); -	set_fs (old_fs); +	set_fs(old_fs);  	if (!ret && put_sigset(&set, uset))  		return -EFAULT; @@ -781,12 +781,12 @@ asmlinkage int sys32_rt_sigqueueinfo(int pid, int sig, compat_siginfo_t __user *  	int ret;  	mm_segment_t old_fs = get_fs(); -	if (copy_from_user (&info, uinfo, 3*sizeof(int)) || -	    copy_from_user (info._sifields._pad, uinfo->_sifields._pad, SI_PAD_SIZE)) +	if (copy_from_user(&info, uinfo, 3*sizeof(int)) || +	    copy_from_user(info._sifields._pad, uinfo->_sifields._pad, SI_PAD_SIZE))  		return -EFAULT; -	set_fs (KERNEL_DS); +	set_fs(KERNEL_DS);  	ret = sys_rt_sigqueueinfo(pid, sig, (siginfo_t __user *)&info); -	set_fs (old_fs); +	set_fs(old_fs);  	return ret;  } @@ -801,10 +801,10 @@ sys32_waitid(int which, compat_pid_t pid,  	mm_segment_t old_fs = get_fs();  	info.si_signo = 0; -	set_fs (KERNEL_DS); +	set_fs(KERNEL_DS);  	ret = sys_waitid(which, pid, (siginfo_t __user *) &info, options,  			 uru ? (struct rusage __user *) &ru : NULL); -	set_fs (old_fs); +	set_fs(old_fs);  	if (ret < 0 || info.si_signo == 0)  		return ret; diff --git a/arch/mips/kernel/signal_n32.c b/arch/mips/kernel/signal_n32.c index eb7e05926eb..bb277e82d42 100644 --- a/arch/mips/kernel/signal_n32.c +++ b/arch/mips/kernel/signal_n32.c @@ -88,7 +88,7 @@ struct rt_sigframe_n32 {  #endif	/* !ICACHE_REFILLS_WORKAROUND_WAR */ -extern void sigset_from_compat (sigset_t *set, compat_sigset_t *compat); +extern void sigset_from_compat(sigset_t *set, compat_sigset_t *compat);  asmlinkage int sysn32_rt_sigsuspend(nabi_no_regargs struct pt_regs regs)  { @@ -105,7 +105,7 @@ asmlinkage int sysn32_rt_sigsuspend(nabi_no_regargs struct pt_regs regs)  	unewset = (compat_sigset_t __user *) regs.regs[4];  	if (copy_from_user(&uset, unewset, sizeof(uset)))  		return -EFAULT; -	sigset_from_compat (&newset, &uset); +	sigset_from_compat(&newset, &uset);  	sigdelsetmask(&newset, ~_BLOCKABLE);  	spin_lock_irq(¤t->sighand->siglock); diff --git a/arch/mips/kernel/smp-mt.c b/arch/mips/kernel/smp-mt.c index 05dcce41632..94e210cc6cb 100644 --- a/arch/mips/kernel/smp-mt.c +++ b/arch/mips/kernel/smp-mt.c @@ -353,7 +353,7 @@ void core_send_ipi(int cpu, unsigned int action)  	unsigned long flags;  	int vpflags; -	local_irq_save (flags); +	local_irq_save(flags);  	vpflags = dvpe();	/* cant access the other CPU's registers whilst MVPE enabled */ diff --git a/arch/mips/kernel/smtc.c b/arch/mips/kernel/smtc.c index 4d1ac9692dc..770182887c5 100644 --- a/arch/mips/kernel/smtc.c +++ b/arch/mips/kernel/smtc.c @@ -372,7 +372,7 @@ void mipsmt_prepare_cpus(void)  	cpu++;  	/* Report on boot-time options */ -	mips_mt_set_cpuoptions (); +	mips_mt_set_cpuoptions();  	if (vpelimit > 0)  		printk("Limit of %d VPEs set\n", vpelimit);  	if (tclimit > 0) @@ -572,7 +572,7 @@ void smtc_init_secondary(void)  	if (((read_c0_tcbind() & TCBIND_CURTC) != 0) &&  	    ((read_c0_tcbind() & TCBIND_CURVPE)  	    != cpu_data[smp_processor_id() - 1].vpe_id)){ -		write_c0_compare (read_c0_count() + mips_hpt_frequency/HZ); +		write_c0_compare(read_c0_count() + mips_hpt_frequency/HZ);  	}  	local_irq_enable(); diff --git a/arch/mips/kernel/syscall.c b/arch/mips/kernel/syscall.c index 7c800ec3ff5..ef2c6360d05 100644 --- a/arch/mips/kernel/syscall.c +++ b/arch/mips/kernel/syscall.c @@ -314,8 +314,8 @@ asmlinkage int _sys_sysmips(int cmd, long arg1, int arg2, int arg3)   *   * This is really horribly ugly.   */ -asmlinkage int sys_ipc (unsigned int call, int first, int second, -			unsigned long third, void __user *ptr, long fifth) +asmlinkage int sys_ipc(unsigned int call, int first, int second, +		       unsigned long third, void __user *ptr, long fifth)  {  	int version, ret; @@ -324,26 +324,26 @@ asmlinkage int sys_ipc (unsigned int call, int first, int second,  	switch (call) {  	case SEMOP: -		return sys_semtimedop (first, (struct sembuf __user *)ptr, -		                       second, NULL); +		return sys_semtimedop(first, (struct sembuf __user *)ptr, +		                      second, NULL);  	case SEMTIMEDOP: -		return sys_semtimedop (first, (struct sembuf __user *)ptr, -				       second, -				       (const struct timespec __user *)fifth); +		return sys_semtimedop(first, (struct sembuf __user *)ptr, +				      second, +				      (const struct timespec __user *)fifth);  	case SEMGET: -		return sys_semget (first, second, third); +		return sys_semget(first, second, third);  	case SEMCTL: {  		union semun fourth;  		if (!ptr)  			return -EINVAL;  		if (get_user(fourth.__pad, (void __user *__user *) ptr))  			return -EFAULT; -		return sys_semctl (first, second, third, fourth); +		return sys_semctl(first, second, third, fourth);  	}  	case MSGSND: -		return sys_msgsnd (first, (struct msgbuf __user *) ptr, -				   second, third); +		return sys_msgsnd(first, (struct msgbuf __user *) ptr, +				  second, third);  	case MSGRCV:  		switch (version) {  		case 0: { @@ -353,45 +353,45 @@ asmlinkage int sys_ipc (unsigned int call, int first, int second,  			if (copy_from_user(&tmp,  					   (struct ipc_kludge __user *) ptr, -					   sizeof (tmp))) +					   sizeof(tmp)))  				return -EFAULT; -			return sys_msgrcv (first, tmp.msgp, second, -					   tmp.msgtyp, third); +			return sys_msgrcv(first, tmp.msgp, second, +					  tmp.msgtyp, third);  		}  		default: -			return sys_msgrcv (first, -					   (struct msgbuf __user *) ptr, -					   second, fifth, third); +			return sys_msgrcv(first, +					  (struct msgbuf __user *) ptr, +					  second, fifth, third);  		}  	case MSGGET: -		return sys_msgget ((key_t) first, second); +		return sys_msgget((key_t) first, second);  	case MSGCTL: -		return sys_msgctl (first, second, -				   (struct msqid_ds __user *) ptr); +		return sys_msgctl(first, second, +				  (struct msqid_ds __user *) ptr);  	case SHMAT:  		switch (version) {  		default: {  			unsigned long raddr; -			ret = do_shmat (first, (char __user *) ptr, second, -					&raddr); +			ret = do_shmat(first, (char __user *) ptr, second, +				       &raddr);  			if (ret)  				return ret; -			return put_user (raddr, (unsigned long __user *) third); +			return put_user(raddr, (unsigned long __user *) third);  		}  		case 1:	/* iBCS2 emulator entry point */  			if (!segment_eq(get_fs(), get_ds()))  				return -EINVAL; -			return do_shmat (first, (char __user *) ptr, second, -					 (unsigned long *) third); +			return do_shmat(first, (char __user *) ptr, second, +				        (unsigned long *) third);  		}  	case SHMDT: -		return sys_shmdt ((char __user *)ptr); +		return sys_shmdt((char __user *)ptr);  	case SHMGET: -		return sys_shmget (first, second, third); +		return sys_shmget(first, second, third);  	case SHMCTL: -		return sys_shmctl (first, second, -				   (struct shmid_ds __user *) ptr); +		return sys_shmctl(first, second, +				  (struct shmid_ds __user *) ptr);  	default:  		return -ENOSYS;  	} diff --git a/arch/mips/kernel/sysirix.c b/arch/mips/kernel/sysirix.c index 93a148486f8..b50239574c9 100644 --- a/arch/mips/kernel/sysirix.c +++ b/arch/mips/kernel/sysirix.c @@ -486,10 +486,10 @@ asmlinkage int irix_syssgi(struct pt_regs *regs)  		switch (arg1) {  		case SGI_INV_SIZEOF: -			retval = sizeof (inventory_t); +			retval = sizeof(inventory_t);  			break;  		case SGI_INV_READ: -			retval = dump_inventory_to_user (buffer, count); +			retval = dump_inventory_to_user(buffer, count);  			break;  		default:  			retval = -EINVAL; @@ -1042,9 +1042,9 @@ asmlinkage unsigned long irix_mmap32(unsigned long addr, size_t len, int prot,  			long max_size = offset + len;  			if (max_size > file->f_path.dentry->d_inode->i_size) { -				old_pos = sys_lseek (fd, max_size - 1, 0); -				sys_write (fd, (void __user *) "", 1); -				sys_lseek (fd, old_pos, 0); +				old_pos = sys_lseek(fd, max_size - 1, 0); +				sys_write(fd, (void __user *) "", 1); +				sys_lseek(fd, old_pos, 0);  			}  		}  	} @@ -1176,7 +1176,7 @@ static int irix_xstat32_xlate(struct kstat *stat, void __user *ubuf)  	ub.st_ctime1  = stat->atime.tv_nsec;  	ub.st_blksize = stat->blksize;  	ub.st_blocks  = stat->blocks; -	strcpy (ub.st_fstype, "efs"); +	strcpy(ub.st_fstype, "efs");  	return copy_to_user(ubuf, &ub, sizeof(ub)) ? -EFAULT : 0;  } @@ -1208,7 +1208,7 @@ static int irix_xstat64_xlate(struct kstat *stat, void __user *ubuf)  	ks.st_nlink = (u32) stat->nlink;  	ks.st_uid = (s32) stat->uid;  	ks.st_gid = (s32) stat->gid; -	ks.st_rdev = sysv_encode_dev (stat->rdev); +	ks.st_rdev = sysv_encode_dev(stat->rdev);  	ks.st_pad2[0] = ks.st_pad2[1] = 0;  	ks.st_size = (long long) stat->size;  	ks.st_pad3 = 0; @@ -1527,9 +1527,9 @@ asmlinkage int irix_mmap64(struct pt_regs *regs)  			long max_size = off2 + len;  			if (max_size > file->f_path.dentry->d_inode->i_size) { -				old_pos = sys_lseek (fd, max_size - 1, 0); -				sys_write (fd, (void __user *) "", 1); -				sys_lseek (fd, old_pos, 0); +				old_pos = sys_lseek(fd, max_size - 1, 0); +				sys_write(fd, (void __user *) "", 1); +				sys_lseek(fd, old_pos, 0);  			}  		}  	} diff --git a/arch/mips/kernel/time.c b/arch/mips/kernel/time.c index 369a5f9ad26..5892491b40e 100644 --- a/arch/mips/kernel/time.c +++ b/arch/mips/kernel/time.c @@ -149,7 +149,7 @@ EXPORT_SYMBOL_GPL(cp0_perfcount_irq);   * Possibly handle a performance counter interrupt.   * Return true if the timer interrupt should not be checked   */ -static inline int handle_perf_irq (int r2) +static inline int handle_perf_irq(int r2)  {  	/*  	 * The performance counter overflow interrupt may be shared with the diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c index ac762d8d802..b3e408b54c2 100644 --- a/arch/mips/kernel/traps.c +++ b/arch/mips/kernel/traps.c @@ -627,7 +627,7 @@ asmlinkage void do_fpe(struct pt_regs *regs, unsigned long fcr31)  		lose_fpu(1);  		/* Run the emulator */ -		sig = fpu_emulator_cop1Handler (regs, ¤t->thread.fpu, 1); +		sig = fpu_emulator_cop1Handler(regs, ¤t->thread.fpu, 1);  		/*  		 * We can't allow the emulated instruction to leave any of @@ -1165,11 +1165,11 @@ static void *set_vi_srs_handler(int n, vi_handler_t addr, int srs)  	if (cpu_has_veic) {  		if (board_bind_eic_interrupt) -			board_bind_eic_interrupt (n, srs); +			board_bind_eic_interrupt(n, srs);  	} else if (cpu_has_vint) {  		/* SRSMap is only defined if shadow sets are implemented */  		if (mips_srs_max() > 1) -			change_c0_srsmap (0xf << n*4, srs << n*4); +			change_c0_srsmap(0xf << n*4, srs << n*4);  	}  	if (srs == 0) { @@ -1198,10 +1198,10 @@ static void *set_vi_srs_handler(int n, vi_handler_t addr, int srs)  			 * Sigh... panicing won't help as the console  			 * is probably not configured :(  			 */ -			panic ("VECTORSPACING too small"); +			panic("VECTORSPACING too small");  		} -		memcpy (b, &except_vec_vi, handler_len); +		memcpy(b, &except_vec_vi, handler_len);  #ifdef CONFIG_MIPS_MT_SMTC  		BUG_ON(n > 7);	/* Vector index %d exceeds SMTC maximum. */ @@ -1370,9 +1370,9 @@ void __init per_cpu_trap_init(void)  #endif /* CONFIG_MIPS_MT_SMTC */  	if (cpu_has_veic || cpu_has_vint) { -		write_c0_ebase (ebase); +		write_c0_ebase(ebase);  		/* Setting vector spacing enables EI/VI mode  */ -		change_c0_intctl (0x3e0, VECTORSPACING); +		change_c0_intctl(0x3e0, VECTORSPACING);  	}  	if (cpu_has_divec) {  		if (cpu_has_mipsmt) { @@ -1390,8 +1390,8 @@ void __init per_cpu_trap_init(void)  	 *  o read IntCtl.IPPCI to determine the performance counter interrupt  	 */  	if (cpu_has_mips_r2) { -		cp0_compare_irq = (read_c0_intctl () >> 29) & 7; -		cp0_perfcount_irq = (read_c0_intctl () >> 26) & 7; +		cp0_compare_irq = (read_c0_intctl() >> 29) & 7; +		cp0_perfcount_irq = (read_c0_intctl() >> 26) & 7;  		if (cp0_perfcount_irq == cp0_compare_irq)  			cp0_perfcount_irq = -1;  	} else { @@ -1429,7 +1429,7 @@ void __init per_cpu_trap_init(void)  }  /* Install CPU exception handler */ -void __init set_handler (unsigned long offset, void *addr, unsigned long size) +void __init set_handler(unsigned long offset, void *addr, unsigned long size)  {  	memcpy((void *)(ebase + offset), addr, size);  	flush_icache_range(ebase + offset, ebase + offset + size); @@ -1439,7 +1439,7 @@ static char panic_null_cerr[] __initdata =  	"Trying to set NULL cache error exception handler";  /* Install uncached CPU exception handler */ -void __init set_uncached_handler (unsigned long offset, void *addr, unsigned long size) +void __init set_uncached_handler(unsigned long offset, void *addr, unsigned long size)  {  #ifdef CONFIG_32BIT  	unsigned long uncached_ebase = KSEG1ADDR(ebase); @@ -1470,7 +1470,7 @@ void __init trap_init(void)  	unsigned long i;  	if (cpu_has_veic || cpu_has_vint) -		ebase = (unsigned long) alloc_bootmem_low_pages (0x200 + VECTORSPACING*64); +		ebase = (unsigned long) alloc_bootmem_low_pages(0x200 + VECTORSPACING*64);  	else  		ebase = CAC_BASE; @@ -1496,7 +1496,7 @@ void __init trap_init(void)  	 * destination.  	 */  	if (cpu_has_ejtag && board_ejtag_handler_setup) -		board_ejtag_handler_setup (); +		board_ejtag_handler_setup();  	/*  	 * Only some CPUs have the watch exceptions. diff --git a/arch/mips/kernel/unaligned.c b/arch/mips/kernel/unaligned.c index d34b1fb3665..c327b21bca8 100644 --- a/arch/mips/kernel/unaligned.c +++ b/arch/mips/kernel/unaligned.c @@ -481,7 +481,7 @@ fault:  	if (fixup_exception(regs))  		return; -	die_if_kernel ("Unhandled kernel unaligned access", regs); +	die_if_kernel("Unhandled kernel unaligned access", regs);  	send_sig(SIGSEGV, current, 1);  	return;  |