Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 88b6329cce9b344159ac7d708f8f2d6bfd98faf0

Authored by Alex Deymo
Committed by Tom Rini
1 parent 210a7176ee
Exists in smarc_8mq_lf_v2020.04 and in 17 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0

disk: Return the partition number in part_get_info_by_name() 

Similar to what blk_get_device_part_str() does, this patch makes
part_get_info_by_name() return the partition number in case of a match.
This is useful when the partition number is needed and not just the
descriptor.

Signed-off-by: Alex Deymo <deymo@google.com>
Reviewed-by: Simon Glass <sjg@chromium.org>

Showing 3 changed files with 6 additions and 5 deletions Side-by-side Diff

... ... @@ -37,7 +37,7 @@
37 37 int ret;
38 38  
39 39 ret = part_get_info_by_name(dev_desc, name, info);
40   - if (ret) {
  40 + if (ret < 0) {
41 41 /* strlen("fastboot_partition_alias_") + 32(part_name) + 1 */
42 42 char env_alias_name[25 + 32 + 1];
43 43 char *aliased_part_name;
... ... @@ -153,7 +153,7 @@
153 153 }
154 154 #endif
155 155  
156   - if (part_get_info_by_name_or_alias(dev_desc, cmd, &info)) {
  156 + if (part_get_info_by_name_or_alias(dev_desc, cmd, &info) < 0) {
157 157 error("cannot find partition: '%s'\n", cmd);
158 158 fastboot_fail("cannot find partition");
159 159 return;
... ... @@ -205,7 +205,7 @@
205 205 }
206 206  
207 207 ret = part_get_info_by_name_or_alias(dev_desc, cmd, &info);
208   - if (ret) {
  208 + if (ret < 0) {
209 209 error("cannot find partition: '%s'", cmd);
210 210 fastboot_fail("cannot find partition");
211 211 return;
... ... @@ -635,7 +635,7 @@
635 635 }
636 636 if (strcmp(name, (const char *)info->name) == 0) {
637 637 /* matched */
638   - return 0;
  638 + return i;
639 639 }
640 640 }
641 641 }
... ... @@ -163,7 +163,8 @@
163 163 * @param gpt_name - the specified table entry name
164 164 * @param info - returns the disk partition info
165 165 *
166   - * @return - '0' on match, '-1' on no match, otherwise error
  166 + * @return - the partition number on match (starting on 1), -1 on no match,
  167 + * otherwise error
167 168 */
168 169 int part_get_info_by_name(struct blk_desc *dev_desc,
169 170 const char *name, disk_partition_t *info);