Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
  sparc64: Work around branch tracer warning.
  sparc64: Fix unsigned long long warnings in drivers.
  sparc64: Use unsigned long long for u64.
  sparc: refactor code in fault_32.c
  sparc64: refactor code in init_64.c
  sparc64: refactor code in viohs.c
  sparc: make proces_ver_nack a bit more readable

1 files changed, 12 insertions, 11 deletions

diff --git a/arch/sparc/kernel/ldc.c b/arch/sparc/kernel/ldc.c
index d68982330f66..6ce5d2598a09 100644
--- a/arch/sparc/kernel/ldc.c
+++ b/arch/sparc/kernel/ldc.c
@@ -625,22 +625,23 @@ static int process_ver_ack(struct ldc_channel *lp, struct ldc_version *vp)
 static int process_ver_nack(struct ldc_channel *lp, struct ldc_version *vp)
 {
         struct ldc_version *vap;
+        struct ldc_packet *p;
+        unsigned long new_tail;
 
-        if ((vp->major == 0 && vp->minor == 0) ||
-            !(vap = find_by_major(vp->major))) {
+        if (vp->major == 0 && vp->minor == 0)
+                return ldc_abort(lp);
+
+        vap = find_by_major(vp->major);
+        if (!vap)
                 return ldc_abort(lp);
-        } else {
-                struct ldc_packet *p;
-                unsigned long new_tail;
 
-                p = handshake_compose_ctrl(lp, LDC_INFO, LDC_VERS,
+        p = handshake_compose_ctrl(lp, LDC_INFO, LDC_VERS,
                                            vap, sizeof(*vap),
                                            &new_tail);
-                if (p)
-                        return send_tx_packet(lp, p, new_tail);
-                else
-                        return ldc_abort(lp);
-        }
+        if (!p)
+                return ldc_abort(lp);
+
+        return send_tx_packet(lp, p, new_tail);
 }
 
 static int process_version(struct ldc_channel *lp,