diff options
| author | Marek Vasut <marek.vasut+renesas@mailbox.org> | 2023-08-14 01:46:41 +0200 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-08-22 15:17:52 -0400 |
| commit | 5ff4609f855b9851af572f0ba9b66e8a5837fd8c (patch) | |
| tree | 367aed624d96d5868dea4babd9d98c81b5a8837f /disk | |
| parent | 5ebe790ff02eb21fe74e0f3992b3b2416c609d18 (diff) | |
| download | u-boot-5ff4609f855b9851af572f0ba9b66e8a5837fd8c.zip u-boot-5ff4609f855b9851af572f0ba9b66e8a5837fd8c.tar.gz u-boot-5ff4609f855b9851af572f0ba9b66e8a5837fd8c.tar.bz2 | |
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>
Diffstat (limited to 'disk')
| -rw-r--r-- | disk/disk-uclass.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/disk/disk-uclass.c b/disk/disk-uclass.c index d32747e..5974dd8 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)) |