Commit 0dc9a32d authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

[PATCH] I2C: remove devfs support from i2c-dev driver

as devfs is gone, this isn't needed anymore.
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent b890a07f
...@@ -26,15 +26,11 @@ ...@@ -26,15 +26,11 @@
/* The I2C_RDWR ioctl code is written by Kolja Waschk <waschk@telos.de> */ /* The I2C_RDWR ioctl code is written by Kolja Waschk <waschk@telos.de> */
/* The devfs code is contributed by Philipp Matthias Hahn
<pmhahn@titan.lahn.de> */
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/fs.h> #include <linux/fs.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/smp_lock.h> #include <linux/smp_lock.h>
#include <linux/devfs_fs_kernel.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/i2c.h> #include <linux/i2c.h>
#include <linux/i2c-dev.h> #include <linux/i2c-dev.h>
...@@ -431,8 +427,6 @@ static int i2cdev_attach_adapter(struct i2c_adapter *adap) ...@@ -431,8 +427,6 @@ static int i2cdev_attach_adapter(struct i2c_adapter *adap)
if (IS_ERR(i2c_dev)) if (IS_ERR(i2c_dev))
return PTR_ERR(i2c_dev); return PTR_ERR(i2c_dev);
devfs_mk_cdev(MKDEV(I2C_MAJOR, i2c_dev->minor),
S_IFCHR|S_IRUSR|S_IWUSR, "i2c/%d", i2c_dev->minor);
pr_debug("i2c-dev: adapter [%s] registered as minor %d\n", pr_debug("i2c-dev: adapter [%s] registered as minor %d\n",
adap->name, i2c_dev->minor); adap->name, i2c_dev->minor);
...@@ -465,7 +459,6 @@ static int i2cdev_detach_adapter(struct i2c_adapter *adap) ...@@ -465,7 +459,6 @@ static int i2cdev_detach_adapter(struct i2c_adapter *adap)
return -ENODEV; return -ENODEV;
init_completion(&i2c_dev->released); init_completion(&i2c_dev->released);
devfs_remove("i2c/%d", i2c_dev->minor);
return_i2c_dev(i2c_dev); return_i2c_dev(i2c_dev);
class_device_unregister(&i2c_dev->class_dev); class_device_unregister(&i2c_dev->class_dev);
wait_for_completion(&i2c_dev->released); wait_for_completion(&i2c_dev->released);
...@@ -521,8 +514,6 @@ static int __init i2c_dev_init(void) ...@@ -521,8 +514,6 @@ static int __init i2c_dev_init(void)
if (res) if (res)
goto out_unreg_class; goto out_unreg_class;
devfs_mk_dir("i2c");
return 0; return 0;
out_unreg_class: out_unreg_class:
...@@ -538,7 +529,6 @@ static void __exit i2c_dev_exit(void) ...@@ -538,7 +529,6 @@ static void __exit i2c_dev_exit(void)
{ {
i2c_del_driver(&i2cdev_driver); i2c_del_driver(&i2cdev_driver);
class_unregister(&i2c_dev_class); class_unregister(&i2c_dev_class);
devfs_remove("i2c");
unregister_chrdev(I2C_MAJOR,"i2c"); unregister_chrdev(I2C_MAJOR,"i2c");
} }
......
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