summaryrefslogtreecommitdiffstats
path: root/drivers/input
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2009-12-12 06:42:18 +0100
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2009-12-12 08:45:35 +0100
commit1def7afa748b964aeb0033d0cb78aabf3d3f3683 (patch)
tree4d0cfa846fad8ec941ccc633a796deb41ff23514 /drivers/input
parentInput: hil-mlc - use del_timer_sync() when unloading the driver (diff)
downloadlinux-1def7afa748b964aeb0033d0cb78aabf3d3f3683.tar.xz
linux-1def7afa748b964aeb0033d0cb78aabf3d3f3683.zip
Input: altera_ps2 - add annotations to probe and remove methods
Mark altera_ps2_probe() as __devinit and altera_ps2_remove() as __devexit so that they can be discarded when not needed. Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/serio/altera_ps2.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/input/serio/altera_ps2.c b/drivers/input/serio/altera_ps2.c
index b328185b1cc2..457da76d4c83 100644
--- a/drivers/input/serio/altera_ps2.c
+++ b/drivers/input/serio/altera_ps2.c
@@ -79,7 +79,7 @@ static void altera_ps2_close(struct serio *io)
/*
* Add one device to this driver.
*/
-static int altera_ps2_probe(struct platform_device *pdev)
+static int __devinit altera_ps2_probe(struct platform_device *pdev)
{
struct ps2if *ps2if;
struct serio *serio;
@@ -155,7 +155,7 @@ static int altera_ps2_probe(struct platform_device *pdev)
/*
* Remove one device from this driver.
*/
-static int altera_ps2_remove(struct platform_device *pdev)
+static int __devexit altera_ps2_remove(struct platform_device *pdev)
{
struct ps2if *ps2if = platform_get_drvdata(pdev);
@@ -175,7 +175,7 @@ static int altera_ps2_remove(struct platform_device *pdev)
*/
static struct platform_driver altera_ps2_driver = {
.probe = altera_ps2_probe,
- .remove = altera_ps2_remove,
+ .remove = __devexit_p(altera_ps2_remove),
.driver = {
.name = DRV_NAME,
.owner = THIS_MODULE,