Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0e6c62da authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

[PATCH] 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: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 0936f26f

drivers/char/viotape.c

+0 −3
Original line number Original line Diff line number Diff line
@@ -246,7 +246,6 @@ static struct device *tape_device[VIOTAPE_MAX_TAPE]; 
 */

 */

static struct {

static struct {

	unsigned char	cur_part;

	unsigned char	cur_part;

	int		dev_handle;

	unsigned char	part_stat_rwi[MAX_PARTITIONS];

	unsigned char	part_stat_rwi[MAX_PARTITIONS];

} state[VIOTAPE_MAX_TAPE];

} 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),

	devfs_mk_cdev(MKDEV(VIOTAPE_MAJOR, i | 0x80),

			S_IFCHR | S_IRUSR | S_IWUSR, "iseries/nvt%d", i);

			S_IFCHR | S_IRUSR | S_IWUSR, "iseries/nvt%d", i);

	sprintf(tapename, "iseries/vt%d", i);

	sprintf(tapename, "iseries/vt%d", i);

	state[i].dev_handle = devfs_register_tape(tapename);

	printk(VIOTAPE_KERN_INFO "tape %s is iSeries "

	printk(VIOTAPE_KERN_INFO "tape %s is iSeries "

			"resource %10.10s type %4.4s, model %3.3s\n",

			"resource %10.10s type %4.4s, model %3.3s\n",

			tapename, viotape_unitinfo[i].rsrcname,

			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/nvt%d", i);

	devfs_remove("iseries/vt%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 | 0x80));

	class_device_destroy(tape_class, MKDEV(VIOTAPE_MAJOR, i));

	class_device_destroy(tape_class, MKDEV(VIOTAPE_MAJOR, i));

	return 0;

	return 0;

include/linux/devfs_fs_kernel.h

+0 −7
Original line number Original line Diff line number Diff line
@@ -25,11 +25,4 @@ static inline int devfs_mk_dir(const char *fmt, ...) 
static inline void devfs_remove(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  */
 
#endif				/*  _LINUX_DEVFS_FS_KERNEL_H  */