From 6c5d8a32ae2fecc1524670ec88334ca82b504539 Mon Sep 17 00:00:00 2001 From: Markus Lehtonen Date: Wed, 7 Jul 2010 09:45:18 -0700 Subject: [PATCH] --- yaml --- r: 202203 b: refs/heads/master c: dda7b73cdf9dc5bd52c3adad42cb5e6ab4639883 h: refs/heads/master i: 202201: 390c707298662a944c4271929a9e8da6bf4e9cab 202199: ccd1a3058f1fb8bca697a3cf3f77be501fe0db89 v: v3 --- [refs] | 2 +- trunk/drivers/input/misc/twl4030-pwrbutton.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 95fe6aba109a..bc7af93f37e6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 312e8e8a9e2471b0ada7366497fffb3ff1a40e2c +refs/heads/master: dda7b73cdf9dc5bd52c3adad42cb5e6ab4639883 diff --git a/trunk/drivers/input/misc/twl4030-pwrbutton.c b/trunk/drivers/input/misc/twl4030-pwrbutton.c index e9069b87fde2..f16972bddca4 100644 --- a/trunk/drivers/input/misc/twl4030-pwrbutton.c +++ b/trunk/drivers/input/misc/twl4030-pwrbutton.c @@ -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 @@ static int __devinit twl4030_pwrbutton_probe(struct platform_device *pdev) 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);