Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 5 insertions, 9 deletions

diff --git a/drivers/atm/eni.c b/drivers/atm/eni.c
index 80f9f3659e4d..3230ea0df83c 100644
--- a/drivers/atm/eni.c
+++ b/drivers/atm/eni.c
@@ -1469,10 +1469,7 @@ if (eni_boards) printk(KERN_INFO "loss: %ld\n",ENI_DEV(eni_boards)->lost);
 
 static void bug_int(struct atm_dev *dev,unsigned long reason)
 {
-        struct eni_dev *eni_dev;
-
         DPRINTK(">bug_int\n");
-        eni_dev = ENI_DEV(dev);
         if (reason & MID_DMA_ERR_ACK)
                 printk(KERN_CRIT DEV_LABEL "(itf %d): driver error - DMA "
                     "error\n",dev->number);
@@ -1736,9 +1733,10 @@ static int __devinit eni_do_init(struct atm_dev *dev)
                 eprom = (base+EPROM_SIZE-sizeof(struct midway_eprom));
                 if (readl(&eprom->magic) != ENI155_MAGIC) {
                         printk("\n");
-                        printk(KERN_ERR KERN_ERR DEV_LABEL "(itf %d): bad "
-                            "magic - expected 0x%x, got 0x%x\n",dev->number,
-                            ENI155_MAGIC,(unsigned) readl(&eprom->magic));
+                        printk(KERN_ERR DEV_LABEL
+                               "(itf %d): bad magic - expected 0x%x, got 0x%x\n",
+                               dev->number, ENI155_MAGIC,
+                               (unsigned)readl(&eprom->magic));
                         error = -EINVAL;
                         goto unmap;
                 }
@@ -1899,7 +1897,6 @@ static void eni_close(struct atm_vcc *vcc)
 
 static int eni_open(struct atm_vcc *vcc)
 {
-        struct eni_dev *eni_dev;
         struct eni_vcc *eni_vcc;
         int error;
         short vpi = vcc->vpi;
@@ -1909,7 +1906,6 @@ static int eni_open(struct atm_vcc *vcc)
         EVENT("eni_open\n",0,0);
         if (!test_bit(ATM_VF_PARTIAL,&vcc->flags))
                 vcc->dev_data = NULL;
-        eni_dev = ENI_DEV(vcc->dev);
         if (vci != ATM_VPI_UNSPEC && vpi != ATM_VCI_UNSPEC)
                 set_bit(ATM_VF_ADDR,&vcc->flags);
         if (vcc->qos.aal != ATM_AAL0 && vcc->qos.aal != ATM_AAL5)
@@ -2243,7 +2239,7 @@ static int __devinit eni_init_one(struct pci_dev *pci_dev,
                     &zeroes);
                 if (!cpu_zeroes) goto out1;
         }
-        dev = atm_dev_register(DEV_LABEL,&ops,-1,NULL);
+        dev = atm_dev_register(DEV_LABEL, &pci_dev->dev, &ops, -1, NULL);
         if (!dev) goto out2;
         pci_set_drvdata(pci_dev, dev);
         eni_dev->pci_dev = pci_dev;