diff options
| author | Markus Lehtonen <markus.lehtonen@nokia.com> | 2010-07-07 12:45:18 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-07-09 00:02:55 -0400 |
| commit | dda7b73cdf9dc5bd52c3adad42cb5e6ab4639883 (patch) | |
| tree | 4af98e19066bcc144e783ba0d8f35c5c26214865 | |
| parent | 312e8e8a9e2471b0ada7366497fffb3ff1a40e2c (diff) | |
Input: twl4030-pwrbutton - replace __devinit with __init
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>
| -rw-r--r-- | drivers/input/misc/twl4030-pwrbutton.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/input/misc/twl4030-pwrbutton.c b/drivers/input/misc/twl4030-pwrbutton.c index e9069b87fde2..f16972bddca4 100644 --- a/drivers/input/misc/twl4030-pwrbutton.c +++ b/drivers/input/misc/twl4030-pwrbutton.c | |||
| @@ -52,7 +52,7 @@ static irqreturn_t powerbutton_irq(int irq, void *_pwr) | |||
| 52 | return IRQ_HANDLED; | 52 | return IRQ_HANDLED; |
| 53 | } | 53 | } |
| 54 | 54 | ||
| 55 | static int __devinit twl4030_pwrbutton_probe(struct platform_device *pdev) | 55 | static int __init twl4030_pwrbutton_probe(struct platform_device *pdev) |
| 56 | { | 56 | { |
| 57 | struct input_dev *pwr; | 57 | struct input_dev *pwr; |
| 58 | int irq = platform_get_irq(pdev, 0); | 58 | int irq = platform_get_irq(pdev, 0); |
| @@ -95,7 +95,7 @@ free_input_dev: | |||
| 95 | return err; | 95 | return err; |
| 96 | } | 96 | } |
| 97 | 97 | ||
| 98 | static int __devexit twl4030_pwrbutton_remove(struct platform_device *pdev) | 98 | static int __exit twl4030_pwrbutton_remove(struct platform_device *pdev) |
| 99 | { | 99 | { |
| 100 | struct input_dev *pwr = platform_get_drvdata(pdev); | 100 | struct input_dev *pwr = platform_get_drvdata(pdev); |
| 101 | int irq = platform_get_irq(pdev, 0); | 101 | int irq = platform_get_irq(pdev, 0); |
| @@ -106,9 +106,8 @@ static int __devexit twl4030_pwrbutton_remove(struct platform_device *pdev) | |||
| 106 | return 0; | 106 | return 0; |
| 107 | } | 107 | } |
| 108 | 108 | ||
| 109 | struct platform_driver twl4030_pwrbutton_driver = { | 109 | static struct platform_driver twl4030_pwrbutton_driver = { |
| 110 | .probe = twl4030_pwrbutton_probe, | 110 | .remove = __exit_p(twl4030_pwrbutton_remove), |
| 111 | .remove = __devexit_p(twl4030_pwrbutton_remove), | ||
| 112 | .driver = { | 111 | .driver = { |
| 113 | .name = "twl4030_pwrbutton", | 112 | .name = "twl4030_pwrbutton", |
| 114 | .owner = THIS_MODULE, | 113 | .owner = THIS_MODULE, |
| @@ -117,7 +116,8 @@ struct platform_driver twl4030_pwrbutton_driver = { | |||
| 117 | 116 | ||
| 118 | static int __init twl4030_pwrbutton_init(void) | 117 | static int __init twl4030_pwrbutton_init(void) |
| 119 | { | 118 | { |
| 120 | return platform_driver_register(&twl4030_pwrbutton_driver); | 119 | return platform_driver_probe(&twl4030_pwrbutton_driver, |
| 120 | twl4030_pwrbutton_probe); | ||
| 121 | } | 121 | } |
| 122 | module_init(twl4030_pwrbutton_init); | 122 | module_init(twl4030_pwrbutton_init); |
| 123 | 123 | ||
