tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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>
+5
-5
+5
-5
drivers/input/serio/sa1111ps2.c
+5
-5
drivers/input/serio/sa1111ps2.c
···
180
180
}
181
181
}
182
182
183
-
static inline unsigned int
184
-
ps2_test_one(struct ps2if *ps2if, unsigned int mask)
183
+
static unsigned int __devinit ps2_test_one(struct ps2if *ps2if,
184
+
unsigned int mask)
185
185
{
186
186
unsigned int val;
187
187
···
197
197
* Test the keyboard interface. We basically check to make sure that
198
198
* we can drive each line to the keyboard independently of each other.
199
199
*/
200
-
static int __init ps2_test(struct ps2if *ps2if)
200
+
static int __devinit ps2_test(struct ps2if *ps2if)
201
201
{
202
202
unsigned int stat;
203
203
int ret = 0;
···
312
312
/*
313
313
* Remove one device from this driver.
314
314
*/
315
-
static int ps2_remove(struct sa1111_dev *dev)
315
+
static int __devexit ps2_remove(struct sa1111_dev *dev)
316
316
{
317
317
struct ps2if *ps2if = sa1111_get_drvdata(dev);
318
318
···
335
335
},
336
336
.devid = SA1111_DEVID_PS2,
337
337
.probe = ps2_probe,
338
-
.remove = ps2_remove,
338
+
.remove = __devexit_p(ps2_remove),
339
339
};
340
340
341
341
static int __init ps2_init(void)