The only callers to mmu_hw_do_operation_locked() pass an 'op' of either AS_COMAND_FLUSH_MEM or AS_COMMAND_FLUSH_PT. So remove the code paths that test for other operations and add a drm_WARN_ON() to catch the posibility of others appearing the future.
Suggested-by: Daniel Stone <dan...@fooishbar.org> Signed-off-by: Steven Price <steven.pr...@arm.com> --- drivers/gpu/drm/panthor/panthor_mmu.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/panthor/panthor_mmu.c b/drivers/gpu/drm/panthor/panthor_mmu.c index 367c89aca558..b16f44aec725 100644 --- a/drivers/gpu/drm/panthor/panthor_mmu.c +++ b/drivers/gpu/drm/panthor/panthor_mmu.c @@ -612,17 +612,12 @@ static int mmu_hw_do_operation_locked(struct panthor_device *ptdev, int as_nr, * power it up */ - if (op != AS_COMMAND_UNLOCK) - lock_region(ptdev, as_nr, iova, size); + drm_WARN_ON(&ptdev->base, + op != AS_COMMAND_FLUSH_MEM && op != AS_COMMAND_FLUSH_PT); - if (op == AS_COMMAND_FLUSH_MEM || op == AS_COMMAND_FLUSH_PT) - return mmu_hw_do_flush_on_gpu_ctrl(ptdev, as_nr, op); + lock_region(ptdev, as_nr, iova, size); - /* Run the MMU operation */ - write_cmd(ptdev, as_nr, op); - - /* Wait for the flush to complete */ - return wait_ready(ptdev, as_nr); + return mmu_hw_do_flush_on_gpu_ctrl(ptdev, as_nr, op); } static int mmu_hw_do_operation(struct panthor_vm *vm, -- 2.39.5