summaryrefslogtreecommitdiff
path: root/drivers/mtd/ubi
diff options
context:
space:
mode:
authorArtem Bityutskiy <artem.bityutskiy@linux.intel.com>2014-03-05 15:01:56 +0400
committerArtem Bityutskiy <artem.bityutskiy@linux.intel.com>2014-03-05 17:49:15 +0400
commit8af871887fcba470ff9265c65cff7d14d9e0e3f9 (patch)
tree7bd29431422649a5c241b72a746150af10bb76ca /drivers/mtd/ubi
parent80744cc92207baa913ac9575374738b6298032eb (diff)
downloadlinux-8af871887fcba470ff9265c65cff7d14d9e0e3f9.tar.xz
UBI: rename block device ioctls
Rename the UBI_IOCVOLATTBLK and UBI_IOCVOLDETBLK to UBI_IOCVOLCRBLK and UBI_IOCVOLRMBLK, because we do not use terms "attach" and "detach" for the R/O block devices on top of UBI volumes. Instead, we use terms "create" and "remove". This patch also amends the related commentaries. Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com> Acked-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
Diffstat (limited to 'drivers/mtd/ubi')
-rw-r--r--drivers/mtd/ubi/block.c2
-rw-r--r--drivers/mtd/ubi/cdev.c8
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/mtd/ubi/block.c b/drivers/mtd/ubi/block.c
index 16e67318acf3..69a74fd07978 100644
--- a/drivers/mtd/ubi/block.c
+++ b/drivers/mtd/ubi/block.c
@@ -32,7 +32,7 @@
* This feature is compiled in the UBI core, and adds a 'block' parameter
* to allow early creation of block devices on top of UBI volumes. Runtime
* block creation/removal for UBI volumes is provided through two UBI ioctls:
- * UBI_IOCVOLATTBLK and UBI_IOCVOLDETBLK.
+ * UBI_IOCVOLCRBLK and UBI_IOCVOLRMBLK.
*/
#include <linux/module.h>
diff --git a/drivers/mtd/ubi/cdev.c b/drivers/mtd/ubi/cdev.c
index 11c847349642..f54562a5998e 100644
--- a/drivers/mtd/ubi/cdev.c
+++ b/drivers/mtd/ubi/cdev.c
@@ -561,8 +561,8 @@ static long vol_cdev_ioctl(struct file *file, unsigned int cmd,
break;
}
- /* Attach a block device to an UBI volume */
- case UBI_IOCVOLATTBLK:
+ /* Create a R/O block device on top of the UBI volume */
+ case UBI_IOCVOLCRBLK:
{
struct ubi_volume_info vi;
@@ -571,8 +571,8 @@ static long vol_cdev_ioctl(struct file *file, unsigned int cmd,
break;
}
- /* Dettach a block device from an UBI volume */
- case UBI_IOCVOLDETBLK:
+ /* Remove the R/O block device */
+ case UBI_IOCVOLRMBLK:
{
struct ubi_volume_info vi;