From patchwork Mon Aug 4 21:11:08 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Snow X-Patchwork-Id: 376447 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 DE08B1400E7 for ; Tue, 5 Aug 2014 07:14:51 +1000 (EST) Received: from localhost ([::1]:54534 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XEPaj-00081a-Vl for incoming@patchwork.ozlabs.org; Mon, 04 Aug 2014 17:14:50 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52094) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XEPY5-0003UK-7C for qemu-devel@nongnu.org; Mon, 04 Aug 2014 17:12:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XEPXy-0003ot-Do for qemu-devel@nongnu.org; Mon, 04 Aug 2014 17:12:04 -0400 Received: from mx1.redhat.com ([209.132.183.28]:5077) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XEPXy-0003ok-6D for qemu-devel@nongnu.org; Mon, 04 Aug 2014 17:11:58 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s74LBvOq003748 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 4 Aug 2014 17:11:57 -0400 Received: from dhcp-17-12.bos.redhat.com ([10.18.17.12]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s74LBpCk025996; Mon, 4 Aug 2014 17:11:57 -0400 From: John Snow To: qemu-devel@nongnu.org Date: Mon, 4 Aug 2014 17:11:08 -0400 Message-Id: <1407186691-16103-8-git-send-email-jsnow@redhat.com> In-Reply-To: <1407186691-16103-1-git-send-email-jsnow@redhat.com> References: <1407186691-16103-1-git-send-email-jsnow@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: pbonzini@redhat.com, jsnow@redhat.com, stefanha@redhat.com, mst@redhat.com Subject: [Qemu-devel] [PATCH v2 07/30] ide: simplify async_cmd_done callbacks 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 From: Paolo Bonzini Drop the unused return value. Signed-off-by: Paolo Bonzini Signed-off-by: John Snow --- hw/ide/ahci.c | 4 +--- hw/ide/internal.h | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c index 679357f..e494503 100644 --- a/hw/ide/ahci.c +++ b/hw/ide/ahci.c @@ -1116,7 +1116,7 @@ static int ahci_dma_add_status(IDEDMA *dma, int status) return 0; } -static int ahci_async_cmd_done(IDEDMA *dma) +static void ahci_async_cmd_done(IDEDMA *dma) { AHCIDevice *ad = DO_UPCAST(AHCIDevice, dma, dma); @@ -1130,8 +1130,6 @@ static int ahci_async_cmd_done(IDEDMA *dma) ad->check_bh = qemu_bh_new(ahci_check_cmd_bh, ad); qemu_bh_schedule(ad->check_bh); } - - return 0; } static void ahci_irq_set(void *opaque, int n, int level) diff --git a/hw/ide/internal.h b/hw/ide/internal.h index 34064cf..940dd45 100644 --- a/hw/ide/internal.h +++ b/hw/ide/internal.h @@ -434,7 +434,7 @@ struct IDEDMAOps { DMAIntFunc *set_unit; DMAIntFunc *add_status; DMAVoidFunc *set_inactive; - DMAFunc *async_cmd_done; + DMAVoidFunc *async_cmd_done; DMARestartFunc *restart_cb; DMAVoidFunc *reset; };