aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2013-05-05 21:31:22 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2013-05-05 21:31:22 -0400
commita8ca889ed9585894d53fd8919d80cbe8baff09e7 (patch)
tree72461b2648110bf57d28d1949d1b5fe76a2148c1
parent1950267e6e9dc2531f2790bf217aa7aadc9aa324 (diff)
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>
-rw-r--r--drivers/mtd/mtd_blkdevs.c8
-rw-r--r--drivers/mtd/mtdblock.c4
-rw-r--r--drivers/mtd/sm_ftl.c3
-rw-r--r--include/linux/mtd/blktrans.h2
4 files changed, 7 insertions, 10 deletions
diff --git a/drivers/mtd/mtd_blkdevs.c b/drivers/mtd/mtd_blkdevs.c
index 5ad39bb5ab4c..65d7e7e2fb1f 100644
--- a/drivers/mtd/mtd_blkdevs.c
+++ b/drivers/mtd/mtd_blkdevs.c
@@ -240,10 +240,9 @@ error_put:
240static int blktrans_release(struct gendisk *disk, fmode_t mode) 240static int blktrans_release(struct gendisk *disk, fmode_t mode)
241{ 241{
242 struct mtd_blktrans_dev *dev = blktrans_dev_get(disk); 242 struct mtd_blktrans_dev *dev = blktrans_dev_get(disk);
243 int ret = 0;
244 243
245 if (!dev) 244 if (!dev)
246 return ret; 245 return 0;
247 246
248 mutex_lock(&dev->lock); 247 mutex_lock(&dev->lock);
249 248
@@ -254,13 +253,14 @@ static int blktrans_release(struct gendisk *disk, fmode_t mode)
254 module_put(dev->tr->owner); 253 module_put(dev->tr->owner);
255 254
256 if (dev->mtd) { 255 if (dev->mtd) {
257 ret = dev->tr->release ? dev->tr->release(dev) : 0; 256 if (dev->tr->release)
257 dev->tr->release(dev);
258 __put_mtd_device(dev->mtd); 258 __put_mtd_device(dev->mtd);
259 } 259 }
260unlock: 260unlock:
261 mutex_unlock(&dev->lock); 261 mutex_unlock(&dev->lock);
262 blktrans_dev_put(dev); 262 blktrans_dev_put(dev);
263 return ret; 263 return 0;
264} 264}
265 265
266static int blktrans_getgeo(struct block_device *bdev, struct hd_geometry *geo) 266static int blktrans_getgeo(struct block_device *bdev, struct hd_geometry *geo)
diff --git a/drivers/mtd/mtdblock.c b/drivers/mtd/mtdblock.c
index 6c6d80736fad..2aef5dda522b 100644
--- a/drivers/mtd/mtdblock.c
+++ b/drivers/mtd/mtdblock.c
@@ -308,7 +308,7 @@ static int mtdblock_open(struct mtd_blktrans_dev *mbd)
308 return 0; 308 return 0;
309} 309}
310 310
311static int mtdblock_release(struct mtd_blktrans_dev *mbd) 311static void mtdblock_release(struct mtd_blktrans_dev *mbd)
312{ 312{
313 struct mtdblk_dev *mtdblk = container_of(mbd, struct mtdblk_dev, mbd); 313 struct mtdblk_dev *mtdblk = container_of(mbd, struct mtdblk_dev, mbd);
314 314
@@ -333,8 +333,6 @@ static int mtdblock_release(struct mtd_blktrans_dev *mbd)
333 mutex_unlock(&mtdblks_lock); 333 mutex_unlock(&mtdblks_lock);
334 334
335 pr_debug("ok\n"); 335 pr_debug("ok\n");
336
337 return 0;
338} 336}
339 337
340static int mtdblock_flush(struct mtd_blktrans_dev *dev) 338static int mtdblock_flush(struct mtd_blktrans_dev *dev)
diff --git a/drivers/mtd/sm_ftl.c b/drivers/mtd/sm_ftl.c
index 8dd6ba52404a..f9d5615c5727 100644
--- a/drivers/mtd/sm_ftl.c
+++ b/drivers/mtd/sm_ftl.c
@@ -1107,7 +1107,7 @@ static int sm_flush(struct mtd_blktrans_dev *dev)
1107} 1107}
1108 1108
1109/* outside interface: device is released */ 1109/* outside interface: device is released */
1110static int sm_release(struct mtd_blktrans_dev *dev) 1110static void sm_release(struct mtd_blktrans_dev *dev)
1111{ 1111{
1112 struct sm_ftl *ftl = dev->priv; 1112 struct sm_ftl *ftl = dev->priv;
1113 1113
@@ -1116,7 +1116,6 @@ static int sm_release(struct mtd_blktrans_dev *dev)
1116 cancel_work_sync(&ftl->flush_work); 1116 cancel_work_sync(&ftl->flush_work);
1117 sm_cache_flush(ftl); 1117 sm_cache_flush(ftl);
1118 mutex_unlock(&ftl->mutex); 1118 mutex_unlock(&ftl->mutex);
1119 return 0;
1120} 1119}
1121 1120
1122/* outside interface: get geometry */ 1121/* outside interface: get geometry */
diff --git a/include/linux/mtd/blktrans.h b/include/linux/mtd/blktrans.h
index 4eb0a50d0c55..e93837f647de 100644
--- a/include/linux/mtd/blktrans.h
+++ b/include/linux/mtd/blktrans.h
@@ -74,7 +74,7 @@ struct mtd_blktrans_ops {
74 74
75 /* Called with mtd_table_mutex held; no race with add/remove */ 75 /* Called with mtd_table_mutex held; no race with add/remove */
76 int (*open)(struct mtd_blktrans_dev *dev); 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 /* Called on {de,}registration and on subsequent addition/removal 79 /* Called on {de,}registration and on subsequent addition/removal
80 of devices, with mtd_table_mutex held. */ 80 of devices, with mtd_table_mutex held. */