[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 09/96] pcnet: pcnet_common_init() always returns 0, c
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 09/96] pcnet: pcnet_common_init() always returns 0, change to void |
Date: |
Wed, 18 Feb 2015 22:44:55 +0100 |
From: Markus Armbruster <address@hidden>
The next commit will exploit the fact it never fails. This one makes
it obvious.
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Gonglei <address@hidden>
---
hw/net/pcnet.h | 2 +-
hw/net/lance.c | 3 ++-
hw/net/pcnet-pci.c | 3 ++-
hw/net/pcnet.c | 4 +---
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/hw/net/pcnet.h b/hw/net/pcnet.h
index 3f12fe3..79c4c84 100644
--- a/hw/net/pcnet.h
+++ b/hw/net/pcnet.h
@@ -63,6 +63,6 @@ uint32_t pcnet_bcr_readw(PCNetState *s, uint32_t rap);
int pcnet_can_receive(NetClientState *nc);
ssize_t pcnet_receive(NetClientState *nc, const uint8_t *buf, size_t size_);
void pcnet_set_link_status(NetClientState *nc);
-int pcnet_common_init(DeviceState *dev, PCNetState *s, NetClientInfo *info);
+void pcnet_common_init(DeviceState *dev, PCNetState *s, NetClientInfo *info);
extern const VMStateDescription vmstate_pcnet;
#endif
diff --git a/hw/net/lance.c b/hw/net/lance.c
index ff7e789..4baa016 100644
--- a/hw/net/lance.c
+++ b/hw/net/lance.c
@@ -126,7 +126,8 @@ static int lance_init(SysBusDevice *sbd)
s->phys_mem_read = ledma_memory_read;
s->phys_mem_write = ledma_memory_write;
- return pcnet_common_init(dev, s, &net_lance_info);
+ pcnet_common_init(dev, s, &net_lance_info);
+ return 0;
}
static void lance_reset(DeviceState *dev)
diff --git a/hw/net/pcnet-pci.c b/hw/net/pcnet-pci.c
index 5df79f0..9677c12 100644
--- a/hw/net/pcnet-pci.c
+++ b/hw/net/pcnet-pci.c
@@ -316,7 +316,8 @@ static int pci_pcnet_init(PCIDevice *pci_dev)
s->phys_mem_write = pci_physical_memory_write;
s->dma_opaque = pci_dev;
- return pcnet_common_init(DEVICE(pci_dev), s, &net_pci_pcnet_info);
+ pcnet_common_init(DEVICE(pci_dev), s, &net_pci_pcnet_info);
+ return 0;
}
static void pci_reset(DeviceState *dev)
diff --git a/hw/net/pcnet.c b/hw/net/pcnet.c
index 7778b9a..bdfd38f 100644
--- a/hw/net/pcnet.c
+++ b/hw/net/pcnet.c
@@ -1712,7 +1712,7 @@ const VMStateDescription vmstate_pcnet = {
}
};
-int pcnet_common_init(DeviceState *dev, PCNetState *s, NetClientInfo *info)
+void pcnet_common_init(DeviceState *dev, PCNetState *s, NetClientInfo *info)
{
int i;
uint16_t checksum;
@@ -1751,6 +1751,4 @@ int pcnet_common_init(DeviceState *dev, PCNetState *s,
NetClientInfo *info)
*(uint16_t *)&s->prom[12] = cpu_to_le16(checksum);
s->lnkst = 0x40; /* initial link state: up */
-
- return 0;
}
--
MST
- [Qemu-devel] [PULL 00/96] pci, pc, virtio fixes and cleanups, Michael S. Tsirkin, 2015/02/18
- [Qemu-devel] [PULL 02/96] bios linker: validate pointer within table, Michael S. Tsirkin, 2015/02/18
- [Qemu-devel] [PULL 01/96] acpi-build: fix memory leak with bridge hp off, Michael S. Tsirkin, 2015/02/18
- [Qemu-devel] [PULL 03/96] acpi: move generic aml building helpers into dedictated file, Michael S. Tsirkin, 2015/02/18
- [Qemu-devel] [PULL 04/96] acpi: add build_append_namestring() helper, Michael S. Tsirkin, 2015/02/18
- [Qemu-devel] [PULL 05/96] acpi: drop min-bytes in build_package(), Michael S. Tsirkin, 2015/02/18
- [Qemu-devel] [PULL 06/96] pci: Convert core to realize, Michael S. Tsirkin, 2015/02/18
- [Qemu-devel] [PULL 07/96] pci: Permit incremental conversion of device models to realize, Michael S. Tsirkin, 2015/02/18
- [Qemu-devel] [PULL 08/96] pci: Trivial device model conversions to realize, Michael S. Tsirkin, 2015/02/18
- [Qemu-devel] [PULL 09/96] pcnet: pcnet_common_init() always returns 0, change to void,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 10/96] pcnet: Convert to realize, Michael S. Tsirkin, 2015/02/18
- [Qemu-devel] [PULL 11/96] serial-pci: Convert to realize, Michael S. Tsirkin, 2015/02/18
- [Qemu-devel] [PULL 12/96] ide/ich: Convert to realize, Michael S. Tsirkin, 2015/02/18
- [Qemu-devel] [PULL 13/96] cirrus-vga: Convert to realize, Michael S. Tsirkin, 2015/02/18
- [Qemu-devel] [PULL 14/96] qxl: Convert to realize, Michael S. Tsirkin, 2015/02/18
- [Qemu-devel] [PULL 15/96] pci-assign: Convert to realize, Michael S. Tsirkin, 2015/02/18
- [Qemu-devel] [PULL 17/96] acpi, pc: Add hotunplug request cb for pc machine., Michael S. Tsirkin, 2015/02/18
- [Qemu-devel] [PULL 16/96] qdev: Don't exit when running into bad -global, Michael S. Tsirkin, 2015/02/18
- [Qemu-devel] [PULL 18/96] acpi, ich9: Add hotunplug request cb for ich9., Michael S. Tsirkin, 2015/02/18
- [Qemu-devel] [PULL 19/96] acpi, pc: Add unplug cb for pc machine., Michael S. Tsirkin, 2015/02/18