]> git.ipfire.org Git - thirdparty/u-boot.git/commitdiff
disk: Drop always true conditional check
authorMarek Vasut <marek.vasut+renesas@mailbox.org>
Sun, 13 Aug 2023 23:46:41 +0000 (01:46 +0200)
committerTom Rini <trini@konsulko.com>
Tue, 22 Aug 2023 19:17:52 +0000 (15:17 -0400)
if (device_get_uclass_id(dev) == UCLASS_PARTITION) is always
true, because this disk_blk_read() function calls dev_get_blk()
above and checks its return value for non-NULL. The dev_get_blk()
performs the same device_get_uclass_id(dev) check and returns NULL
if not UCLASS_PARTITION. Drop the duplicate check.

Signed-off-by: Marek Vasut <marek.vasut+renesas@mailbox.org>
disk/disk-uclass.c

index d32747e2242d5e0d38ddce3dac5ac312504f4eaa..5974dd8c2ecaa7b7a5f474dcf4eaa4647f23bdca 100644 (file)
@@ -186,10 +186,8 @@ unsigned long disk_blk_read(struct udevice *dev, lbaint_t start,
                return -ENOSYS;
 
        start_in_disk = start;
-       if (device_get_uclass_id(dev) == UCLASS_PARTITION) {
-               part = dev_get_uclass_plat(dev);
-               start_in_disk += part->gpt_part_info.start;
-       }
+       part = dev_get_uclass_plat(dev);
+       start_in_disk += part->gpt_part_info.start;
 
        if (blkcache_read(desc->uclass_id, desc->devnum, start_in_disk, blkcnt,
                          desc->blksz, buffer))