From 9512207fbebb644339a697395c45793b37042c81 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 20 Jun 2005 21:15:16 -0700 Subject: [PATCH] --- yaml --- r: 31276 b: refs/heads/master c: 0e6c62da7cd929b0389fc4a7e41464bb738647dc h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/char/viotape.c | 3 --- trunk/include/linux/devfs_fs_kernel.h | 7 ------- 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/[refs] b/[refs] index 93048dd2c165..d891c239a5fa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0936f26f55918af595b108208e64c37a0a481722 +refs/heads/master: 0e6c62da7cd929b0389fc4a7e41464bb738647dc diff --git a/trunk/drivers/char/viotape.c b/trunk/drivers/char/viotape.c index 11c7e9de5958..ebc337acca15 100644 --- a/trunk/drivers/char/viotape.c +++ b/trunk/drivers/char/viotape.c @@ -246,7 +246,6 @@ static struct device *tape_device[VIOTAPE_MAX_TAPE]; */ 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 *vdev, const struct vio_device_id *id) 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 *vdev) 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; diff --git a/trunk/include/linux/devfs_fs_kernel.h b/trunk/include/linux/devfs_fs_kernel.h index 3dd430e016b0..d1dd876bc1a2 100644 --- a/trunk/include/linux/devfs_fs_kernel.h +++ b/trunk/include/linux/devfs_fs_kernel.h @@ -25,11 +25,4 @@ static inline int devfs_mk_dir(const char *fmt, ...) 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 */