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

Commit 957a37ad authored by Heiko Carstens's avatar Heiko Carstens Committed by Martin Schwidefsky
Browse files

[S390] tape_block: remove ioctl function 



This is just a complicated construct which always returns -EINVAL.
Just remove it.

Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent c6a5f8ce

drivers/s390/char/tape_block.c

+0 −39
Original line number Diff line number Diff line
@@ -46,8 +46,6 @@ 
 */

static int tapeblock_open(struct block_device *, fmode_t);

static int tapeblock_release(struct gendisk *, fmode_t);

static int tapeblock_ioctl(struct block_device *, fmode_t, unsigned int,

				unsigned long);

static int tapeblock_medium_changed(struct gendisk *);

static int tapeblock_revalidate_disk(struct gendisk *);
@@ -55,7 +53,6 @@ static const struct block_device_operations tapeblock_fops = { 
	.owner		 = THIS_MODULE,

	.open		 = tapeblock_open,

	.release	 = tapeblock_release,

	.ioctl		 = tapeblock_ioctl,

	.media_changed   = tapeblock_medium_changed,

	.revalidate_disk = tapeblock_revalidate_disk,

};
@@ -415,42 +412,6 @@ tapeblock_release(struct gendisk *disk, fmode_t mode) 
	return 0;

}



/*

 * Support of some generic block device IOCTLs.

 */

static int

tapeblock_ioctl(

	struct block_device *	bdev,

	fmode_t			mode,

	unsigned int		command,

	unsigned long		arg

) {

	int rc;

	int minor;

	struct gendisk *disk = bdev->bd_disk;

	struct tape_device *device;



	rc     = 0;

	BUG_ON(!disk);

	device = disk->private_data;

	BUG_ON(!device);

	minor  = MINOR(bdev->bd_dev);



	DBF_LH(6, "tapeblock_ioctl(0x%0x)\n", command);

	DBF_LH(6, "device = %d:%d\n", tapeblock_major, minor);



	switch (command) {

		/* Refuse some IOCTL calls without complaining (mount). */

		case 0x5310:		/* CDROMMULTISESSION */

			rc = -EINVAL;

			break;

		default:

			rc = -EINVAL;

	}



	return rc;

}



/*

 * Initialize block device frontend.

 */