[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 04/10] pcnet: pcnet_common_init() always returns 0,
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH 04/10] pcnet: pcnet_common_init() always returns 0, change to void |
Date: |
Mon, 19 Jan 2015 15:52:31 +0100 |
The next commit will exploit the fact it never fails. This one makes
it obvious.
Signed-off-by: Markus Armbruster <address@hidden>
---
hw/net/lance.c | 3 ++-
hw/net/pcnet-pci.c | 3 ++-
hw/net/pcnet.c | 4 +---
hw/net/pcnet.h | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
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 b86bc0d..6e00884 100644
--- a/hw/net/pcnet-pci.c
+++ b/hw/net/pcnet-pci.c
@@ -327,7 +327,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 8a1c8f1..824ce65 100644
--- a/hw/net/pcnet.c
+++ b/hw/net/pcnet.c
@@ -1724,7 +1724,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;
@@ -1763,6 +1763,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;
}
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
--
1.9.3
- [Qemu-devel] [PATCH 00/10] pci: Partial conversion to realize, Markus Armbruster, 2015/01/19
- [Qemu-devel] [PATCH 02/10] pci: Permit incremental conversion of device models to realize, Markus Armbruster, 2015/01/19
- [Qemu-devel] [PATCH 04/10] pcnet: pcnet_common_init() always returns 0, change to void,
Markus Armbruster <=
- [Qemu-devel] [PATCH 07/10] ide/ich: Convert to realize, Markus Armbruster, 2015/01/19
- [Qemu-devel] [PATCH 09/10] qxl: Convert to realize, Markus Armbruster, 2015/01/19
- [Qemu-devel] [PATCH 01/10] pci: Convert core to realize, Markus Armbruster, 2015/01/19
- [Qemu-devel] [PATCH 06/10] serial-pci: Convert to realize, Markus Armbruster, 2015/01/19
- [Qemu-devel] [PATCH 10/10] pci-assign: Convert to realize, Markus Armbruster, 2015/01/19
- [Qemu-devel] [PATCH 03/10] pci: Trivial device model conversions to realize, Markus Armbruster, 2015/01/19
- [Qemu-devel] [PATCH 08/10] cirrus-vga: Convert to realize, Markus Armbruster, 2015/01/19
- [Qemu-devel] [PATCH 05/10] pcnet: Convert to realize, Markus Armbruster, 2015/01/19
- Re: [Qemu-devel] [PATCH 00/10] pci: Partial conversion to realize, Andreas Färber, 2015/01/19