Input: twl4030-pwrbutton - replace __devinit with __init
authorMarkus Lehtonen <markus.lehtonen@nokia.com>
Wed, 7 Jul 2010 16:45:18 +0000 (09:45 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Fri, 9 Jul 2010 04:02:55 +0000 (21:02 -0700)
Power button is not hot-pluggable so we can save some memory by
using __init.

Signed-off-by: Markus Lehtonen <markus.lehtonen@nokia.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
drivers/input/misc/twl4030-pwrbutton.c

index e9069b87fde235f10ee810a9cdfb3eb79ed89df5..f16972bddca473b54f8388fe6ba2709b0b65dd77 100644 (file)
@@ -52,7 +52,7 @@ static irqreturn_t powerbutton_irq(int irq, void *_pwr)
        return IRQ_HANDLED;
 }
 
-static int __devinit twl4030_pwrbutton_probe(struct platform_device *pdev)
+static int __init twl4030_pwrbutton_probe(struct platform_device *pdev)
 {
        struct input_dev *pwr;
        int irq = platform_get_irq(pdev, 0);
@@ -95,7 +95,7 @@ free_input_dev:
        return err;
 }
 
-static int __devexit twl4030_pwrbutton_remove(struct platform_device *pdev)
+static int __exit twl4030_pwrbutton_remove(struct platform_device *pdev)
 {
        struct input_dev *pwr = platform_get_drvdata(pdev);
        int irq = platform_get_irq(pdev, 0);
@@ -106,9 +106,8 @@ static int __devexit twl4030_pwrbutton_remove(struct platform_device *pdev)
        return 0;
 }
 
-struct platform_driver twl4030_pwrbutton_driver = {
-       .probe          = twl4030_pwrbutton_probe,
-       .remove         = __devexit_p(twl4030_pwrbutton_remove),
+static struct platform_driver twl4030_pwrbutton_driver = {
+       .remove         = __exit_p(twl4030_pwrbutton_remove),
        .driver         = {
                .name   = "twl4030_pwrbutton",
                .owner  = THIS_MODULE,
@@ -117,7 +116,8 @@ struct platform_driver twl4030_pwrbutton_driver = {
 
 static int __init twl4030_pwrbutton_init(void)
 {
-       return platform_driver_register(&twl4030_pwrbutton_driver);
+       return platform_driver_probe(&twl4030_pwrbutton_driver,
+                       twl4030_pwrbutton_probe);
 }
 module_init(twl4030_pwrbutton_init);