From 649f030b09b854d2bd3867766372062d462a0fd8 Mon Sep 17 00:00:00 2001 From: Jianqun Xu Date: Tue, 29 Nov 2022 15:54:39 +0800 Subject: [PATCH] video: rockchip: mpp: fix gcc-6 compile error without AV1DEC driver drivers/video/rockchip/mpp/mpp_service.o: In function `mpp_add_driver': drivers/video/rockchip/mpp/mpp_service.c:102: undefined reference to `av1dec_driver_register' Signed-off-by: Jianqun Xu Change-Id: Ibf2effb98ce7c0c2219d3bbd762dd8c34530626f --- drivers/video/rockchip/mpp/mpp_service.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) 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; }