diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-12-11 21:57:04 -0800 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-12-11 23:46:05 -0800 |
| commit | 010c33cc7907239ffc8f49f09ccb3dc6d84a0369 (patch) | |
| tree | 55de89e519c594e4ff4de621dcaab9cdda13766c /drivers/input | |
| parent | 266429df3745aecd230831a4c2983247d3d38ecd (diff) | |
| download | linux-3.10-010c33cc7907239ffc8f49f09ccb3dc6d84a0369.tar.gz linux-3.10-010c33cc7907239ffc8f49f09ccb3dc6d84a0369.tar.bz2 linux-3.10-010c33cc7907239ffc8f49f09ccb3dc6d84a0369.zip | |
Input: sa1111ps2 - annotate probe() and remove() methods
Also fix annotation of ps2_test() - it can'be __init since it is called
from __devinit code.
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input')
| -rw-r--r-- | drivers/input/serio/sa1111ps2.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/input/serio/sa1111ps2.c b/drivers/input/serio/sa1111ps2.c index f412c69478a..d55874e5d1c 100644 --- a/drivers/input/serio/sa1111ps2.c +++ b/drivers/input/serio/sa1111ps2.c @@ -180,8 +180,8 @@ static void __devinit ps2_clear_input(struct ps2if *ps2if) } } -static inline unsigned int -ps2_test_one(struct ps2if *ps2if, unsigned int mask) +static unsigned int __devinit ps2_test_one(struct ps2if *ps2if, + unsigned int mask) { unsigned int val; @@ -197,7 +197,7 @@ ps2_test_one(struct ps2if *ps2if, unsigned int mask) * Test the keyboard interface. We basically check to make sure that * we can drive each line to the keyboard independently of each other. */ -static int __init ps2_test(struct ps2if *ps2if) +static int __devinit ps2_test(struct ps2if *ps2if) { unsigned int stat; int ret = 0; @@ -312,7 +312,7 @@ static int __devinit ps2_probe(struct sa1111_dev *dev) /* * Remove one device from this driver. */ -static int ps2_remove(struct sa1111_dev *dev) +static int __devexit ps2_remove(struct sa1111_dev *dev) { struct ps2if *ps2if = sa1111_get_drvdata(dev); @@ -335,7 +335,7 @@ static struct sa1111_driver ps2_driver = { }, .devid = SA1111_DEVID_PS2, .probe = ps2_probe, - .remove = ps2_remove, + .remove = __devexit_p(ps2_remove), }; static int __init ps2_init(void) |