[IEEE80211]: Fix softmac lockdep reports.

[linux-2.6-omap-h63xx.git] / drivers / net / mipsnet.c

diff --git a/drivers/net/mipsnet.c b/drivers/net/mipsnet.c
index f42b9e201937928d156159419d2fd06320083954..d593175ab6f02e413474f4e6c0cddebb93414898 100644 (file)
--- a/drivers/net/mipsnet.c
+++ b/drivers/net/mipsnet.c
@@ -11,7 +11,6 @@
 #include <linux/module.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
-#include <linux/netdevice.h>
 #include <linux/platform_device.h>
 #include <asm/io.h>
 #include <asm/mips-boards/simint.h>
@@ -22,12 +21,6 @@
 
 #define mipsnet_reg_address(dev, field) (dev->base_addr + field_offset(field))
 
-struct mipsnet_priv {
-       struct net_device_stats stats;
-};
-
-static struct platform_device *mips_plat_dev;
-
 static char mipsnet_string[] = "mipsnet";
 
 /*
@@ -52,7 +45,6 @@ static inline ssize_t mipsnet_put_todevice(struct net_device *dev,
 {
        int count_to_go = skb->len;
        char *buf_ptr = skb->data;
-       struct mipsnet_priv *mp = netdev_priv(dev);
 
        pr_debug("%s: %s(): telling MIPSNET txDataCount(%d)\n",
                 dev->name, __FUNCTION__, skb->len);
@@ -66,8 +58,8 @@ static inline ssize_t mipsnet_put_todevice(struct net_device *dev,
                outb(*buf_ptr, mipsnet_reg_address(dev, txDataBuffer));
        }
 
-       mp->stats.tx_packets++;
-       mp->stats.tx_bytes += skb->len;
+       dev->stats.tx_packets++;
+       dev->stats.tx_bytes += skb->len;
 
        return skb->len;
 }
@@ -90,10 +82,9 @@ static inline ssize_t mipsnet_get_fromdev(struct net_device *dev, size_t count)
 {
        struct sk_buff *skb;
        size_t len = count;
-       struct mipsnet_priv *mp = netdev_priv(dev);
 
        if (!(skb = alloc_skb(len + 2, GFP_KERNEL))) {
-               mp->stats.rx_dropped++;
+               dev->stats.rx_dropped++;
                return -ENOMEM;
        }
 
@@ -101,7 +92,6 @@ static inline ssize_t mipsnet_get_fromdev(struct net_device *dev, size_t count)
        if (ioiocpy_frommipsnet(dev, skb_put(skb, len), len))
                return -EFAULT;
 
-       skb->dev = dev;
        skb->protocol = eth_type_trans(skb, dev);
        skb->ip_summed = CHECKSUM_UNNECESSARY;
 
@@ -109,8 +99,8 @@ static inline ssize_t mipsnet_get_fromdev(struct net_device *dev, size_t count)
                 dev->name, __FUNCTION__);
        netif_rx(skb);
 
-       mp->stats.rx_packets++;
-       mp->stats.rx_bytes += len;
+       dev->stats.rx_packets++;
+       dev->stats.rx_bytes += len;
 
        return count;
 }
@@ -207,13 +197,6 @@ static int mipsnet_close(struct net_device *dev)
        return 0;
 }
 
-static struct net_device_stats *mipsnet_get_stats(struct net_device *dev)
-{
-       struct mipsnet_priv *mp = netdev_priv(dev);
-
-       return &mp->stats;
-}
-
 static void mipsnet_set_mclist(struct net_device *dev)
 {
        // we don't do anything
@@ -225,7 +208,7 @@ static int __init mipsnet_probe(struct device *dev)
        struct net_device *netdev;
        int err;
 
-       netdev = alloc_etherdev(sizeof(struct mipsnet_priv));
+       netdev = alloc_etherdev(0);
        if (!netdev) {
                err = -ENOMEM;
                goto out;
@@ -236,14 +219,13 @@ static int __init mipsnet_probe(struct device *dev)
        netdev->open                    = mipsnet_open;
        netdev->stop                    = mipsnet_close;
        netdev->hard_start_xmit         = mipsnet_xmit;
-       netdev->get_stats               = mipsnet_get_stats;
        netdev->set_multicast_list      = mipsnet_set_mclist;
 
        /*
         * TODO: probe for these or load them from PARAM
         */
        netdev->base_addr = 0x4200;
-       netdev->irq = MIPSCPU_INT_BASE + MIPSCPU_INT_MB0 +
+       netdev->irq = MIPS_CPU_IRQ_BASE + MIPSCPU_INT_MB0 +
                      inl(mipsnet_reg_address(netdev, interruptInfo));
 
        // Get the io region now, get irq on open()
@@ -298,64 +280,17 @@ static struct device_driver mipsnet_driver = {
        .remove = __devexit_p(mipsnet_device_remove),
 };
 
-static void mipsnet_platform_release(struct device *device)
-{
-       struct platform_device *pldev;
-
-       /* free device */
-       pldev = to_platform_device(device);
-       kfree(pldev);
-}
-
 static int __init mipsnet_init_module(void)
 {
-       struct platform_device *pldev;
        int err;
 
        printk(KERN_INFO "MIPSNet Ethernet driver. Version: %s. "
               "(c)2005 MIPS Technologies, Inc.\n", MIPSNET_VERSION);
 
-       if (driver_register(&mipsnet_driver)) {
+       err = driver_register(&mipsnet_driver);
+       if (err)
                printk(KERN_ERR "Driver registration failed\n");
-               err = -ENODEV;
-               goto out;
-       }
 
-        if (!(pldev = kmalloc (sizeof (*pldev), GFP_KERNEL))) {
-               err = -ENOMEM;
-               goto out_unregister_driver;
-       }
-
-       memset (pldev, 0, sizeof (*pldev));
-       pldev->name             = mipsnet_string;
-       pldev->id               = 0;
-       pldev->dev.release      = mipsnet_platform_release;
-
-       if (platform_device_register(pldev)) {
-               err = -ENODEV;
-               goto out_free_pldev;
-       }
-
-        if (!pldev->dev.driver) {
-               /*
-                * The driver was not bound to this device, there was
-                 * no hardware at this address. Unregister it, as the
-                * release fuction will take care of freeing the
-                * allocated structure
-                */
-               platform_device_unregister (pldev);
-       }
-
-       mips_plat_dev           = pldev;
-
-       return 0;
-
-out_free_pldev:
-       kfree(pldev);
-
-out_unregister_driver:
-       driver_unregister(&mipsnet_driver);
-out:
        return err;
 }