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

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

mtd_blktrans_ops->release() should return void 



Both existing instances always return 0 and even if they didn't,
the value would be lost on the way out.  Just don't bother...

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 1950267e

drivers/mtd/mtd_blkdevs.c

+4 −4
Original line number Diff line number Diff line
@@ -240,10 +240,9 @@ error_put: 
static int blktrans_release(struct gendisk *disk, fmode_t mode)

{

	struct mtd_blktrans_dev *dev = blktrans_dev_get(disk);

	int ret = 0;



	if (!dev)

		return ret;

		return 0;



	mutex_lock(&dev->lock);
@@ -254,13 +253,14 @@ static int blktrans_release(struct gendisk *disk, fmode_t mode) 
	module_put(dev->tr->owner);



	if (dev->mtd) {

		ret = dev->tr->release ? dev->tr->release(dev) : 0;

		if (dev->tr->release)

			dev->tr->release(dev);

		__put_mtd_device(dev->mtd);

	}

unlock:

	mutex_unlock(&dev->lock);

	blktrans_dev_put(dev);

	return ret;

	return 0;

}



static int blktrans_getgeo(struct block_device *bdev, struct hd_geometry *geo)

drivers/mtd/mtdblock.c

+1 −3
Original line number Diff line number Diff line
@@ -308,7 +308,7 @@ static int mtdblock_open(struct mtd_blktrans_dev *mbd) 
	return 0;

}



static int mtdblock_release(struct mtd_blktrans_dev *mbd)

static void mtdblock_release(struct mtd_blktrans_dev *mbd)

{

	struct mtdblk_dev *mtdblk = container_of(mbd, struct mtdblk_dev, mbd);
@@ -333,8 +333,6 @@ static int mtdblock_release(struct mtd_blktrans_dev *mbd) 
	mutex_unlock(&mtdblks_lock);



	pr_debug("ok\n");



	return 0;

}



static int mtdblock_flush(struct mtd_blktrans_dev *dev)

drivers/mtd/sm_ftl.c

+1 −2
Original line number Diff line number Diff line
@@ -1107,7 +1107,7 @@ static int sm_flush(struct mtd_blktrans_dev *dev) 
}



/* outside interface: device is released */

static int sm_release(struct mtd_blktrans_dev *dev)

static void sm_release(struct mtd_blktrans_dev *dev)

{

	struct sm_ftl *ftl = dev->priv;
@@ -1116,7 +1116,6 @@ static int sm_release(struct mtd_blktrans_dev *dev) 
	cancel_work_sync(&ftl->flush_work);

	sm_cache_flush(ftl);

	mutex_unlock(&ftl->mutex);

	return 0;

}



/* outside interface: get geometry */

include/linux/mtd/blktrans.h

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ struct mtd_blktrans_ops { 


	/* Called with mtd_table_mutex held; no race with add/remove */

	int (*open)(struct mtd_blktrans_dev *dev);

	int (*release)(struct mtd_blktrans_dev *dev);

	void (*release)(struct mtd_blktrans_dev *dev);



	/* Called on {de,}registration and on subsequent addition/removal

	   of devices, with mtd_table_mutex held. */