diff --git a/drivers/video/rockchip/mpp/mpp_service.c b/drivers/video/rockchip/mpp/mpp_service.c
index ffd30b33f053..beba6c3c18c4 100644
--- a/drivers/video/rockchip/mpp/mpp_service.c
+++ b/drivers/video/rockchip/mpp/mpp_service.c
@@ -98,7 +98,7 @@ static int mpp_add_driver(struct mpp_service *srv,
 		     &srv->grf_infos[type],
 		     grf_name);
 
-	if (type == MPP_DRIVER_AV1DEC)
+	if (IS_ENABLED(CONFIG_ROCKCHIP_MPP_AV1DEC) && type == MPP_DRIVER_AV1DEC)
 		ret = av1dec_driver_register(driver);
 	else
 		ret = platform_driver_register(driver);
@@ -116,11 +116,9 @@ static int mpp_remove_driver(struct mpp_service *srv, int i)
 		if (i != MPP_DRIVER_AV1DEC) {
 			mpp_set_grf(&srv->grf_infos[i]);
 			platform_driver_unregister(srv->sub_drivers[i]);
-		}
-#if IS_ENABLED(CONFIG_ROCKCHIP_MPP_AV1DEC)
-		else
+		} else if (IS_ENABLED(CONFIG_ROCKCHIP_MPP_AV1DEC)) {
 			av1dec_driver_unregister(srv->sub_drivers[i]);
-#endif
+		}
 		srv->sub_drivers[i] = NULL;
 	}