Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-06 08:36:24 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Reserver the name 'err' for other purposes

Browse Source
This commit is contained in:
Gregory Nutt
2016-06-11 14:40:07 -06:00
parent 1cdc746726
commit 86b79b33cf
49 changed files with 374 additions and 380 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/net/e1000.c
+10 -10
View File
@@ -1089,7 +1089,7 @@ static int e1000_probe(uint16_t addr, pci_id_t id)
{
uint32_t mmio_base, mmio_size;
uint32_t size;
int err;
int errcode;
void *kmem;
void *omem;
struct e1000_dev *dev;
@@ -1107,7 +1107,7 @@ static int e1000_probe(uint16_t addr, pci_id_t id)
/* enable device */
if ((err = pci_enable_device(addr, PCI_BUS_MASTER)) < 0)
if ((errcode = pci_enable_device(addr, PCI_BUS_MASTER)) < 0)
{
goto error;
}
@@ -1120,8 +1120,8 @@ static int e1000_probe(uint16_t addr, pci_id_t id)
mmio_base = pci_resource_start(addr, 0);
mmio_size = pci_resource_len(addr, 0);
err = rgmp_memmap_nocache(mmio_base, mmio_size, mmio_base);
if (err)
errcode = rgmp_memmap_nocache(mmio_base, mmio_size, mmio_base);
if (errcode)
{
goto error;
}
@@ -1139,7 +1139,7 @@ static int e1000_probe(uint16_t addr, pci_id_t id)
dev->int_desc.handler = e1000_interrupt_handler;
dev->int_desc.dev_id = dev;
if ((err = pci_request_irq(addr, &dev->int_desc, 0)) < 0)
if ((errcode = pci_request_irq(addr, &dev->int_desc, 0)) < 0)
{
goto err0;
}
@@ -1164,7 +1164,7 @@ static int e1000_probe(uint16_t addr, pci_id_t id)
omem = kmem = memalign(PGSIZE, size);
if (kmem == NULL)
{
err = -ENOMEM;
errcode = -ENOMEM;
goto err1;
}
@@ -1211,8 +1211,8 @@ static int e1000_probe(uint16_t addr, pci_id_t id)
/* Register the device with the OS so that socket IOCTLs can be performed */
err = netdev_register(&dev->netdev, NET_LL_ETHERNET);
if (err)
errcode = netdev_register(&dev->netdev, NET_LL_ETHERNET);
if (errcode)
{
goto err2;
}
@@ -1234,8 +1234,8 @@ err0:
rgmp_memunmap(mmio_base, mmio_size);
error:
kmm_free(dev);
cprintf("e1000 device probe fail: %d\n", err);
return err;
cprintf("e1000 device probe fail: %d\n", errcode);
return errcode;
}
/****************************************************************************
drivers/net/vnet.c
+3 -3
View File
@@ -169,7 +169,7 @@ static int vnet_rmmac(struct net_driver_s *dev, FAR const uint8_t *mac);
static int vnet_transmit(FAR struct vnet_driver_s *vnet)
{
int err;
int errcode;
/* Verify that the hardware is ready to send another packet. If we get
* here, then we are committed to sending a packet; Higher level logic
@@ -178,8 +178,8 @@ static int vnet_transmit(FAR struct vnet_driver_s *vnet)
/* Send the packet: address=vnet->sk_dev.d_buf, length=vnet->sk_dev.d_len */
err = vnet_xmit(vnet->vnet, (char *)vnet->sk_dev.d_buf, vnet->sk_dev.d_len);
if (err)
errcode = vnet_xmit(vnet->vnet, (char *)vnet->sk_dev.d_buf, vnet->sk_dev.d_len);
if (errcode)
{
/* When vnet_xmit fail, it means TX buffer is full. Watchdog
* is of no use here because no TX done INT will happen. So