Browse Source

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>
Markus Armbruster 10 years ago
parent
commit
4c3b22459d
4 changed files with 6 additions and 6 deletions
  1. 2 1
      hw/net/lance.c
  2. 2 1
      hw/net/pcnet-pci.c
  3. 1 3
      hw/net/pcnet.c
  4. 1 1
      hw/net/pcnet.h

+ 2 - 1
hw/net/lance.c

@@ -126,7 +126,8 @@ static int lance_init(SysBusDevice *sbd)
 
 
     s->phys_mem_read = ledma_memory_read;
     s->phys_mem_read = ledma_memory_read;
     s->phys_mem_write = ledma_memory_write;
     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)
 static void lance_reset(DeviceState *dev)

+ 2 - 1
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->phys_mem_write = pci_physical_memory_write;
     s->dma_opaque = pci_dev;
     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)
 static void pci_reset(DeviceState *dev)

+ 1 - 3
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;
     int i;
     uint16_t checksum;
     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);
     *(uint16_t *)&s->prom[12] = cpu_to_le16(checksum);
 
 
     s->lnkst = 0x40; /* initial link state: up */
     s->lnkst = 0x40; /* initial link state: up */
-
-    return 0;
 }
 }

+ 1 - 1
hw/net/pcnet.h

@@ -63,6 +63,6 @@ uint32_t pcnet_bcr_readw(PCNetState *s, uint32_t rap);
 int pcnet_can_receive(NetClientState *nc);
 int pcnet_can_receive(NetClientState *nc);
 ssize_t pcnet_receive(NetClientState *nc, const uint8_t *buf, size_t size_);
 ssize_t pcnet_receive(NetClientState *nc, const uint8_t *buf, size_t size_);
 void pcnet_set_link_status(NetClientState *nc);
 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;
 extern const VMStateDescription vmstate_pcnet;
 #endif
 #endif