From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55999) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xj1Jo-0000zy-Jd for qemu-devel@nongnu.org; Tue, 28 Oct 2014 03:36:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xj1Ji-0008He-Ef for qemu-devel@nongnu.org; Tue, 28 Oct 2014 03:35:52 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48957) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xj1Ji-0008HU-6Z for qemu-devel@nongnu.org; Tue, 28 Oct 2014 03:35:46 -0400 From: Markus Armbruster Date: Tue, 28 Oct 2014 08:35:33 +0100 Message-Id: <1414481739-19939-5-git-send-email-armbru@redhat.com> In-Reply-To: <1414481739-19939-1-git-send-email-armbru@redhat.com> References: <1414481739-19939-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH RFC 04/10] pcnet: pcnet_common_init() always returns 0, change to void List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, arei.gonglei@huawei.com, kraxel@redhat.com, afaerber@suse.de, mst@redhat.com The next commit will exploit the fact it never fails. This one makes it obvious. Signed-off-by: Markus Armbruster --- 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 a1c49f1..3663340 100644 --- a/hw/net/lance.c +++ b/hw/net/lance.c @@ -134,7 +134,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 fb5f5d6..50eb069 100644 --- a/hw/net/pcnet-pci.c +++ b/hw/net/pcnet-pci.c @@ -335,7 +335,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 d344c15..5a081c4 100644 --- a/hw/net/pcnet.c +++ b/hw/net/pcnet.c @@ -1724,7 +1724,7 @@ void pcnet_common_cleanup(PCNetState *d) d->nic = NULL; } -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 f8e8a6f..cfc196e 100644 --- a/hw/net/pcnet.h +++ b/hw/net/pcnet.h @@ -64,6 +64,6 @@ 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); void pcnet_common_cleanup(PCNetState *d); -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