From patchwork Mon Mar 30 11:45:13 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 456080 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 0A7C41400A0 for ; Mon, 30 Mar 2015 22:48:13 +1100 (AEDT) Received: from localhost ([::1]:33257 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YcYAs-000234-VX for incoming@patchwork.ozlabs.org; Mon, 30 Mar 2015 07:48:11 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50054) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YcY8M-0005pP-HL for qemu-devel@nongnu.org; Mon, 30 Mar 2015 07:45:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YcY8C-0001tm-I7 for qemu-devel@nongnu.org; Mon, 30 Mar 2015 07:45:34 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56000) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YcY8C-0001ti-DF for qemu-devel@nongnu.org; Mon, 30 Mar 2015 07:45:24 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (Postfix) with ESMTPS id E4320C9B08; Mon, 30 Mar 2015 11:45:23 +0000 (UTC) Received: from donizetti.redhat.com (ovpn-112-40.ams2.redhat.com [10.36.112.40]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t2UBjILi017526; Mon, 30 Mar 2015 07:45:22 -0400 From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 30 Mar 2015 13:45:13 +0200 Message-Id: <1427715918-25768-2-git-send-email-pbonzini@redhat.com> In-Reply-To: <1427715918-25768-1-git-send-email-pbonzini@redhat.com> References: <1427715918-25768-1-git-send-email-pbonzini@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: peter.maydell@linaro.org, Mark Cave-Ayland Subject: [Qemu-devel] [PATCH for-2.3 1/6] sb16: remove useless mixer_write_indexw X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 Reviewed-by: Andreas Färber --- hw/audio/sb16.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/hw/audio/sb16.c b/hw/audio/sb16.c index 444eb9e..b052de5 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 },