adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 11:46:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

Input: sa1111ps2 - annotate probe() and remove() methods

Browse source 
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>
This commit is contained in:
Dmitry Torokhov 2009-12-11 21:57:04 -08:00
parent 266429df37
commit 010c33cc79
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
drivers/input/serio/sa1111ps2.c
View file

@ -180,8 +180,8 @@ static void __devinit ps2_clear_input(struct ps2if *ps2if)
} }
} }
static inline unsigned int static unsigned int __devinit ps2_test_one(struct ps2if *ps2if,
ps2_test_one(struct ps2if *ps2if, unsigned int mask) unsigned int mask)
{ {
unsigned int val; 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 * Test the keyboard interface. We basically check to make sure that
* we can drive each line to the keyboard independently of each other. * 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; unsigned int stat;
int ret = 0; int ret = 0;
@ -312,7 +312,7 @@ static int __devinit ps2_probe(struct sa1111_dev *dev)
/* /*
* Remove one device from this driver. * 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); struct ps2if *ps2if = sa1111_get_drvdata(dev);
@ -335,7 +335,7 @@ static struct sa1111_driver ps2_driver = {
}, },
.devid = SA1111_DEVID_PS2, .devid = SA1111_DEVID_PS2,
.probe = ps2_probe, .probe = ps2_probe,
.remove = ps2_remove, .remove = __devexit_p(ps2_remove),
}; };
static int __init ps2_init(void) static int __init ps2_init(void)