Commit 4c3b2245 authored by Markus Armbruster's avatar Markus Armbruster Committed by Michael S. Tsirkin
Browse files

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: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Reviewed-by: default avatarGonglei <arei.gonglei@huawei.com>
parent 9af21dbe

hw/net/lance.c

+2 −1
Original line number Diff line number Diff line
@@ -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)

hw/net/pcnet-pci.c

+2 −1
Original line number Diff line number Diff line
@@ -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)

hw/net/pcnet.c

+1 −3
Original line number Diff line number Diff line
@@ -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;

}

hw/net/pcnet.h

+1 −1
Original line number Diff line number Diff line
@@ -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