[src/trunk]: src/sys/arch/powerpc/ibm4xx Remove needless goto's. No functiona...

[rin <rin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/895aca3d8986
branches:  trunk
changeset: 819750:895aca3d8986
user:      rin <rin%NetBSD.org@localhost>
date:      Fri Dec 16 06:29:11 2016 +0000

description:
Remove needless goto's. No functional changes.

diffstat:

 sys/arch/powerpc/ibm4xx/trap.c |  17 ++++++++---------
 1 files changed, 8 insertions(+), 9 deletions(-)

diffs (66 lines):

diff -r 5022bba6b625 -r 895aca3d8986 sys/arch/powerpc/ibm4xx/trap.c
--- a/sys/arch/powerpc/ibm4xx/trap.c    Fri Dec 16 04:45:04 2016 +0000
+++ b/sys/arch/powerpc/ibm4xx/trap.c    Fri Dec 16 06:29:11 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: trap.c,v 1.67 2014/10/18 08:33:26 snj Exp $    */
+/*     $NetBSD: trap.c,v 1.68 2016/12/16 06:29:11 rin Exp $    */
 
 /*
  * Copyright 2001 Wasabi Systems, Inc.
@@ -67,7 +67,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.67 2014/10/18 08:33:26 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.68 2016/12/16 06:29:11 rin Exp $");
 
 #include "opt_altivec.h"
 #include "opt_ddb.h"
@@ -206,7 +206,7 @@
                        rv = uvm_fault(map, trunc_page(va), ftype);
                        pcb->pcb_onfault = fb;
                        if (rv == 0)
-                               goto done;
+                               return;
                        if (fb != NULL) {
                                tf->tf_pid = KERNEL_PID;
                                tf->tf_srr0 = fb->fb_pc;
@@ -217,7 +217,7 @@
                                tf->tf_fixreg[3] = 1; /* Return TRUE */
                                memcpy(&tf->tf_fixreg[13], fb->fb_fixreg,
                                    sizeof(fb->fb_fixreg));
-                               goto done;
+                               return;
                        }
                }
                goto brain_damage;
@@ -331,16 +331,17 @@
                                tf->tf_cr = fb->fb_cr;
                                memcpy(&tf->tf_fixreg[13], fb->fb_fixreg,
                                    sizeof(fb->fb_fixreg));
-                               goto done;
+                               return;
                        }
                }
                goto brain_damage;
+
        default:
- brain_damage:
+brain_damage:
                printf("trap type 0x%x at 0x%lx\n", type, tf->tf_srr0);
 #if defined(DDB) || defined(KGDB)
                if (kdb_trap(type, tf))
-                       goto done;
+                       return;
 #endif
 #ifdef TRAP_PANICWAIT
                printf("Press a key to panic.\n");
@@ -351,8 +352,6 @@
 
        /* Invoke MI userret code */
        mi_userret(l);
- done:
-       return;
 }
 
 int