diff options
| author | Simon Glass <sjg@chromium.org> | 2016-02-29 15:25:44 -0700 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2016-03-14 15:34:50 -0600 |
| commit | e35929e4a1ffe861f2f45e107986568c56c4f077 (patch) | |
| tree | 931c9af5f622d4fb90bf932a911100bcd94c75c0 /cmd | |
| parent | ebac37cfbfb32ea44704fe032fadd5cf334824b7 (diff) | |
dm: blk: Rename get_device_and_partition()
Rename this function to blk_get_device_part_str(). This is a better name
because it makes it clear that the function returns a block device and
parses a string.
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 'cmd')
| -rw-r--r-- | cmd/disk.c | 2 | ||||
| -rw-r--r-- | cmd/fat.c | 4 | ||||
| -rw-r--r-- | cmd/part.c | 2 | ||||
| -rw-r--r-- | cmd/reiser.c | 4 | ||||
| -rw-r--r-- | cmd/zfs.c | 4 |
5 files changed, 8 insertions, 8 deletions
diff --git a/cmd/disk.c b/cmd/disk.c index c53c2a2dbfe..0883c79506c 100644 --- a/cmd/disk.c +++ b/cmd/disk.c @@ -38,7 +38,7 @@ int common_diskboot(cmd_tbl_t *cmdtp, const char *intf, int argc, bootstage_mark(BOOTSTAGE_ID_IDE_BOOT_DEVICE); - part = get_device_and_partition(intf, (argc == 3) ? argv[2] : NULL, + part = blk_get_device_part_str(intf, (argc == 3) ? argv[2] : NULL, &dev_desc, &info, 1); if (part < 0) { bootstage_error(BOOTSTAGE_ID_IDE_TYPE); diff --git a/cmd/fat.c b/cmd/fat.c index 82b9b38c2c5..18a1be97e0a 100644 --- a/cmd/fat.c +++ b/cmd/fat.c @@ -77,7 +77,7 @@ static int do_fat_fsinfo(cmd_tbl_t *cmdtp, int flag, int argc, return 0; } - part = get_device_and_partition(argv[1], argv[2], &dev_desc, &info, 1); + part = blk_get_device_part_str(argv[1], argv[2], &dev_desc, &info, 1); if (part < 0) return 1; @@ -114,7 +114,7 @@ static int do_fat_fswrite(cmd_tbl_t *cmdtp, int flag, if (argc < 5) return cmd_usage(cmdtp); - part = get_device_and_partition(argv[1], argv[2], &dev_desc, &info, 1); + part = blk_get_device_part_str(argv[1], argv[2], &dev_desc, &info, 1); if (part < 0) return 1; diff --git a/cmd/part.c b/cmd/part.c index dd32d505b0b..415b38a5227 100644 --- a/cmd/part.c +++ b/cmd/part.c @@ -37,7 +37,7 @@ static int do_part_uuid(int argc, char * const argv[]) if (argc > 3) return CMD_RET_USAGE; - part = get_device_and_partition(argv[0], argv[1], &dev_desc, &info, 0); + part = blk_get_device_part_str(argv[0], argv[1], &dev_desc, &info, 0); if (part < 0) return 1; diff --git a/cmd/reiser.c b/cmd/reiser.c index 1cca5eb6581..a7179561e4a 100644 --- a/cmd/reiser.c +++ b/cmd/reiser.c @@ -40,7 +40,7 @@ int do_reiserls (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) if (argc < 3) return CMD_RET_USAGE; - part = get_device_and_partition(argv[1], argv[2], &dev_desc, &info, 1); + part = blk_get_device_part_str(argv[1], argv[2], &dev_desc, &info, 1); if (part < 0) return 1; @@ -122,7 +122,7 @@ int do_reiserload (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) return 1; } - part = get_device_and_partition(argv[1], argv[2], &dev_desc, &info, 1); + part = blk_get_device_part_str(argv[1], argv[2], &dev_desc, &info, 1); if (part < 0) return 1; diff --git a/cmd/zfs.c b/cmd/zfs.c index 9076a8a6bbd..bb61afd80de 100644 --- a/cmd/zfs.c +++ b/cmd/zfs.c @@ -80,7 +80,7 @@ static int do_zfs_load(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[] return 1; } - part = get_device_and_partition(argv[1], argv[2], &dev_desc, &info, 1); + part = blk_get_device_part_str(argv[1], argv[2], &dev_desc, &info, 1); if (part < 0) return 1; @@ -145,7 +145,7 @@ static int do_zfs_ls(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) if (argc == 4) filename = argv[3]; - part = get_device_and_partition(argv[1], argv[2], &dev_desc, &info, 1); + part = blk_get_device_part_str(argv[1], argv[2], &dev_desc, &info, 1); if (part < 0) return 1; |