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/ide | |
| 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/ide')
| -rw-r--r-- | drivers/ide/ide-cd.c | 4 | ||||
| -rw-r--r-- | drivers/ide/ide-gd.c | 4 | ||||
| -rw-r--r-- | drivers/ide/ide-tape.c | 4 |
3 files changed, 3 insertions, 9 deletions
diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c index b23113926388..2ff620444930 100644 --- a/drivers/ide/ide-cd.c +++ b/drivers/ide/ide-cd.c | |||
| @@ -1606,7 +1606,7 @@ out: | |||
| 1606 | return rc; | 1606 | return rc; |
| 1607 | } | 1607 | } |
| 1608 | 1608 | ||
| 1609 | static int idecd_release(struct gendisk *disk, fmode_t mode) | 1609 | static void idecd_release(struct gendisk *disk, fmode_t mode) |
| 1610 | { | 1610 | { |
| 1611 | struct cdrom_info *info = ide_drv_g(disk, cdrom_info); | 1611 | struct cdrom_info *info = ide_drv_g(disk, cdrom_info); |
| 1612 | 1612 | ||
| @@ -1615,8 +1615,6 @@ static int idecd_release(struct gendisk *disk, fmode_t mode) | |||
| 1615 | 1615 | ||
| 1616 | ide_cd_put(info); | 1616 | ide_cd_put(info); |
| 1617 | mutex_unlock(&ide_cd_mutex); | 1617 | mutex_unlock(&ide_cd_mutex); |
| 1618 | |||
| 1619 | return 0; | ||
| 1620 | } | 1618 | } |
| 1621 | 1619 | ||
| 1622 | static int idecd_set_spindown(struct cdrom_device_info *cdi, unsigned long arg) | 1620 | static int idecd_set_spindown(struct cdrom_device_info *cdi, unsigned long arg) |
diff --git a/drivers/ide/ide-gd.c b/drivers/ide/ide-gd.c index 70ea8763567d..de86631e767d 100644 --- a/drivers/ide/ide-gd.c +++ b/drivers/ide/ide-gd.c | |||
| @@ -250,7 +250,7 @@ static int ide_gd_unlocked_open(struct block_device *bdev, fmode_t mode) | |||
| 250 | } | 250 | } |
| 251 | 251 | ||
| 252 | 252 | ||
| 253 | static int ide_gd_release(struct gendisk *disk, fmode_t mode) | 253 | static void ide_gd_release(struct gendisk *disk, fmode_t mode) |
| 254 | { | 254 | { |
| 255 | struct ide_disk_obj *idkp = ide_drv_g(disk, ide_disk_obj); | 255 | struct ide_disk_obj *idkp = ide_drv_g(disk, ide_disk_obj); |
| 256 | ide_drive_t *drive = idkp->drive; | 256 | ide_drive_t *drive = idkp->drive; |
| @@ -270,8 +270,6 @@ static int ide_gd_release(struct gendisk *disk, fmode_t mode) | |||
| 270 | 270 | ||
| 271 | ide_disk_put(idkp); | 271 | ide_disk_put(idkp); |
| 272 | mutex_unlock(&ide_gd_mutex); | 272 | mutex_unlock(&ide_gd_mutex); |
| 273 | |||
| 274 | return 0; | ||
| 275 | } | 273 | } |
| 276 | 274 | ||
| 277 | static int ide_gd_getgeo(struct block_device *bdev, struct hd_geometry *geo) | 275 | static int ide_gd_getgeo(struct block_device *bdev, struct hd_geometry *geo) |
diff --git a/drivers/ide/ide-tape.c b/drivers/ide/ide-tape.c index 89f859591bbb..c6c574bd5f59 100644 --- a/drivers/ide/ide-tape.c +++ b/drivers/ide/ide-tape.c | |||
| @@ -1918,15 +1918,13 @@ static int idetape_open(struct block_device *bdev, fmode_t mode) | |||
| 1918 | return 0; | 1918 | return 0; |
| 1919 | } | 1919 | } |
| 1920 | 1920 | ||
| 1921 | static int idetape_release(struct gendisk *disk, fmode_t mode) | 1921 | static void idetape_release(struct gendisk *disk, fmode_t mode) |
| 1922 | { | 1922 | { |
| 1923 | struct ide_tape_obj *tape = ide_drv_g(disk, ide_tape_obj); | 1923 | struct ide_tape_obj *tape = ide_drv_g(disk, ide_tape_obj); |
| 1924 | 1924 | ||
| 1925 | mutex_lock(&ide_tape_mutex); | 1925 | mutex_lock(&ide_tape_mutex); |
| 1926 | ide_tape_put(tape); | 1926 | ide_tape_put(tape); |
| 1927 | mutex_unlock(&ide_tape_mutex); | 1927 | mutex_unlock(&ide_tape_mutex); |
| 1928 | |||
| 1929 | return 0; | ||
| 1930 | } | 1928 | } |
| 1931 | 1929 | ||
| 1932 | static int idetape_ioctl(struct block_device *bdev, fmode_t mode, | 1930 | static int idetape_ioctl(struct block_device *bdev, fmode_t mode, |
