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/block/swim3.c | |
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/block/swim3.c')
-rw-r--r-- | drivers/block/swim3.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/block/swim3.c b/drivers/block/swim3.c index 758f2ac878cf..20e061c3e023 100644 --- a/drivers/block/swim3.c +++ b/drivers/block/swim3.c | |||
@@ -251,7 +251,7 @@ static int fd_eject(struct floppy_state *fs); | |||
251 | static int floppy_ioctl(struct block_device *bdev, fmode_t mode, | 251 | static int floppy_ioctl(struct block_device *bdev, fmode_t mode, |
252 | unsigned int cmd, unsigned long param); | 252 | unsigned int cmd, unsigned long param); |
253 | static int floppy_open(struct block_device *bdev, fmode_t mode); | 253 | static int floppy_open(struct block_device *bdev, fmode_t mode); |
254 | static int floppy_release(struct gendisk *disk, fmode_t mode); | 254 | static void floppy_release(struct gendisk *disk, fmode_t mode); |
255 | static unsigned int floppy_check_events(struct gendisk *disk, | 255 | static unsigned int floppy_check_events(struct gendisk *disk, |
256 | unsigned int clearing); | 256 | unsigned int clearing); |
257 | static int floppy_revalidate(struct gendisk *disk); | 257 | static int floppy_revalidate(struct gendisk *disk); |
@@ -1017,7 +1017,7 @@ static int floppy_unlocked_open(struct block_device *bdev, fmode_t mode) | |||
1017 | return ret; | 1017 | return ret; |
1018 | } | 1018 | } |
1019 | 1019 | ||
1020 | static int floppy_release(struct gendisk *disk, fmode_t mode) | 1020 | static void floppy_release(struct gendisk *disk, fmode_t mode) |
1021 | { | 1021 | { |
1022 | struct floppy_state *fs = disk->private_data; | 1022 | struct floppy_state *fs = disk->private_data; |
1023 | struct swim3 __iomem *sw = fs->swim3; | 1023 | struct swim3 __iomem *sw = fs->swim3; |
@@ -1029,7 +1029,6 @@ static int floppy_release(struct gendisk *disk, fmode_t mode) | |||
1029 | swim3_select(fs, RELAX); | 1029 | swim3_select(fs, RELAX); |
1030 | } | 1030 | } |
1031 | mutex_unlock(&swim3_mutex); | 1031 | mutex_unlock(&swim3_mutex); |
1032 | return 0; | ||
1033 | } | 1032 | } |
1034 | 1033 | ||
1035 | static unsigned int floppy_check_events(struct gendisk *disk, | 1034 | static unsigned int floppy_check_events(struct gendisk *disk, |