diff options
| author | Simon Glass <sjg@chromium.org> | 2016-02-29 15:25:51 -0700 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2016-03-14 15:34:50 -0600 |
| commit | bcce53d048de7f41078d25e39aa2f26d752d3658 (patch) | |
| tree | 5eb88ab671c7ec923cfb4fe9c0d3dc4715adb93d /disk/part.c | |
| parent | 782b97805e9f59cc2b4d3aa67a8a03248e8cd722 (diff) | |
| download | talos-obmc-uboot-bcce53d048de7f41078d25e39aa2f26d752d3658.tar.gz talos-obmc-uboot-bcce53d048de7f41078d25e39aa2f26d752d3658.zip | |
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>
Diffstat (limited to 'disk/part.c')
| -rw-r--r-- | disk/part.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/disk/part.c b/disk/part.c index 9a78cceadb..2a46050392 100644 --- a/disk/part.c +++ b/disk/part.c @@ -108,7 +108,7 @@ static struct blk_desc *get_dev_hwpart(const char *ifname, int dev, int hwpart) 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 @@ static void print_part_header(const char *type, struct blk_desc *dev_desc) 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 blk_get_device_part_str(const char *ifname, const char *dev_part_str, 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 |
