diff options
| author | Heiko Carstens <heiko.carstens@de.ibm.com> | 2010-01-13 14:44:36 -0500 |
|---|---|---|
| committer | Martin Schwidefsky <sky@mschwide.boeblingen.de.ibm.com> | 2010-01-13 14:44:45 -0500 |
| commit | 957a37ad587f3ef1022f1fe434d818cbed38eb95 (patch) | |
| tree | 24ac955b87801281d1478639d115506bbe52871b | |
| parent | c6a5f8cea2e5454fce3859ca5ed381c2535184cf (diff) | |
[S390] tape_block: remove ioctl function
This is just a complicated construct which always returns -EINVAL.
Just remove it.
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
| -rw-r--r-- | drivers/s390/char/tape_block.c | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/drivers/s390/char/tape_block.c b/drivers/s390/char/tape_block.c index 96816149368a..8d3d720737da 100644 --- a/drivers/s390/char/tape_block.c +++ b/drivers/s390/char/tape_block.c | |||
| @@ -46,8 +46,6 @@ | |||
| 46 | */ | 46 | */ |
| 47 | static int tapeblock_open(struct block_device *, fmode_t); | 47 | static int tapeblock_open(struct block_device *, fmode_t); |
| 48 | static int tapeblock_release(struct gendisk *, fmode_t); | 48 | static int tapeblock_release(struct gendisk *, fmode_t); |
| 49 | static int tapeblock_ioctl(struct block_device *, fmode_t, unsigned int, | ||
| 50 | unsigned long); | ||
| 51 | static int tapeblock_medium_changed(struct gendisk *); | 49 | static int tapeblock_medium_changed(struct gendisk *); |
| 52 | static int tapeblock_revalidate_disk(struct gendisk *); | 50 | static int tapeblock_revalidate_disk(struct gendisk *); |
| 53 | 51 | ||
| @@ -55,7 +53,6 @@ static const struct block_device_operations tapeblock_fops = { | |||
| 55 | .owner = THIS_MODULE, | 53 | .owner = THIS_MODULE, |
| 56 | .open = tapeblock_open, | 54 | .open = tapeblock_open, |
| 57 | .release = tapeblock_release, | 55 | .release = tapeblock_release, |
| 58 | .ioctl = tapeblock_ioctl, | ||
| 59 | .media_changed = tapeblock_medium_changed, | 56 | .media_changed = tapeblock_medium_changed, |
| 60 | .revalidate_disk = tapeblock_revalidate_disk, | 57 | .revalidate_disk = tapeblock_revalidate_disk, |
| 61 | }; | 58 | }; |
| @@ -416,42 +413,6 @@ tapeblock_release(struct gendisk *disk, fmode_t mode) | |||
| 416 | } | 413 | } |
| 417 | 414 | ||
| 418 | /* | 415 | /* |
| 419 | * Support of some generic block device IOCTLs. | ||
| 420 | */ | ||
| 421 | static int | ||
| 422 | tapeblock_ioctl( | ||
| 423 | struct block_device * bdev, | ||
| 424 | fmode_t mode, | ||
| 425 | unsigned int command, | ||
| 426 | unsigned long arg | ||
| 427 | ) { | ||
| 428 | int rc; | ||
| 429 | int minor; | ||
| 430 | struct gendisk *disk = bdev->bd_disk; | ||
| 431 | struct tape_device *device; | ||
| 432 | |||
| 433 | rc = 0; | ||
| 434 | BUG_ON(!disk); | ||
| 435 | device = disk->private_data; | ||
| 436 | BUG_ON(!device); | ||
| 437 | minor = MINOR(bdev->bd_dev); | ||
| 438 | |||
| 439 | DBF_LH(6, "tapeblock_ioctl(0x%0x)\n", command); | ||
| 440 | DBF_LH(6, "device = %d:%d\n", tapeblock_major, minor); | ||
| 441 | |||
| 442 | switch (command) { | ||
| 443 | /* Refuse some IOCTL calls without complaining (mount). */ | ||
| 444 | case 0x5310: /* CDROMMULTISESSION */ | ||
| 445 | rc = -EINVAL; | ||
| 446 | break; | ||
| 447 | default: | ||
| 448 | rc = -EINVAL; | ||
| 449 | } | ||
| 450 | |||
| 451 | return rc; | ||
| 452 | } | ||
| 453 | |||
| 454 | /* | ||
| 455 | * Initialize block device frontend. | 416 | * Initialize block device frontend. |
| 456 | */ | 417 | */ |
| 457 | int | 418 | int |
