Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Al Viro <viro@zeniv.linux.org.uk>

Al Viro a8ca889e 1950267e

+7 -10
+4 -4
drivers/mtd/mtd_blkdevs.c
··· 240 240 static int blktrans_release(struct gendisk *disk, fmode_t mode) 241 241 { 242 242 struct mtd_blktrans_dev *dev = blktrans_dev_get(disk); 243 - int ret = 0; 244 243 245 244 if (!dev) 246 - return ret; 245 + return 0; 247 246 248 247 mutex_lock(&dev->lock); 249 248 ··· 253 254 module_put(dev->tr->owner); 254 255 255 256 if (dev->mtd) { 256 - ret = dev->tr->release ? dev->tr->release(dev) : 0; 257 + if (dev->tr->release) 258 + dev->tr->release(dev); 257 259 __put_mtd_device(dev->mtd); 258 260 } 259 261 unlock: 260 262 mutex_unlock(&dev->lock); 261 263 blktrans_dev_put(dev); 262 - return ret; 264 + return 0; 263 265 } 264 266 265 267 static int blktrans_getgeo(struct block_device *bdev, struct hd_geometry *geo)
+1 -3
drivers/mtd/mtdblock.c
··· 308 308 return 0; 309 309 } 310 310 311 - static int mtdblock_release(struct mtd_blktrans_dev *mbd) 311 + static void mtdblock_release(struct mtd_blktrans_dev *mbd) 312 312 { 313 313 struct mtdblk_dev *mtdblk = container_of(mbd, struct mtdblk_dev, mbd); 314 314 ··· 333 333 mutex_unlock(&mtdblks_lock); 334 334 335 335 pr_debug("ok\n"); 336 - 337 - return 0; 338 336 } 339 337 340 338 static int mtdblock_flush(struct mtd_blktrans_dev *dev)
+1 -2
drivers/mtd/sm_ftl.c
··· 1107 1107 } 1108 1108 1109 1109 /* outside interface: device is released */ 1110 - static int sm_release(struct mtd_blktrans_dev *dev) 1110 + static void sm_release(struct mtd_blktrans_dev *dev) 1111 1111 { 1112 1112 struct sm_ftl *ftl = dev->priv; 1113 1113 ··· 1116 1116 cancel_work_sync(&ftl->flush_work); 1117 1117 sm_cache_flush(ftl); 1118 1118 mutex_unlock(&ftl->mutex); 1119 - return 0; 1120 1119 } 1121 1120 1122 1121 /* outside interface: get geometry */
+1 -1
include/linux/mtd/blktrans.h
··· 74 74 75 75 /* Called with mtd_table_mutex held; no race with add/remove */ 76 76 int (*open)(struct mtd_blktrans_dev *dev); 77 - int (*release)(struct mtd_blktrans_dev *dev); 77 + void (*release)(struct mtd_blktrans_dev *dev); 78 78 79 79 /* Called on {de,}registration and on subsequent addition/removal 80 80 of devices, with mtd_table_mutex held. */