diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2013-05-05 21:52:57 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2013-05-07 02:16:21 -0400 |
commit | db2a144bedd58b3dcf19950c2f476c58c9f39d18 (patch) | |
tree | 931f1b5a8e6bafe388b317bce02a9fd9af309d38 /drivers/scsi | |
parent | a8ca889ed9585894d53fd8919d80cbe8baff09e7 (diff) |
block_device_operations->release() should return void
The value passed is 0 in all but "it can never happen" cases (and those
only in a couple of drivers) *and* it would've been lost on the way
out anyway, even if something tried to pass something meaningful.
Just don't bother.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'drivers/scsi')
-rw-r--r-- | drivers/scsi/sd.c | 3 | ||||
-rw-r--r-- | drivers/scsi/sr.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index 7992635d405f..e6689776b4f6 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c | |||
@@ -1188,7 +1188,7 @@ error_autopm: | |||
1188 | * | 1188 | * |
1189 | * Locking: called with bdev->bd_mutex held. | 1189 | * Locking: called with bdev->bd_mutex held. |
1190 | **/ | 1190 | **/ |
1191 | static int sd_release(struct gendisk *disk, fmode_t mode) | 1191 | static void sd_release(struct gendisk *disk, fmode_t mode) |
1192 | { | 1192 | { |
1193 | struct scsi_disk *sdkp = scsi_disk(disk); | 1193 | struct scsi_disk *sdkp = scsi_disk(disk); |
1194 | struct scsi_device *sdev = sdkp->device; | 1194 | struct scsi_device *sdev = sdkp->device; |
@@ -1207,7 +1207,6 @@ static int sd_release(struct gendisk *disk, fmode_t mode) | |||
1207 | 1207 | ||
1208 | scsi_autopm_put_device(sdev); | 1208 | scsi_autopm_put_device(sdev); |
1209 | scsi_disk_put(sdkp); | 1209 | scsi_disk_put(sdkp); |
1210 | return 0; | ||
1211 | } | 1210 | } |
1212 | 1211 | ||
1213 | static int sd_getgeo(struct block_device *bdev, struct hd_geometry *geo) | 1212 | static int sd_getgeo(struct block_device *bdev, struct hd_geometry *geo) |
diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c index f2884ee90710..119d67f9c47e 100644 --- a/drivers/scsi/sr.c +++ b/drivers/scsi/sr.c | |||
@@ -541,14 +541,13 @@ static int sr_block_open(struct block_device *bdev, fmode_t mode) | |||
541 | return ret; | 541 | return ret; |
542 | } | 542 | } |
543 | 543 | ||
544 | static int sr_block_release(struct gendisk *disk, fmode_t mode) | 544 | static void sr_block_release(struct gendisk *disk, fmode_t mode) |
545 | { | 545 | { |
546 | struct scsi_cd *cd = scsi_cd(disk); | 546 | struct scsi_cd *cd = scsi_cd(disk); |
547 | mutex_lock(&sr_mutex); | 547 | mutex_lock(&sr_mutex); |
548 | cdrom_release(&cd->cdi, mode); | 548 | cdrom_release(&cd->cdi, mode); |
549 | scsi_cd_put(cd); | 549 | scsi_cd_put(cd); |
550 | mutex_unlock(&sr_mutex); | 550 | mutex_unlock(&sr_mutex); |
551 | return 0; | ||
552 | } | 551 | } |
553 | 552 | ||
554 | static int sr_block_ioctl(struct block_device *bdev, fmode_t mode, unsigned cmd, | 553 | static int sr_block_ioctl(struct block_device *bdev, fmode_t mode, unsigned cmd, |