aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2005-10-21 18:23:27 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2005-10-28 17:02:14 -0400
commit0dc9a32d9a975ccd25b9f531451165c93e1c7313 (patch)
treedf2c1fd2bd0f98d305a9630da86737a91201d8f9
parentb890a07f7b002ee473986fa85ae3582de399a4cf (diff)
[PATCH] I2C: remove devfs support from i2c-dev driver
as devfs is gone, this isn't needed anymore. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/i2c/i2c-dev.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/i2c/i2c-dev.c b/drivers/i2c/i2c-dev.c
index 276ec42a0717..ea14c8f1c82b 100644
--- a/drivers/i2c/i2c-dev.c
+++ b/drivers/i2c/i2c-dev.c
@@ -26,15 +26,11 @@
26 26
27/* The I2C_RDWR ioctl code is written by Kolja Waschk <waschk@telos.de> */ 27/* The I2C_RDWR ioctl code is written by Kolja Waschk <waschk@telos.de> */
28 28
29/* The devfs code is contributed by Philipp Matthias Hahn
30 <pmhahn@titan.lahn.de> */
31
32#include <linux/kernel.h> 29#include <linux/kernel.h>
33#include <linux/module.h> 30#include <linux/module.h>
34#include <linux/fs.h> 31#include <linux/fs.h>
35#include <linux/slab.h> 32#include <linux/slab.h>
36#include <linux/smp_lock.h> 33#include <linux/smp_lock.h>
37#include <linux/devfs_fs_kernel.h>
38#include <linux/init.h> 34#include <linux/init.h>
39#include <linux/i2c.h> 35#include <linux/i2c.h>
40#include <linux/i2c-dev.h> 36#include <linux/i2c-dev.h>
@@ -431,8 +427,6 @@ static int i2cdev_attach_adapter(struct i2c_adapter *adap)
431 if (IS_ERR(i2c_dev)) 427 if (IS_ERR(i2c_dev))
432 return PTR_ERR(i2c_dev); 428 return PTR_ERR(i2c_dev);
433 429
434 devfs_mk_cdev(MKDEV(I2C_MAJOR, i2c_dev->minor),
435 S_IFCHR|S_IRUSR|S_IWUSR, "i2c/%d", i2c_dev->minor);
436 pr_debug("i2c-dev: adapter [%s] registered as minor %d\n", 430 pr_debug("i2c-dev: adapter [%s] registered as minor %d\n",
437 adap->name, i2c_dev->minor); 431 adap->name, i2c_dev->minor);
438 432
@@ -465,7 +459,6 @@ static int i2cdev_detach_adapter(struct i2c_adapter *adap)
465 return -ENODEV; 459 return -ENODEV;
466 460
467 init_completion(&i2c_dev->released); 461 init_completion(&i2c_dev->released);
468 devfs_remove("i2c/%d", i2c_dev->minor);
469 return_i2c_dev(i2c_dev); 462 return_i2c_dev(i2c_dev);
470 class_device_unregister(&i2c_dev->class_dev); 463 class_device_unregister(&i2c_dev->class_dev);
471 wait_for_completion(&i2c_dev->released); 464 wait_for_completion(&i2c_dev->released);
@@ -521,8 +514,6 @@ static int __init i2c_dev_init(void)
521 if (res) 514 if (res)
522 goto out_unreg_class; 515 goto out_unreg_class;
523 516
524 devfs_mk_dir("i2c");
525
526 return 0; 517 return 0;
527 518
528out_unreg_class: 519out_unreg_class:
@@ -538,7 +529,6 @@ static void __exit i2c_dev_exit(void)
538{ 529{
539 i2c_del_driver(&i2cdev_driver); 530 i2c_del_driver(&i2cdev_driver);
540 class_unregister(&i2c_dev_class); 531 class_unregister(&i2c_dev_class);
541 devfs_remove("i2c");
542 unregister_chrdev(I2C_MAJOR,"i2c"); 532 unregister_chrdev(I2C_MAJOR,"i2c");
543} 533}
544 534