[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-trivial] [PULL 16/22] scsi/lsi53c895a: Remove unused lsi_mem_*() r
From: |
Michael Tokarev |
Subject: |
[Qemu-trivial] [PULL 16/22] scsi/lsi53c895a: Remove unused lsi_mem_*() return value |
Date: |
Sun, 4 Jun 2017 18:45:20 +0300 |
From: Mao Zhongyi <address@hidden>
lsi_mem_read/write() always return 0 about which their
callers actually don't care. Change the function type
to void.
Signed-off-by: Mao Zhongyi <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>
---
hw/scsi/lsi53c895a.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/hw/scsi/lsi53c895a.c b/hw/scsi/lsi53c895a.c
index 595c26017a..3e56ab267c 100644
--- a/hw/scsi/lsi53c895a.c
+++ b/hw/scsi/lsi53c895a.c
@@ -408,27 +408,25 @@ static void lsi_reg_writeb(LSIState *s, int offset,
uint8_t val);
static void lsi_execute_script(LSIState *s);
static void lsi_reselect(LSIState *s, lsi_request *p);
-static inline int lsi_mem_read(LSIState *s, dma_addr_t addr,
+static inline void lsi_mem_read(LSIState *s, dma_addr_t addr,
void *buf, dma_addr_t len)
{
if (s->dmode & LSI_DMODE_SIOM) {
address_space_read(&s->pci_io_as, addr, MEMTXATTRS_UNSPECIFIED,
buf, len);
- return 0;
} else {
- return pci_dma_read(PCI_DEVICE(s), addr, buf, len);
+ pci_dma_read(PCI_DEVICE(s), addr, buf, len);
}
}
-static inline int lsi_mem_write(LSIState *s, dma_addr_t addr,
+static inline void lsi_mem_write(LSIState *s, dma_addr_t addr,
const void *buf, dma_addr_t len)
{
if (s->dmode & LSI_DMODE_DIOM) {
address_space_write(&s->pci_io_as, addr, MEMTXATTRS_UNSPECIFIED,
buf, len);
- return 0;
} else {
- return pci_dma_write(PCI_DEVICE(s), addr, buf, len);
+ pci_dma_write(PCI_DEVICE(s), addr, buf, len);
}
}
--
2.11.0
- [Qemu-trivial] [PULL 22/22] hw/core: nmi.c can be compiled as common-obj nowadays, (continued)
- [Qemu-trivial] [PULL 22/22] hw/core: nmi.c can be compiled as common-obj nowadays, Michael Tokarev, 2017/06/04
- [Qemu-trivial] [PULL 04/22] docs/qdev-device-use.txt: update section Default Devices, Michael Tokarev, 2017/06/04
- [Qemu-trivial] [PULL 03/22] docs qemu-doc: Avoid ide-drive, it's deprecated, Michael Tokarev, 2017/06/04
- [Qemu-trivial] [PULL 20/22] dump: fix memory_mapping_filter leak, Michael Tokarev, 2017/06/04
- [Qemu-trivial] [PULL 15/22] qapi: Fix some QMP documentation regressions, Michael Tokarev, 2017/06/04
- [Qemu-trivial] [PULL 13/22] register: display register prefix (name) since it is available, Michael Tokarev, 2017/06/04
- [Qemu-trivial] [PULL 18/22] help: Add newline to end of thread option help text, Michael Tokarev, 2017/06/04
- [Qemu-trivial] [PULL 12/22] hw/sparc: use ARRAY_SIZE() macro, Michael Tokarev, 2017/06/04
- [Qemu-trivial] [PULL 06/22] configure: Detect native NetBSD curses(3), Michael Tokarev, 2017/06/04
- [Qemu-trivial] [PULL 09/22] block: Correct documentation for BLOCK_WRITE_THRESHOLD, Michael Tokarev, 2017/06/04
- [Qemu-trivial] [PULL 16/22] scsi/lsi53c895a: Remove unused lsi_mem_*() return value,
Michael Tokarev <=
- [Qemu-trivial] [PULL 21/22] ivshmem-server: ivshmem-client: Build when eventfd() is available, Michael Tokarev, 2017/06/04
- Re: [Qemu-trivial] [Qemu-devel] [PULL 00/22] Trivial patches for 2017-06-04, Peter Maydell, 2017/06/05