From: David Hildenbrand <david@redhat.com>
Date: Fri, 7 Apr 2017 08:50:40 +0000 (+0200)
Subject: KVM: x86: simplify pic_ioport_read()
X-Git-Tag: v4.12-rc1~68^2~31
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b5e7cf52e102d267646af0ea3dc10a4fd4e51b7d;p=karo-tx-linux.git

KVM: x86: simplify pic_ioport_read()

Signed-off-by: David Hildenbrand <david@redhat.com>
Signed-off-by: Radim Krčmář <rkrcmar@redhat.com>
---

diff --git a/arch/x86/kvm/i8259.c b/arch/x86/kvm/i8259.c
index d481f3346eb5..bdcd4139eca9 100644
--- a/arch/x86/kvm/i8259.c
+++ b/arch/x86/kvm/i8259.c
@@ -417,19 +417,16 @@ static u32 pic_poll_read(struct kvm_kpic_state *s, u32 addr1)
 	return ret;
 }
 
-static u32 pic_ioport_read(void *opaque, u32 addr1)
+static u32 pic_ioport_read(void *opaque, u32 addr)
 {
 	struct kvm_kpic_state *s = opaque;
-	unsigned int addr;
 	int ret;
 
-	addr = addr1;
-	addr &= 1;
 	if (s->poll) {
-		ret = pic_poll_read(s, addr1);
+		ret = pic_poll_read(s, addr);
 		s->poll = 0;
 	} else
-		if (addr == 0)
+		if ((addr & 1) == 0)
 			if (s->read_reg_select)
 				ret = s->isr;
 			else