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 <[email protected]> --- Cc: AKASHI Takahiro <[email protected]> Cc: Abdellatif El Khlifi <[email protected]> Cc: Bin Meng <[email protected]> Cc: Heinrich Schuchardt <[email protected]> Cc: Joshua Watt <[email protected]> Cc: Michal Suchanek <[email protected]> Cc: Simon Glass <[email protected]> Cc: Tobias Waldekranz <[email protected]> --- disk/disk-uclass.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/disk/disk-uclass.c b/disk/disk-uclass.c index d32747e2242..5974dd8c2ec 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)) -- 2.40.1
