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);
        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);
        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,
 
 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);