From foo@baz.org Sun Jun 5 14:33:21 2005 Date: Mon, 20 Jun 2005 21:15:16 -0700 To: Greg KH From: Greg Kroah-Hartman Subject: devfs: Remove devfs_*_tape() functions from the kernel tree Removes the devfs_register_tape() and devfs_unregister_tape() functions and all callers of them. Signed-off-by: Greg Kroah-Hartman --- drivers/char/viotape.c | 3 --- include/linux/devfs_fs_kernel.h | 7 ------- 2 files changed, 10 deletions(-) --- gregkh-2.6.orig/drivers/char/viotape.c +++ gregkh-2.6/drivers/char/viotape.c @@ -246,7 +246,6 @@ static struct device *tape_device[VIOTAP */ static struct { unsigned char cur_part; - int dev_handle; unsigned char part_stat_rwi[MAX_PARTITIONS]; } state[VIOTAPE_MAX_TAPE]; @@ -964,7 +963,6 @@ static int viotape_probe(struct vio_dev devfs_mk_cdev(MKDEV(VIOTAPE_MAJOR, i | 0x80), S_IFCHR | S_IRUSR | S_IWUSR, "iseries/nvt%d", i); sprintf(tapename, "iseries/vt%d", i); - state[i].dev_handle = devfs_register_tape(tapename); printk(VIOTAPE_KERN_INFO "tape %s is iSeries " "resource %10.10s type %4.4s, model %3.3s\n", tapename, viotape_unitinfo[i].rsrcname, @@ -978,7 +976,6 @@ static int viotape_remove(struct vio_dev devfs_remove("iseries/nvt%d", i); devfs_remove("iseries/vt%d", i); - devfs_unregister_tape(state[i].dev_handle); class_device_destroy(tape_class, MKDEV(VIOTAPE_MAJOR, i | 0x80)); class_device_destroy(tape_class, MKDEV(VIOTAPE_MAJOR, i)); return 0; --- gregkh-2.6.orig/include/linux/devfs_fs_kernel.h +++ gregkh-2.6/include/linux/devfs_fs_kernel.h @@ -26,11 +26,4 @@ static inline int devfs_mk_dir(const cha static inline void devfs_remove(const char *fmt, ...) { } -static inline int devfs_register_tape(const char *name) -{ - return -1; -} -static inline void devfs_unregister_tape(int num) -{ -} #endif /* _LINUX_DEVFS_FS_KERNEL_H */