Commit 756e21a0 authored Mar 27, 2006 by Arthur Othieno Committed by Linus Torvalds Mar 27, 2006

[PATCH] matroxfb: simply return what i2c_add_driver() does



insmod will tell us when the module failed to load.  We do no further
processing on the return from i2c_add_driver(), so just return what
i2c_add_driver() did, instead of storing it.

Add __init/__exit annotations while we're at it.

Signed-off-by: Arthur Othieno <apgo@patchbomb.org>
Acked-by: Jean Delvare <khali@linux-fr.org>
Acked-by: Petr Vandrovec <petr@vandrovec.name>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

parent fc4effc7

drivers/video/matrox/matroxfb_maven.c

+5 −12

Original line number	Diff line number	Diff line
		@@ -1297,20 +1297,13 @@ static struct i2c_driver maven_driver={
		.detach_client = maven_detach_client,
		};

		/* ************************** */

		static int matroxfb_maven_init(void) {
		int err;

		err = i2c_add_driver(&maven_driver);
		if (err) {
		printk(KERN_ERR "maven: Maven driver failed to register (%d).\n", err);
		return err;
		}
		return 0;
		static int __init matroxfb_maven_init(void)
		{
		return i2c_add_driver(&maven_driver);
		}

		static void matroxfb_maven_exit(void) {
		static void __exit matroxfb_maven_exit(void)
		{
		i2c_del_driver(&maven_driver);
		}