[PATCH] vr41xx: convert to the new platform device interface

The patch does the following for v441xx seris drivers:

 - stop using platform_device_register_simple() as it is going away
 - mark ->probe() and ->remove() methods as __devinit and __devexit
   respectively
 - initialize "owner" field in driver structure so there is a link
   from /sys/modules to the driver
 - mark *_init() and *_exit() functions as __init and __exit

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 13 insertions, 6 deletions

diff --git a/drivers/char/vr41xx_giu.c b/drivers/char/vr41xx_giu.c
index 2267c7b81799..05e6e814d86f 100644
--- a/drivers/char/vr41xx_giu.c
+++ b/drivers/char/vr41xx_giu.c
@@ -613,7 +613,7 @@ static struct file_operations gpio_fops = {
         .release        = gpio_release,
 };
 
-static int giu_probe(struct platform_device *dev)
+static int __devinit giu_probe(struct platform_device *dev)
 {
         unsigned long start, size, flags = 0;
         unsigned int nr_pins = 0;
@@ -697,7 +697,7 @@ static int giu_probe(struct platform_device *dev)
         return cascade_irq(GIUINT_IRQ, giu_get_irq);
 }
 
-static int giu_remove(struct platform_device *dev)
+static int __devexit giu_remove(struct platform_device *dev)
 {
         iounmap(giu_base);
 
@@ -712,9 +712,10 @@ static struct platform_device *giu_platform_device;
 
 static struct platform_driver giu_device_driver = {
         .probe          = giu_probe,
-        .remove         = giu_remove,
+        .remove         = __devexit_p(giu_remove),
         .driver         = {
                 .name   = "GIU",
+                .owner  = THIS_MODULE,
         },
 };
 
@@ -722,9 +723,15 @@ static int __init vr41xx_giu_init(void)
 {
         int retval;
 
-        giu_platform_device = platform_device_register_simple("GIU", -1, NULL, 0);
-        if (IS_ERR(giu_platform_device))
-                return PTR_ERR(giu_platform_device);
+        giu_platform_device = platform_device_alloc("GIU", -1);
+        if (!giu_platform_device)
+                return -ENOMEM;
+
+        retval = platform_device_add(giu_platform_device);
+        if (retval < 0) {
+                platform_device_put(giu_platform_device);
+                return retval;
+        }
 
         retval = platform_driver_register(&giu_device_driver);
         if (retval < 0)