Commit 1eaad3da authored by Luiz Capitulino's avatar Luiz Capitulino Committed by Greg Kroah-Hartman

[PATCH] I2C: i2c/i2c-dev.c::i2c_dev_init() cleanup.

 This patch does the fallowing cleanup for
drivers/i2c/i2c-dev.c::i2c_dev_init():

*) in a error condition, return the error code of register_chrdev()
insted of -EIO;
*) adds missing audit for class_register();
*) in a error condition, only prints "Driver Initialisation Failed",
insted printing the cause. (Note that the error will be printed by
the return of the error code, and the information about what function
caused the problem need to be done by a debug code).

 Only compiled, lack of hardware.
Signed-off-by: default avatarLuiz Capitulino <lcapitulino@prefeitura.sp.gov.br>
Signed-off-by: default avatarGreg Kroah-Hartman <greg@kroah.com>
parent 82f6ee75
...@@ -518,20 +518,29 @@ static int __init i2c_dev_init(void) ...@@ -518,20 +518,29 @@ static int __init i2c_dev_init(void)
printk(KERN_INFO "i2c /dev entries driver\n"); printk(KERN_INFO "i2c /dev entries driver\n");
if (register_chrdev(I2C_MAJOR,"i2c",&i2cdev_fops)) { res = register_chrdev(I2C_MAJOR, "i2c", &i2cdev_fops);
printk(KERN_ERR "i2c-dev.o: unable to get major %d for i2c bus\n", if (res)
I2C_MAJOR); goto out;
return -EIO;
} res = class_register(&i2c_dev_class);
if (res)
goto out_unreg_chrdev;
res = i2c_add_driver(&i2cdev_driver);
if (res)
goto out_unreg_class;
devfs_mk_dir("i2c"); devfs_mk_dir("i2c");
class_register(&i2c_dev_class);
if ((res = i2c_add_driver(&i2cdev_driver))) {
printk(KERN_ERR "i2c-dev.o: Driver registration failed, module not inserted.\n");
devfs_remove("i2c");
unregister_chrdev(I2C_MAJOR,"i2c");
return res;
}
return 0; return 0;
out_unreg_class:
class_unregister(&i2c_dev_class);
out_unreg_chrdev:
unregister_chrdev(I2C_MAJOR, "i2c");
out:
printk(KERN_ERR "%s: Driver Initialisation failed", __FILE__);
return res;
} }
static void __exit i2c_dev_exit(void) static void __exit i2c_dev_exit(void)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment