disk: simplify print_part_header()

Using uclass_get_name() reduces the code size.

Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>

diff --git a/disk/part.c b/disk/part.c
index 08c9331e059cff47dd4f23cae55a94aa7c3de6b7..2bee6695828a4a1f5dcf0f6a83d332a16ad2323b 100644 (file)
--- a/disk/part.c
+++ b/disk/part.c
@@ -14,6 +14,7 @@
 #include <malloc.h>
 #include <part.h>
 #include <ubifs_uboot.h>
+#include <dm/uclass.h>
 
 #undef PART_DEBUG
 
@@ -305,50 +306,8 @@ static void print_part_header(const char *type, struct blk_desc *desc)
        CONFIG_IS_ENABLED(ISO_PARTITION) || \
        CONFIG_IS_ENABLED(AMIGA_PARTITION) || \
        CONFIG_IS_ENABLED(EFI_PARTITION)
-       puts ("\nPartition Map for ");
-       switch (desc->uclass_id) {
-       case UCLASS_IDE:
-               puts ("IDE");
-               break;
-       case UCLASS_AHCI:
-               puts ("SATA");
-               break;
-       case UCLASS_SCSI:
-               puts ("SCSI");
-               break;
-       case UCLASS_USB:
-               puts ("USB");
-               break;
-       case UCLASS_MMC:
-               puts ("MMC");
-               break;
-       case UCLASS_HOST:
-               puts ("HOST");
-               break;
-       case UCLASS_NVME:
-               puts ("NVMe");
-               break;
-       case UCLASS_PVBLOCK:
-               puts("PV BLOCK");
-               break;
-       case UCLASS_RKMTD:
-               puts("RKMTD");
-               break;
-       case UCLASS_VIRTIO:
-               puts("VirtIO");
-               break;
-       case UCLASS_EFI_MEDIA:
-               puts("EFI");
-               break;
-       case UCLASS_BLKMAP:
-               puts("BLKMAP");
-               break;
-       default:
-               printf("UNKNOWN(%d)", desc->uclass_id);
-               break;
-       }
-       printf (" device %d  --   Partition Type: %s\n\n",
-                       desc->devnum, type);
+       printf("\nPartition Map for %s device %d  --   Partition Type: %s\n\n",
+              uclass_get_name(desc->uclass_id), desc->devnum, type);
 #endif /* any CONFIG_..._PARTITION */
 }
 

diff --git a/test/py/tests/test_scsi.py b/test/py/tests/test_scsi.py
index be2e283e7d257ae3671156637b8c8d3a2141892a..445693cafd71033fcc72b61989aaaa7d11900039 100644 (file)
--- a/test/py/tests/test_scsi.py
+++ b/test/py/tests/test_scsi.py
@@ -87,6 +87,6 @@ def test_scsi_dev(u_boot_console):
 def test_scsi_part(u_boot_console):
     test_scsi_dev(u_boot_console)
     output = u_boot_console.run_command('scsi part')
-    assert 'Partition Map for SCSI device' in output
+    assert 'Partition Map for scsi device' in output
     output = u_boot_console.run_command('echo $?')
     assert output.endswith('0')