Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 31276
b: refs/heads/master
c: 0e6c62d
h: refs/heads/master
v: v3
  • Loading branch information
Greg Kroah-Hartman committed Jun 26, 2006
1 parent d6b65a7 commit 9512207
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 11 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 0936f26f55918af595b108208e64c37a0a481722
refs/heads/master: 0e6c62da7cd929b0389fc4a7e41464bb738647dc
3 changes: 0 additions & 3 deletions trunk/drivers/char/viotape.c
Original file line number Diff line number Diff line change
Expand Up @@ -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];

Expand Down Expand Up @@ -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,
Expand All @@ -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;
Expand Down
7 changes: 0 additions & 7 deletions trunk/include/linux/devfs_fs_kernel.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */

0 comments on commit 9512207

Please sign in to comment.