pcnet: pcnet_common_init() always returns 0, change to void

The next commit will exploit the fact it never fails.  This one makes
it obvious.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Gonglei <arei.gonglei@huawei.com>

diff --git a/hw/net/lance.c b/hw/net/lance.c
index ff7e789563615a55172166ce012f2e090834fb9d..4baa0169e6d6936e9688daa67b573f3f254d49f4 100644 (file)
--- 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 5df79f0a1fcff4048132f87afb7c06ca9c6083a4..9677c1215af6779a971d83ef4bf229a3c934167e 100644 (file)
--- 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 7778b9ad4714517a598b6f11ceefb0ff910075dc..bdfd38f4ca88ce32404fb35ff032acf91a06ec46 100644 (file)
--- 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;
 }

diff --git a/hw/net/pcnet.h b/hw/net/pcnet.h
index 3f12fe3c1396b207bfb1cc4ceed4b8f34e6d12da..79c4c84f079fb61714bf849e372b5dfa688ebe32 100644 (file)
--- 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