diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-01-05 01:18:22 -0500 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-01-05 01:19:47 -0500 |
commit | 9fea929121935957b4045282fff973d966a98f06 (patch) | |
tree | 56045261f826cc3773cec67eb983dd83216f79e3 /drivers/input | |
parent | 8028e938ee169f43fcdbc3becd6d35be95fd9412 (diff) |
Input: usb1400_ts - add __devinit/__devexit section annotations
Add __devinit/__devexit sections annotations so parts of code could be
discarded after completing driver initialization.
Acked-by: Marek Vasut <marek.vasut@gmail.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input')
-rw-r--r-- | drivers/input/touchscreen/ucb1400_ts.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/input/touchscreen/ucb1400_ts.c b/drivers/input/touchscreen/ucb1400_ts.c index 0066568fbd7b..4ac30ca9c3b4 100644 --- a/drivers/input/touchscreen/ucb1400_ts.c +++ b/drivers/input/touchscreen/ucb1400_ts.c | |||
@@ -299,7 +299,7 @@ static void ucb1400_ts_close(struct input_dev *idev) | |||
299 | * Try to probe our interrupt, rather than relying on lots of | 299 | * Try to probe our interrupt, rather than relying on lots of |
300 | * hard-coded machine dependencies. | 300 | * hard-coded machine dependencies. |
301 | */ | 301 | */ |
302 | static int ucb1400_ts_detect_irq(struct ucb1400_ts *ucb) | 302 | static int __devinit ucb1400_ts_detect_irq(struct ucb1400_ts *ucb) |
303 | { | 303 | { |
304 | unsigned long mask, timeout; | 304 | unsigned long mask, timeout; |
305 | 305 | ||
@@ -342,7 +342,7 @@ static int ucb1400_ts_detect_irq(struct ucb1400_ts *ucb) | |||
342 | return 0; | 342 | return 0; |
343 | } | 343 | } |
344 | 344 | ||
345 | static int ucb1400_ts_probe(struct platform_device *dev) | 345 | static int __devinit ucb1400_ts_probe(struct platform_device *dev) |
346 | { | 346 | { |
347 | int error, x_res, y_res; | 347 | int error, x_res, y_res; |
348 | u16 fcsr; | 348 | u16 fcsr; |
@@ -416,15 +416,15 @@ err_free_devs: | |||
416 | input_free_device(ucb->ts_idev); | 416 | input_free_device(ucb->ts_idev); |
417 | err: | 417 | err: |
418 | return error; | 418 | return error; |
419 | |||
420 | } | 419 | } |
421 | 420 | ||
422 | static int ucb1400_ts_remove(struct platform_device *dev) | 421 | static int __devexit ucb1400_ts_remove(struct platform_device *dev) |
423 | { | 422 | { |
424 | struct ucb1400_ts *ucb = dev->dev.platform_data; | 423 | struct ucb1400_ts *ucb = dev->dev.platform_data; |
425 | 424 | ||
426 | free_irq(ucb->irq, ucb); | 425 | free_irq(ucb->irq, ucb); |
427 | input_unregister_device(ucb->ts_idev); | 426 | input_unregister_device(ucb->ts_idev); |
427 | |||
428 | return 0; | 428 | return 0; |
429 | } | 429 | } |
430 | 430 | ||
@@ -450,7 +450,7 @@ static SIMPLE_DEV_PM_OPS(ucb1400_ts_pm_ops, NULL, ucb1400_ts_resume); | |||
450 | 450 | ||
451 | static struct platform_driver ucb1400_ts_driver = { | 451 | static struct platform_driver ucb1400_ts_driver = { |
452 | .probe = ucb1400_ts_probe, | 452 | .probe = ucb1400_ts_probe, |
453 | .remove = ucb1400_ts_remove, | 453 | .remove = __devexit_p(ucb1400_ts_remove), |
454 | .driver = { | 454 | .driver = { |
455 | .name = "ucb1400_ts", | 455 | .name = "ucb1400_ts", |
456 | .owner = THIS_MODULE, | 456 | .owner = THIS_MODULE, |