mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 02:32:09 -04:00
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 <[email protected]>
This commit is contained in:
parent
a8ca889ed9
commit
db2a144bed
37 changed files with 62 additions and 121 deletions
|
|
@ -2997,18 +2997,14 @@ unlock:
|
|||
return rc;
|
||||
}
|
||||
|
||||
static int dasd_release(struct gendisk *disk, fmode_t mode)
|
||||
static void dasd_release(struct gendisk *disk, fmode_t mode)
|
||||
{
|
||||
struct dasd_device *base;
|
||||
|
||||
base = dasd_device_from_gendisk(disk);
|
||||
if (!base)
|
||||
return -ENODEV;
|
||||
|
||||
atomic_dec(&base->block->open_count);
|
||||
module_put(base->discipline->owner);
|
||||
dasd_put_device(base);
|
||||
return 0;
|
||||
struct dasd_device *base = dasd_device_from_gendisk(disk);
|
||||
if (base) {
|
||||
atomic_dec(&base->block->open_count);
|
||||
module_put(base->discipline->owner);
|
||||
dasd_put_device(base);
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@
|
|||
#define DCSS_BUS_ID_SIZE 20
|
||||
|
||||
static int dcssblk_open(struct block_device *bdev, fmode_t mode);
|
||||
static int dcssblk_release(struct gendisk *disk, fmode_t mode);
|
||||
static void dcssblk_release(struct gendisk *disk, fmode_t mode);
|
||||
static void dcssblk_make_request(struct request_queue *q, struct bio *bio);
|
||||
static int dcssblk_direct_access(struct block_device *bdev, sector_t secnum,
|
||||
void **kaddr, unsigned long *pfn);
|
||||
|
|
@ -781,16 +781,15 @@ out:
|
|||
return rc;
|
||||
}
|
||||
|
||||
static int
|
||||
static void
|
||||
dcssblk_release(struct gendisk *disk, fmode_t mode)
|
||||
{
|
||||
struct dcssblk_dev_info *dev_info = disk->private_data;
|
||||
struct segment_info *entry;
|
||||
int rc;
|
||||
|
||||
if (!dev_info) {
|
||||
rc = -ENODEV;
|
||||
goto out;
|
||||
WARN_ON(1);
|
||||
return;
|
||||
}
|
||||
down_write(&dcssblk_devices_sem);
|
||||
if (atomic_dec_and_test(&dev_info->use_count)
|
||||
|
|
@ -803,9 +802,6 @@ dcssblk_release(struct gendisk *disk, fmode_t mode)
|
|||
dev_info->save_pending = 0;
|
||||
}
|
||||
up_write(&dcssblk_devices_sem);
|
||||
rc = 0;
|
||||
out:
|
||||
return rc;
|
||||
}
|
||||
|
||||
static void
|
||||
|
|
|
|||
|
|
@ -123,10 +123,9 @@ static int scm_open(struct block_device *blkdev, fmode_t mode)
|
|||
return scm_get_ref();
|
||||
}
|
||||
|
||||
static int scm_release(struct gendisk *gendisk, fmode_t mode)
|
||||
static void scm_release(struct gendisk *gendisk, fmode_t mode)
|
||||
{
|
||||
scm_put_ref();
|
||||
return 0;
|
||||
}
|
||||
|
||||
static const struct block_device_operations scm_blk_devops = {
|
||||
|
|
|
|||
Loading…
Reference in a new issue