From: Paolo Bonzini <pbonzini@redhat.com>
Date: Mon, 30 Mar 2015 10:34:17 +0000 (+0200)
Subject: sb16: remove useless mixer_write_indexw
X-Git-Tag: v2.4.0-rc0~155^2~12
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3337d0b2794131425d0b5cb525e67c5989f4a9dd;p=thirdparty%2Fqemu.git

sb16: remove useless mixer_write_indexw

ioport.c is already able to split a 16-bit access into two 8-bit
accesses to consecutive ports.  Tested with Epic Pinball.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---

diff --git a/hw/audio/sb16.c b/hw/audio/sb16.c
index 444eb9e419f..b052de5f7d9 100644
--- a/hw/audio/sb16.c
+++ b/hw/audio/sb16.c
@@ -1121,12 +1121,6 @@ static IO_WRITE_PROTO (mixer_write_datab)
     s->mixer_regs[s->mixer_nreg] = val;
 }
 
-static IO_WRITE_PROTO (mixer_write_indexw)
-{
-    mixer_write_indexb (opaque, nport, val & 0xff);
-    mixer_write_datab (opaque, nport, (val >> 8) & 0xff);
-}
-
 static IO_READ_PROTO (mixer_read)
 {
     SB16State *s = opaque;
@@ -1345,7 +1339,6 @@ static const VMStateDescription vmstate_sb16 = {
 
 static const MemoryRegionPortio sb16_ioport_list[] = {
     {  4, 1, 1, .write = mixer_write_indexb },
-    {  4, 1, 2, .write = mixer_write_indexw },
     {  5, 1, 1, .read = mixer_read, .write = mixer_write_datab },
     {  6, 1, 1, .read = dsp_read, .write = dsp_write },
     { 10, 1, 1, .read = dsp_read },