MIPS: KVM: Trivial whitespace and style fixes

A bunch of misc whitespace and style fixes within arch/mips/kvm/.

Signed-off-by: James Hogan <james.hogan@imgtec.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Gleb Natapov <gleb@kernel.org>
Cc: kvm@vger.kernel.org
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/11883/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

5 files changed, 14 insertions, 15 deletions

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index a989e7635628..500110063a63 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -2027,7 +2027,8 @@ config KVM_GUEST
         bool "KVM Guest Kernel"
         depends on BROKEN_ON_SMP
         help
-          Select this option if building a guest kernel for KVM (Trap & Emulate) mode
+          Select this option if building a guest kernel for KVM (Trap & Emulate)
+          mode.
 
 config KVM_GUEST_TIMER_FREQ
         int "Count/Compare Timer Frequency (MHz)"
diff --git a/arch/mips/include/asm/kvm_host.h b/arch/mips/include/asm/kvm_host.h
index 6ded8d347af9..6a313157db83 100644
--- a/arch/mips/include/asm/kvm_host.h
+++ b/arch/mips/include/asm/kvm_host.h
@@ -58,7 +58,7 @@
 #define KVM_MAX_VCPUS           1
 #define KVM_USER_MEM_SLOTS      8
 /* memory slots that does not exposed to userspace */
-#define KVM_PRIVATE_MEM_SLOTS   0
+#define KVM_PRIVATE_MEM_SLOTS   0
 
 #define KVM_COALESCED_MMIO_PAGE_OFFSET 1
 #define KVM_HALT_POLL_NS_DEFAULT 500000
diff --git a/arch/mips/kvm/emulate.c b/arch/mips/kvm/emulate.c
index 41b1b090f56f..95b83a6582ef 100644
--- a/arch/mips/kvm/emulate.c
+++ b/arch/mips/kvm/emulate.c
@@ -1243,10 +1243,9 @@ enum emulation_result kvm_mips_emulate_CP0(uint32_t inst, uint32_t *opc,
 #ifdef KVM_MIPS_DEBUG_COP0_COUNTERS
                         cop0->stat[MIPS_CP0_STATUS][0]++;
 #endif
-                        if (rt != 0) {
+                        if (rt != 0)
                                 vcpu->arch.gprs[rt] =
                                     kvm_read_c0_guest_status(cop0);
-                        }
                         /* EI */
                         if (inst & 0x20) {
                                 kvm_debug("[%#lx] mfmcz_op: EI\n",
@@ -2583,9 +2582,8 @@ enum emulation_result kvm_mips_handle_tlbmiss(unsigned long cause,
          * an entry into the guest TLB.
          */
         index = kvm_mips_guest_tlb_lookup(vcpu,
-                                          (va & VPN2_MASK) |
-                                          (kvm_read_c0_guest_entryhi
-                                           (vcpu->arch.cop0) & ASID_MASK));
+                      (va & VPN2_MASK) |
+                      (kvm_read_c0_guest_entryhi(vcpu->arch.cop0) & ASID_MASK));
         if (index < 0) {
                 if (exccode == T_TLB_LD_MISS) {
                         er = kvm_mips_emulate_tlbmiss_ld(cause, opc, run, vcpu);
diff --git a/arch/mips/kvm/locore.S b/arch/mips/kvm/locore.S
index 7e2210846b8b..81687ab1b523 100644
--- a/arch/mips/kvm/locore.S
+++ b/arch/mips/kvm/locore.S
@@ -335,7 +335,7 @@ NESTED (MIPSX(GuestException), CALLFRAME_SIZ, ra)
 
         /* Now restore the host state just enough to run the handlers */
 
-        /* Swtich EBASE to the one used by Linux */
+        /* Switch EBASE to the one used by Linux */
         /* load up the host EBASE */
         mfc0    v0, CP0_STATUS
 
@@ -490,11 +490,11 @@ __kvm_mips_return_to_guest:
         REG_ADDU t3, t1, t2
         LONG_L  k0, (t3)
         andi    k0, k0, 0xff
-        mtc0    k0,CP0_ENTRYHI
+        mtc0    k0, CP0_ENTRYHI
         ehb
 
         /* Disable RDHWR access */
-        mtc0    zero,  CP0_HWRENA
+        mtc0    zero, CP0_HWRENA
 
         /* load the guest context from VCPU and return */
         LONG_L  $0, VCPU_R0(k1)
@@ -606,11 +606,11 @@ __kvm_mips_return_to_host:
 
         /* Restore RDHWR access */
         PTR_LI  k0, 0x2000000F
-        mtc0    k0,  CP0_HWRENA
+        mtc0    k0, CP0_HWRENA
 
         /* Restore RA, which is the address we will return to */
-        LONG_L  ra, PT_R31(k1)
-        j       ra
+        LONG_L  ra, PT_R31(k1)
+        j       ra
          nop
 
 VECTOR_END(MIPSX(GuestExceptionEnd))
diff --git a/arch/mips/kvm/tlb.c b/arch/mips/kvm/tlb.c
index aed0ac2a4972..3d3f22301a35 100644
--- a/arch/mips/kvm/tlb.c
+++ b/arch/mips/kvm/tlb.c
@@ -673,8 +673,8 @@ void kvm_arch_vcpu_load(struct kvm_vcpu *vcpu, int cpu)
 
         local_irq_save(flags);
 
-        if (((vcpu->arch.
-              guest_kernel_asid[cpu] ^ asid_cache(cpu)) & ASID_VERSION_MASK)) {
+        if ((vcpu->arch.guest_kernel_asid[cpu] ^ asid_cache(cpu)) &
+                                                        ASID_VERSION_MASK) {
                 kvm_get_new_mmu_context(&vcpu->arch.guest_kernel_mm, cpu, vcpu);
                 vcpu->arch.guest_kernel_asid[cpu] =
                     vcpu->arch.guest_kernel_mm.context.asid[cpu];