xircom init_etherdev conversion.

From: davej@codemonkey.org.uk
Date: Mon Mar 24 2003 - 11:41:51 EST


- Also cleans up some exit paths.

diff -urpN --exclude-from=/home/davej/.exclude bk-linus/drivers/net/tulip/xircom_cb.c linux-2.5/drivers/net/tulip/xircom_cb.c
--- bk-linus/drivers/net/tulip/xircom_cb.c 2003-03-08 09:57:19.000000000 +0000
+++ linux-2.5/drivers/net/tulip/xircom_cb.c 2003-02-25 14:07:53.000000000 +0000
@@ -249,32 +249,24 @@ static int __devinit xircom_probe(struct
            This way, we can fail gracefully if not enough memory
            is available.
          */
- private = kmalloc(sizeof(*private),GFP_KERNEL);
- memset(private, 0, sizeof(struct xircom_private));
+ if ((dev = init_etherdev(dev, sizeof(struct xircom_private))) == NULL) {
+ printk(KERN_ERR "xircom_probe: failed to allocate etherdev\n");
+ goto device_fail;
+ }
+ private = dev->priv;
         
         /* Allocate the send/receive buffers */
         private->rx_buffer = pci_alloc_consistent(pdev,8192,&private->rx_dma_handle);
-
         if (private->rx_buffer == NULL) {
                  printk(KERN_ERR "xircom_probe: no memory for rx buffer \n");
- kfree(private);
- return -ENODEV;
+ goto rx_buf_fail;
         }
         private->tx_buffer = pci_alloc_consistent(pdev,8192,&private->tx_dma_handle);
         if (private->tx_buffer == NULL) {
                 printk(KERN_ERR "xircom_probe: no memory for tx buffer \n");
- kfree(private->rx_buffer);
- kfree(private);
- return -ENODEV;
- }
- dev = init_etherdev(dev, 0);
- if (dev == NULL) {
- printk(KERN_ERR "xircom_probe: failed to allocate etherdev\n");
- kfree(private->rx_buffer);
- kfree(private->tx_buffer);
- kfree(private);
- return -ENODEV;
+ goto tx_buf_fail;
         }
+
         SET_MODULE_OWNER(dev);
         printk(KERN_INFO "%s: Xircom cardbus revision %i at irq %i \n", dev->name, chip_rev, pdev->irq);
 
@@ -304,14 +296,21 @@ static int __devinit xircom_probe(struct
         transceiver_voodoo(private);
         
         spin_lock_irqsave(&private->lock,flags);
- activate_transmitter(private);
- activate_receiver(private);
+ activate_transmitter(private);
+ activate_receiver(private);
         spin_unlock_irqrestore(&private->lock,flags);
         
         trigger_receive(private);
         
         leave("xircom_probe");
         return 0;
+
+tx_buf_fail:
+ kfree(private->rx_buffer);
+rx_buf_fail:
+ kfree(dev);
+device_fail:
+ return -ENODEV;
 }
 
 
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/



This archive was generated by hypermail 2b29 : Mon Mar 31 2003 - 22:00:16 EST