diff options
| -rw-r--r-- | drivers/char/viotape.c | 3 | ||||
| -rw-r--r-- | include/linux/devfs_fs_kernel.h | 7 | 
2 files changed, 0 insertions, 10 deletions
| diff --git a/drivers/char/viotape.c b/drivers/char/viotape.c index 11c7e9de5958..ebc337acca15 100644 --- a/drivers/char/viotape.c +++ b/drivers/char/viotape.c | |||
| @@ -246,7 +246,6 @@ static struct device *tape_device[VIOTAPE_MAX_TAPE]; | |||
| 246 | */ | 246 | */ | 
| 247 | static struct { | 247 | static struct { | 
| 248 | unsigned char cur_part; | 248 | unsigned char cur_part; | 
| 249 | int dev_handle; | ||
| 250 | unsigned char part_stat_rwi[MAX_PARTITIONS]; | 249 | unsigned char part_stat_rwi[MAX_PARTITIONS]; | 
| 251 | } state[VIOTAPE_MAX_TAPE]; | 250 | } state[VIOTAPE_MAX_TAPE]; | 
| 252 | 251 | ||
| @@ -964,7 +963,6 @@ static int viotape_probe(struct vio_dev *vdev, const struct vio_device_id *id) | |||
| 964 | devfs_mk_cdev(MKDEV(VIOTAPE_MAJOR, i | 0x80), | 963 | devfs_mk_cdev(MKDEV(VIOTAPE_MAJOR, i | 0x80), | 
| 965 | S_IFCHR | S_IRUSR | S_IWUSR, "iseries/nvt%d", i); | 964 | S_IFCHR | S_IRUSR | S_IWUSR, "iseries/nvt%d", i); | 
| 966 | sprintf(tapename, "iseries/vt%d", i); | 965 | sprintf(tapename, "iseries/vt%d", i); | 
| 967 | state[i].dev_handle = devfs_register_tape(tapename); | ||
| 968 | printk(VIOTAPE_KERN_INFO "tape %s is iSeries " | 966 | printk(VIOTAPE_KERN_INFO "tape %s is iSeries " | 
| 969 | "resource %10.10s type %4.4s, model %3.3s\n", | 967 | "resource %10.10s type %4.4s, model %3.3s\n", | 
| 970 | tapename, viotape_unitinfo[i].rsrcname, | 968 | tapename, viotape_unitinfo[i].rsrcname, | 
| @@ -978,7 +976,6 @@ static int viotape_remove(struct vio_dev *vdev) | |||
| 978 | 976 | ||
| 979 | devfs_remove("iseries/nvt%d", i); | 977 | devfs_remove("iseries/nvt%d", i); | 
| 980 | devfs_remove("iseries/vt%d", i); | 978 | devfs_remove("iseries/vt%d", i); | 
| 981 | devfs_unregister_tape(state[i].dev_handle); | ||
| 982 | class_device_destroy(tape_class, MKDEV(VIOTAPE_MAJOR, i | 0x80)); | 979 | class_device_destroy(tape_class, MKDEV(VIOTAPE_MAJOR, i | 0x80)); | 
| 983 | class_device_destroy(tape_class, MKDEV(VIOTAPE_MAJOR, i)); | 980 | class_device_destroy(tape_class, MKDEV(VIOTAPE_MAJOR, i)); | 
| 984 | return 0; | 981 | return 0; | 
| diff --git a/include/linux/devfs_fs_kernel.h b/include/linux/devfs_fs_kernel.h index 3dd430e016b0..d1dd876bc1a2 100644 --- a/include/linux/devfs_fs_kernel.h +++ b/include/linux/devfs_fs_kernel.h | |||
| @@ -25,11 +25,4 @@ static inline int devfs_mk_dir(const char *fmt, ...) | |||
| 25 | static inline void devfs_remove(const char *fmt, ...) | 25 | static inline void devfs_remove(const char *fmt, ...) | 
| 26 | { | 26 | { | 
| 27 | } | 27 | } | 
| 28 | static inline int devfs_register_tape(const char *name) | ||
| 29 | { | ||
| 30 | return -1; | ||
| 31 | } | ||
| 32 | static inline void devfs_unregister_tape(int num) | ||
| 33 | { | ||
| 34 | } | ||
| 35 | #endif /* _LINUX_DEVFS_FS_KERNEL_H */ | 28 | #endif /* _LINUX_DEVFS_FS_KERNEL_H */ | 
