Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[safe/jmp/linux-2.6] / drivers / net / jazzsonic.c

diff --git a/drivers/net/jazzsonic.c b/drivers/net/jazzsonic.c
index 14248cf..3e6aaf9 100644 (file)
--- a/drivers/net/jazzsonic.c
+++ b/drivers/net/jazzsonic.c
@@ -22,11 +22,11 @@
 #include <linux/module.h>
 #include <linux/types.h>
 #include <linux/fcntl.h>
+#include <linux/gfp.h>
 #include <linux/interrupt.h>
 #include <linux/init.h>
 #include <linux/ioport.h>
 #include <linux/in.h>
-#include <linux/slab.h>
 #include <linux/string.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
@@ -35,6 +35,7 @@
 #include <linux/skbuff.h>
 #include <linux/platform_device.h>
 #include <linux/dma-mapping.h>
+#include <linux/slab.h>
 
 #include <asm/bootinfo.h>
 #include <asm/system.h>
@@ -81,7 +82,7 @@ static unsigned short known_revisions[] =
 
 static int jazzsonic_open(struct net_device* dev)
 {
-       if (request_irq(dev->irq, &sonic_interrupt, IRQF_DISABLED, "sonic", dev)) {
+       if (request_irq(dev->irq, sonic_interrupt, IRQF_DISABLED, "sonic", dev)) {
                printk(KERN_ERR "%s: unable to get IRQ %d.\n", dev->name, dev->irq);
                return -EAGAIN;
        }
@@ -96,7 +97,19 @@ static int jazzsonic_close(struct net_device* dev)
        return err;
 }
 
-static int __init sonic_probe1(struct net_device *dev)
+static const struct net_device_ops sonic_netdev_ops = {
+       .ndo_open               = jazzsonic_open,
+       .ndo_stop               = jazzsonic_close,
+       .ndo_start_xmit         = sonic_send_packet,
+       .ndo_get_stats          = sonic_get_stats,
+       .ndo_set_multicast_list = sonic_multicast_list,
+       .ndo_tx_timeout         = sonic_tx_timeout,
+       .ndo_change_mtu         = eth_change_mtu,
+       .ndo_validate_addr      = eth_validate_addr,
+       .ndo_set_mac_address    = eth_mac_addr,
+};
+
+static int __devinit sonic_probe1(struct net_device *dev)
 {
        static unsigned version_printed;
        unsigned int silicon_revision;
@@ -118,8 +131,8 @@ static int __init sonic_probe1(struct net_device *dev)
                printk("SONIC Silicon Revision = 0x%04x\n",silicon_revision);
 
        i = 0;
-       while (known_revisions[i] != 0xffff
-              && known_revisions[i] != silicon_revision)
+       while (known_revisions[i] != 0xffff &&
+              known_revisions[i] != silicon_revision)
                i++;
 
        if (known_revisions[i] == 0xffff) {
@@ -179,12 +192,7 @@ static int __init sonic_probe1(struct net_device *dev)
        lp->rra_laddr = lp->rda_laddr + (SIZEOF_SONIC_RD * SONIC_NUM_RDS
                             * SONIC_BUS_SCALE(lp->dma_bitmode));
 
-       dev->open = jazzsonic_open;
-       dev->stop = jazzsonic_close;
-       dev->hard_start_xmit = sonic_send_packet;
-       dev->get_stats = sonic_get_stats;
-       dev->set_multicast_list = &sonic_multicast_list;
-       dev->tx_timeout = sonic_tx_timeout;
+       dev->netdev_ops = &sonic_netdev_ops;
        dev->watchdog_timeo = TX_TIMEOUT;
 
        /*
@@ -196,7 +204,7 @@ static int __init sonic_probe1(struct net_device *dev)
 
        return 0;
 out:
-       release_region(dev->base_addr, SONIC_MEM_SIZE);
+       release_mem_region(dev->base_addr, SONIC_MEM_SIZE);
        return err;
 }
 
@@ -204,7 +212,7 @@ out:
  * Probe for a SONIC ethernet controller on a Mips Jazz board.
  * Actually probing is superfluous but we're paranoid.
  */
-static int __init jazz_sonic_probe(struct platform_device *pdev)
+static int __devinit jazz_sonic_probe(struct platform_device *pdev)
 {
        struct net_device *dev;
        struct sonic_local *lp;
@@ -222,6 +230,7 @@ static int __init jazz_sonic_probe(struct platform_device *pdev)
        lp = netdev_priv(dev);
        lp->device = &pdev->dev;
        SET_NETDEV_DEV(dev, &pdev->dev);
+       platform_set_drvdata(pdev, dev);
 
        netdev_boot_setup_check(dev);
 
@@ -239,7 +248,7 @@ static int __init jazz_sonic_probe(struct platform_device *pdev)
        return 0;
 
 out1:
-       release_region(dev->base_addr, SONIC_MEM_SIZE);
+       release_mem_region(dev->base_addr, SONIC_MEM_SIZE);
 out:
        free_netdev(dev);
 
@@ -261,7 +270,7 @@ static int __devexit jazz_sonic_device_remove (struct platform_device *pdev)
        unregister_netdev(dev);
        dma_free_coherent(lp->device, SIZEOF_SONIC_DESC * SONIC_BUS_SCALE(lp->dma_bitmode),
                          lp->descriptors, lp->descriptors_laddr);
-       release_region (dev->base_addr, SONIC_MEM_SIZE);
+       release_mem_region(dev->base_addr, SONIC_MEM_SIZE);
        free_netdev(dev);
 
        return 0;