dm: block: Rename device number member dev to devnum
This is a device number, and we want to use 'dev' to mean a driver model
device. Rename the member.
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Tested-by: Stephen Warren <swarren@nvidia.com>
diff --git a/disk/part.c b/disk/part.c
index 9a78cce..2a46050 100644
--- a/disk/part.c
+++ b/disk/part.c
@@ -108,7 +108,7 @@
return dev_desc;
if (!select_hwpart)
return NULL;
- ret = select_hwpart(dev_desc->dev, hwpart);
+ ret = select_hwpart(dev_desc->devnum, hwpart);
if (ret < 0)
return NULL;
return dev_desc;
@@ -325,7 +325,7 @@
break;
}
printf (" device %d -- Partition Type: %s\n\n",
- dev_desc->dev, type);
+ dev_desc->devnum, type);
#endif /* any CONFIG_..._PARTITION */
}
@@ -457,10 +457,6 @@
int part;
disk_partition_t tmpinfo;
-#if defined CONFIG_SANDBOX && defined CONFIG_CMD_UBIFS
-#error Only one of CONFIG_SANDBOX and CONFIG_CMD_UBIFS may be selected
-#endif
-
#ifdef CONFIG_SANDBOX
/*
* Special-case a pseudo block device "hostfs", to allow access to the