tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

KVM: ia64: remove redundant kvm_get_exit_data() NULL tests

kvm_get_exit_data() cannot return a NULL pointer.

Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
Signed-off-by: Avi Kivity <avi@redhat.com>

authored by

Roel Kluin and committed by
Marcelo Tosatti 0f0412c1 4610c83c

+13 -15
+13 -15
arch/ia64/kvm/kvm_fw.c
··· 75 75 struct exit_ctl_data *p; 76 76 77 77 p = kvm_get_exit_data(vcpu); 78 - if (p && p->exit_reason == EXIT_REASON_PAL_CALL) { 78 + if (p->exit_reason == EXIT_REASON_PAL_CALL) { 79 79 p->u.pal_data.ret = result; 80 80 return ; 81 81 } ··· 87 87 struct exit_ctl_data *p; 88 88 89 89 p = kvm_get_exit_data(vcpu); 90 - if (p && p->exit_reason == EXIT_REASON_SAL_CALL) { 90 + if (p->exit_reason == EXIT_REASON_SAL_CALL) { 91 91 p->u.sal_data.ret = result; 92 92 return ; 93 93 } ··· 322 322 struct exit_ctl_data *p; 323 323 324 324 p = kvm_get_exit_data(vcpu); 325 - if (p && (p->exit_reason == EXIT_REASON_PAL_CALL)) 325 + if (p->exit_reason == EXIT_REASON_PAL_CALL) 326 326 index = p->u.pal_data.gr28; 327 327 328 328 return index; ··· 646 646 647 647 p = kvm_get_exit_data(vcpu); 648 648 649 - if (p) { 650 - if (p->exit_reason == EXIT_REASON_SAL_CALL) { 651 - *in0 = p->u.sal_data.in0; 652 - *in1 = p->u.sal_data.in1; 653 - *in2 = p->u.sal_data.in2; 654 - *in3 = p->u.sal_data.in3; 655 - *in4 = p->u.sal_data.in4; 656 - *in5 = p->u.sal_data.in5; 657 - *in6 = p->u.sal_data.in6; 658 - *in7 = p->u.sal_data.in7; 659 - return ; 660 - } 649 + if (p->exit_reason == EXIT_REASON_SAL_CALL) { 650 + *in0 = p->u.sal_data.in0; 651 + *in1 = p->u.sal_data.in1; 652 + *in2 = p->u.sal_data.in2; 653 + *in3 = p->u.sal_data.in3; 654 + *in4 = p->u.sal_data.in4; 655 + *in5 = p->u.sal_data.in5; 656 + *in6 = p->u.sal_data.in6; 657 + *in7 = p->u.sal_data.in7; 658 + return ; 661 659 } 662 660 *in0 = 0; 663 661 }