fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / drivers / atm / eni.c

diff --git a/drivers/atm/eni.c b/drivers/atm/eni.c
index 78e34ee..5aab7bd 100644 (file)
--- a/drivers/atm/eni.c
+++ b/drivers/atm/eni.c
@@ -4,7 +4,6 @@
  
 
 #include <linux/module.h>
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/mm.h>
 #include <linux/pci.h>
@@ -59,7 +58,6 @@
  * - doesn't support OAM cells
  * - eni_put_free may hang if not putting memory fragments that _complete_
  *   2^n block (never happens in real life, though)
- * - keeps IRQ even if initialization fails
  */
 
 
@@ -538,7 +536,7 @@ static int rx_aal0(struct atm_vcc *vcc)
                return 0;
        }
        skb_put(skb,length);
-       skb->stamp = eni_vcc->timestamp;
+       skb_set_timestamp(skb, &eni_vcc->timestamp);
        DPRINTK("got len %ld\n",length);
        if (do_rx_dma(vcc,skb,1,length >> 2,length >> 2)) return 1;
        eni_vcc->rxing++;
@@ -1490,7 +1488,7 @@ static void bug_int(struct atm_dev *dev,unsigned long reason)
 }
 
 
-static irqreturn_t eni_int(int irq,void *dev_id,struct pt_regs *regs)
+static irqreturn_t eni_int(int irq,void *dev_id)
 {
        struct atm_dev *dev;
        struct eni_dev *eni_dev;
@@ -1799,25 +1797,25 @@ static int __devinit eni_start(struct atm_dev *dev)
 
        DPRINTK(">eni_start\n");
        eni_dev = ENI_DEV(dev);
-       if (request_irq(eni_dev->irq,&eni_int,SA_SHIRQ,DEV_LABEL,dev)) {
+       if (request_irq(eni_dev->irq,&eni_int,IRQF_SHARED,DEV_LABEL,dev)) {
                printk(KERN_ERR DEV_LABEL "(itf %d): IRQ%d is already in use\n",
                    dev->number,eni_dev->irq);
-               return -EAGAIN;
+               error = -EAGAIN;
+               goto out;
        }
-       /* @@@ should release IRQ on error */
        pci_set_master(eni_dev->pci_dev);
        if ((error = pci_write_config_word(eni_dev->pci_dev,PCI_COMMAND,
            PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER |
            (eni_dev->asic ? PCI_COMMAND_PARITY | PCI_COMMAND_SERR : 0)))) {
                printk(KERN_ERR DEV_LABEL "(itf %d): can't enable memory+"
                    "master (0x%02x)\n",dev->number,error);
-               return error;
+               goto free_irq;
        }
        if ((error = pci_write_config_byte(eni_dev->pci_dev,PCI_TONGA_CTRL,
            END_SWAP_DMA))) {
                printk(KERN_ERR DEV_LABEL "(itf %d): can't set endian swap "
                    "(0x%02x)\n",dev->number,error);
-               return error;
+               goto free_irq;
        }
        /* determine addresses of internal tables */
        eni_dev->vci = eni_dev->ram;
@@ -1834,12 +1832,13 @@ static int __devinit eni_start(struct atm_dev *dev)
        /* initialize memory management */
        buffer_mem = eni_dev->mem - (buf - eni_dev->ram);
        eni_dev->free_list_size = buffer_mem/MID_MIN_BUF_SIZE/2;
-       eni_dev->free_list = (struct eni_free *) kmalloc(
+       eni_dev->free_list = kmalloc(
            sizeof(struct eni_free)*(eni_dev->free_list_size+1),GFP_KERNEL);
        if (!eni_dev->free_list) {
                printk(KERN_ERR DEV_LABEL "(itf %d): couldn't get free page\n",
                    dev->number);
-               return -ENOMEM;
+               error = -ENOMEM;
+               goto free_irq;
        }
        eni_dev->free_len = 0;
        eni_put_free(eni_dev,buf,buffer_mem);
@@ -1855,17 +1854,26 @@ static int __devinit eni_start(struct atm_dev *dev)
         */
        eni_out(0xffffffff,MID_IE);
        error = start_tx(dev);
-       if (error) return error;
+       if (error) goto free_list;
        error = start_rx(dev);
-       if (error) return error;
+       if (error) goto free_list;
        error = dev->phy->start(dev);
-       if (error) return error;
+       if (error) goto free_list;
        eni_out(eni_in(MID_MC_S) | (1 << MID_INT_SEL_SHIFT) |
            MID_TX_LOCK_MODE | MID_DMA_ENABLE | MID_TX_ENABLE | MID_RX_ENABLE,
            MID_MC_S);
            /* Tonga uses SBus INTReq1 */
        (void) eni_in(MID_ISA); /* clear Midway interrupts */
        return 0;
+
+free_list:
+       kfree(eni_dev->free_list);
+
+free_irq:
+       free_irq(eni_dev->irq, eni_dev);
+
+out:
+       return error;
 }
 
 
@@ -2224,7 +2232,7 @@ static int __devinit eni_init_one(struct pci_dev *pci_dev,
                goto out0;
        }
 
-       eni_dev = (struct eni_dev *) kmalloc(sizeof(struct eni_dev),GFP_KERNEL);
+       eni_dev = kmalloc(sizeof(struct eni_dev),GFP_KERNEL);
        if (!eni_dev) goto out0;
        if (!cpu_zeroes) {
                cpu_zeroes = pci_alloc_consistent(pci_dev,ENI_ZEROES_SIZE,