[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 07/55] ide: simplify async_cmd_done callbacks
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL 07/55] ide: simplify async_cmd_done callbacks |
Date: |
Fri, 15 Aug 2014 18:06:14 +0100 |
From: Paolo Bonzini <address@hidden>
Drop the unused return value.
Signed-off-by: Paolo Bonzini <address@hidden>
Signed-off-by: John Snow <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
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;
};
--
1.9.3
- [Qemu-devel] [PULL 00/55] Block patches, Stefan Hajnoczi, 2014/08/15
- [Qemu-devel] [PULL 01/55] blkdebug: report errors on flush too, Stefan Hajnoczi, 2014/08/15
- [Qemu-devel] [PULL 02/55] libqtest: add QTEST_LOG for debugging qtest testcases, Stefan Hajnoczi, 2014/08/15
- [Qemu-devel] [PULL 03/55] ide-test: add test for werror=stop, Stefan Hajnoczi, 2014/08/15
- [Qemu-devel] [PULL 04/55] ide: stash aiocb for flushes, Stefan Hajnoczi, 2014/08/15
- [Qemu-devel] [PULL 05/55] ide: simplify reset callbacks, Stefan Hajnoczi, 2014/08/15
- [Qemu-devel] [PULL 06/55] ide: simplify set_inactive callbacks, Stefan Hajnoczi, 2014/08/15
- [Qemu-devel] [PULL 08/55] ide: simplify start_transfer callbacks, Stefan Hajnoczi, 2014/08/15
- [Qemu-devel] [PULL 07/55] ide: simplify async_cmd_done callbacks,
Stefan Hajnoczi <=
- [Qemu-devel] [PULL 09/55] ide: wrap start_dma callback, Stefan Hajnoczi, 2014/08/15
- [Qemu-devel] [PULL 11/55] ide: fold add_status callback into set_inactive, Stefan Hajnoczi, 2014/08/15
- [Qemu-devel] [PULL 10/55] ide: remove wrong setting of BM_STATUS_INT, Stefan Hajnoczi, 2014/08/15
- [Qemu-devel] [PULL 12/55] ide: move BM_STATUS bits to pci.[ch], Stefan Hajnoczi, 2014/08/15
- [Qemu-devel] [PULL 13/55] ide: move retry constants out of BM_STATUS_* namespace, Stefan Hajnoczi, 2014/08/15
- [Qemu-devel] [PULL 14/55] ahci: remove duplicate PORT_IRQ_* constants, Stefan Hajnoczi, 2014/08/15
- [Qemu-devel] [PULL 16/55] ide: make all commands go through cmd_done, Stefan Hajnoczi, 2014/08/15
- [Qemu-devel] [PULL 17/55] ahci: construct PIO Setup FIS for PIO commands, Stefan Hajnoczi, 2014/08/15
- [Qemu-devel] [PULL 15/55] ide: stop PIO transfer on errors, Stefan Hajnoczi, 2014/08/15
- [Qemu-devel] [PULL 18/55] q35: Enable the ioapic device to be seen by qtest., Stefan Hajnoczi, 2014/08/15