Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 010c33cc authored by Dmitry Torokhov's avatar Dmitry Torokhov
Browse files

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: default avatarDmitry Torokhov <dtor@mail.ru>
parent 266429df

drivers/input/serio/sa1111ps2.c

+5 −5
Original line number Diff line number Diff line
@@ -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)