forked from luck/tmp_suning_uos_patched
[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>
This commit is contained in:
parent
fc4effc7a9
commit
756e21a022
@ -1297,20 +1297,13 @@ static struct i2c_driver maven_driver={
|
|||||||
.detach_client = maven_detach_client,
|
.detach_client = maven_detach_client,
|
||||||
};
|
};
|
||||||
|
|
||||||
/* ************************** */
|
static int __init matroxfb_maven_init(void)
|
||||||
|
{
|
||||||
static int matroxfb_maven_init(void) {
|
return i2c_add_driver(&maven_driver);
|
||||||
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 void matroxfb_maven_exit(void) {
|
static void __exit matroxfb_maven_exit(void)
|
||||||
|
{
|
||||||
i2c_del_driver(&maven_driver);
|
i2c_del_driver(&maven_driver);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user