orinoco: Replace net_device with orinoco_private in driver interfaces

[pandora-kernel.git] / drivers / net / wireless / orinoco / orinoco_nortel.c

diff --git a/drivers/net/wireless/orinoco/orinoco_nortel.c b/drivers/net/wireless/orinoco/orinoco_nortel.c
index b017262..4efd5a0 100644 (file)
--- a/drivers/net/wireless/orinoco/orinoco_nortel.c
+++ b/drivers/net/wireless/orinoco/orinoco_nortel.c
@@ -181,15 +181,15 @@ static int orinoco_nortel_init_one(struct pci_dev *pdev,
        }
 
        /* Allocate network device */
-       dev = alloc_orinocodev(sizeof(*card), &pdev->dev,
-                              orinoco_nortel_cor_reset, NULL);
-       if (!dev) {
+       priv = alloc_orinocodev(sizeof(*card), &pdev->dev,
+                               orinoco_nortel_cor_reset, NULL);
+       if (!priv) {
                printk(KERN_ERR PFX "Cannot allocate network device\n");
                err = -ENOMEM;
                goto fail_alloc;
        }
 
-       priv = netdev_priv(dev);
+       dev = priv->ndev;
        card = priv->card;
        card->bridge_io = bridge_io;
        card->attr_io = attr_io;
@@ -198,7 +198,7 @@ static int orinoco_nortel_init_one(struct pci_dev *pdev,
        hermes_struct_init(&priv->hw, hermes_io, HERMES_16BIT_REGSPACING);
 
        err = request_irq(pdev->irq, orinoco_interrupt, IRQF_SHARED,
-                         dev->name, dev);
+                         dev->name, priv);
        if (err) {
                printk(KERN_ERR PFX "Cannot allocate IRQ %d\n", pdev->irq);
                err = -EBUSY;
@@ -223,18 +223,18 @@ static int orinoco_nortel_init_one(struct pci_dev *pdev,
                goto fail;
        }
 
-       pci_set_drvdata(pdev, dev);
+       pci_set_drvdata(pdev, priv);
        printk(KERN_DEBUG "%s: " DRIVER_NAME " at %s\n", dev->name,
               pci_name(pdev));
 
        return 0;
 
  fail:
-       free_irq(pdev->irq, dev);
+       free_irq(pdev->irq, priv);
 
  fail_irq:
        pci_set_drvdata(pdev, NULL);
-       free_orinocodev(dev);
+       free_orinocodev(priv);
 
  fail_alloc:
        pci_iounmap(pdev, hermes_io);
@@ -256,17 +256,17 @@ static int orinoco_nortel_init_one(struct pci_dev *pdev,
 
 static void __devexit orinoco_nortel_remove_one(struct pci_dev *pdev)
 {
-       struct net_device *dev = pci_get_drvdata(pdev);
-       struct orinoco_private *priv = netdev_priv(dev);
+       struct orinoco_private *priv = pci_get_drvdata(pdev);
+       struct net_device *dev = priv->ndev;
        struct orinoco_pci_card *card = priv->card;
 
        /* Clear LEDs */
        iowrite16(0, card->bridge_io + 10);
 
        unregister_netdev(dev);
-       free_irq(pdev->irq, dev);
+       free_irq(pdev->irq, priv);
        pci_set_drvdata(pdev, NULL);
-       free_orinocodev(dev);
+       free_orinocodev(priv);
        pci_iounmap(pdev, priv->hw.iobase);
        pci_iounmap(pdev, card->attr_io);
        pci_iounmap(pdev, card->bridge_io);