From: Marek Vasut <marek.vasut+renesas@mailbox.org>
Date: Sun, 13 Aug 2023 23:46:41 +0000 (+0200)
Subject: disk: Drop always true conditional check
X-Git-Tag: v2025.01-rc5-pxa1908~847^2~31^2~12
X-Git-Url: http://git.dujemihanovic.xyz/img/static/html/index.html?a=commitdiff_plain;h=5ff4609f855b9851af572f0ba9b66e8a5837fd8c;p=u-boot.git

disk: Drop always true conditional check

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>
---

diff --git a/disk/disk-uclass.c b/disk/disk-uclass.c
index d32747e224..5974dd8c2e 100644
--- a/disk/disk-uclass.c
+++ b/disk/disk-uclass.c
@@ -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))