MIPSnet: Modernize use platform_device API.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>

2 files changed, 4 insertions, 53 deletions

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 3e9b37055ea4..ee920ad1a5f5 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -486,8 +486,8 @@ config SGI_IOC3_ETH_HW_TX_CSUM
           enables offloading for checksums on transmit.  If unsure, say Y.
 
 config MIPS_SIM_NET
-        tristate "MIPS simulator Network device (EXPERIMENTAL)"
-        depends on MIPS_SIM && EXPERIMENTAL
+        tristate "MIPS simulator Network device"
+        depends on NET_ETHERNET && MIPS_SIM
         help
           The MIPSNET device is a simple Ethernet network device which is
           emulated by the MIPS Simulator.
diff --git a/drivers/net/mipsnet.c b/drivers/net/mipsnet.c
index 403f63afd201..638a279ec505 100644
--- a/drivers/net/mipsnet.c
+++ b/drivers/net/mipsnet.c
@@ -26,8 +26,6 @@ struct mipsnet_priv {
         struct net_device_stats stats;
 };
 
-static struct platform_device *mips_plat_dev;
-
 static char mipsnet_string[] = "mipsnet";
 
 /*
@@ -297,64 +295,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;
 }