Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit db2a144b authored by Al Viro's avatar Al Viro
Browse files

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: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent a8ca889e

arch/um/drivers/ubd_kern.c

+2 −3
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ static DEFINE_MUTEX(ubd_lock); 
static DEFINE_MUTEX(ubd_mutex); /* replaces BKL, might not be needed */



static int ubd_open(struct block_device *bdev, fmode_t mode);

static int ubd_release(struct gendisk *disk, fmode_t mode);

static void ubd_release(struct gendisk *disk, fmode_t mode);

static int ubd_ioctl(struct block_device *bdev, fmode_t mode,

		     unsigned int cmd, unsigned long arg);

static int ubd_getgeo(struct block_device *bdev, struct hd_geometry *geo);
@@ -1138,7 +1138,7 @@ out: 
	return err;

}



static int ubd_release(struct gendisk *disk, fmode_t mode)

static void ubd_release(struct gendisk *disk, fmode_t mode)

{

	struct ubd *ubd_dev = disk->private_data;
@@ -1146,7 +1146,6 @@ static int ubd_release(struct gendisk *disk, fmode_t mode) 
	if(--ubd_dev->count == 0)

		ubd_close_dev(ubd_dev);

	mutex_unlock(&ubd_mutex);

	return 0;

}



static void cowify_bitmap(__u64 io_offset, int length, unsigned long *cow_mask,

arch/xtensa/platforms/iss/simdisk.c

+1 −2
Original line number Diff line number Diff line
@@ -139,13 +139,12 @@ static int simdisk_open(struct block_device *bdev, fmode_t mode) 
	return 0;

}



static int simdisk_release(struct gendisk *disk, fmode_t mode)

static void simdisk_release(struct gendisk *disk, fmode_t mode)

{

	struct simdisk *dev = disk->private_data;

	spin_lock(&dev->lock);

	--dev->users;

	spin_unlock(&dev->lock);

	return 0;

}



static const struct block_device_operations simdisk_ops = {

drivers/block/amiflop.c

+1 −2
Original line number Diff line number Diff line
@@ -1634,7 +1634,7 @@ static int floppy_open(struct block_device *bdev, fmode_t mode) 
	return 0;

}



static int floppy_release(struct gendisk *disk, fmode_t mode)

static void floppy_release(struct gendisk *disk, fmode_t mode)

{

	struct amiga_floppy_struct *p = disk->private_data;

	int drive = p - unit;
@@ -1654,7 +1654,6 @@ static int floppy_release(struct gendisk *disk, fmode_t mode) 
	floppy_off (drive | 0x40000000);

#endif

	mutex_unlock(&amiflop_mutex);

	return 0;

}



/*

drivers/block/aoe/aoeblk.c

+2 −4
Original line number Diff line number Diff line
@@ -169,7 +169,7 @@ aoeblk_open(struct block_device *bdev, fmode_t mode) 
	return -ENODEV;

}



static int

static void

aoeblk_release(struct gendisk *disk, fmode_t mode)

{

	struct aoedev *d = disk->private_data;
@@ -180,11 +180,9 @@ aoeblk_release(struct gendisk *disk, fmode_t mode) 
	if (--d->nopen == 0) {

		spin_unlock_irqrestore(&d->lock, flags);

		aoecmd_cfg(d->aoemajor, d->aoeminor);

		return 0;

		return;

	}

	spin_unlock_irqrestore(&d->lock, flags);



	return 0;

}



static void

drivers/block/ataflop.c

+2 −3
Original line number Diff line number Diff line
@@ -367,7 +367,7 @@ static void fd_probe( int drive ); 
static int fd_test_drive_present( int drive );

static void config_types( void );

static int floppy_open(struct block_device *bdev, fmode_t mode);

static int floppy_release(struct gendisk *disk, fmode_t mode);

static void floppy_release(struct gendisk *disk, fmode_t mode);



/************************* End of Prototypes **************************/
@@ -1886,7 +1886,7 @@ static int floppy_unlocked_open(struct block_device *bdev, fmode_t mode) 
	return ret;

}



static int floppy_release(struct gendisk *disk, fmode_t mode)

static void floppy_release(struct gendisk *disk, fmode_t mode)

{

	struct atari_floppy_struct *p = disk->private_data;

	mutex_lock(&ataflop_mutex);
@@ -1897,7 +1897,6 @@ static int floppy_release(struct gendisk *disk, fmode_t mode) 
		p->ref = 0;

	}

	mutex_unlock(&ataflop_mutex);

	return 0;

}



static const struct block_device_operations floppy_fops = {