From 269b66d93447ef31857d4b9bef85c3ff823db13c Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Sun, 11 Dec 2011 23:43:32 -0800 Subject: [PATCH] --- yaml --- r: 282399 b: refs/heads/master c: 18b2b1813f51a314d2468d0c103e593936e5f534 h: refs/heads/master i: 282397: cef21ebabaf820d0f10aa86de017f2e743f87b0b 282395: 4eec1f599426eddba07de1e25a108a3cebdf881b 282391: 0383821d11754fd7d73870537eeb5410e3e14d50 282383: e5c06d1cf25d2029cbbad19d6d15c3662ae913cd 282367: 77eaa2ac6484ab57bc2cebe05108de6e583bd6a3 v: v3 --- [refs] | 2 +- trunk/drivers/input/misc/mc13783-pwrbutton.c | 14 ++------------ 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/[refs] b/[refs] index bdd6082d8434..3274594f63ce 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ff4d049246727087ee797b6802e7c1bd4d5d172c +refs/heads/master: 18b2b1813f51a314d2468d0c103e593936e5f534 diff --git a/trunk/drivers/input/misc/mc13783-pwrbutton.c b/trunk/drivers/input/misc/mc13783-pwrbutton.c index 09b052288657..8428f1e8e83e 100644 --- a/trunk/drivers/input/misc/mc13783-pwrbutton.c +++ b/trunk/drivers/input/misc/mc13783-pwrbutton.c @@ -255,7 +255,7 @@ static int __devexit mc13783_pwrbutton_remove(struct platform_device *pdev) return 0; } -struct platform_driver mc13783_pwrbutton_driver = { +static struct platform_driver mc13783_pwrbutton_driver = { .probe = mc13783_pwrbutton_probe, .remove = __devexit_p(mc13783_pwrbutton_remove), .driver = { @@ -264,17 +264,7 @@ struct platform_driver mc13783_pwrbutton_driver = { }, }; -static int __init mc13783_pwrbutton_init(void) -{ - return platform_driver_register(&mc13783_pwrbutton_driver); -} -module_init(mc13783_pwrbutton_init); - -static void __exit mc13783_pwrbutton_exit(void) -{ - platform_driver_unregister(&mc13783_pwrbutton_driver); -} -module_exit(mc13783_pwrbutton_exit); +module_platform_driver(mc13783_pwrbutton_driver); MODULE_ALIAS("platform:mc13783-pwrbutton"); MODULE_DESCRIPTION("MC13783 Power Button");