From e308efd907da9e573d96786dd141cc236d50fd7e Mon Sep 17 00:00:00 2001 From: Yan Zhang Date: Sun, 30 Jul 2023 21:13:28 +0800 Subject: [PATCH] nova0flash: Fix unused lable build error Why: Fix unsed err_register_drm_notif_failed build error when DRM is not define Change-Id: I660339f2605016892387ec0a5d8ec2666e891122 Signed-off-by: Yan Zhang Reviewed-on: https://gerrit.mot.com/2694111 SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Tested-by: Jira Key Reviewed-by: Wang Wang Submit-Approved: Jira Key --- drivers/input/touchscreen/nova_0flash_mmi/nt36xxx.c | 3 ++- drivers/input/touchscreen/nova_0flash_mmi/nt36xxx.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/input/touchscreen/nova_0flash_mmi/nt36xxx.c b/drivers/input/touchscreen/nova_0flash_mmi/nt36xxx.c index 723d59cde8df..2eae96c33d52 100644 --- a/drivers/input/touchscreen/nova_0flash_mmi/nt36xxx.c +++ b/drivers/input/touchscreen/nova_0flash_mmi/nt36xxx.c @@ -3235,7 +3235,7 @@ err_create_touchscreen_class_failed: #if defined(CONFIG_INPUT_TOUCHSCREEN_MMI) nvt_mmi_init(ts, false); #endif -err_register_drm_notif_failed: + #ifndef CONFIG_INPUT_TOUCHSCREEN_MMI #if (((LINUX_VERSION_CODE >= KERNEL_VERSION(5, 4, 0)) && (LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0))) || defined(NVT_CONFIG_DRM_PANEL)) #if defined(CONFIG_DRM) @@ -3248,6 +3248,7 @@ err_register_drm_notif_failed: NVT_ERR("Error occurred while unregistering drm_notifier.\n"); #endif } +err_register_drm_notif_failed: #endif #else //vension code < 5.4.0 #if defined(CONFIG_FB) diff --git a/drivers/input/touchscreen/nova_0flash_mmi/nt36xxx.h b/drivers/input/touchscreen/nova_0flash_mmi/nt36xxx.h index e74aa13d58b3..0394401f1db1 100644 --- a/drivers/input/touchscreen/nova_0flash_mmi/nt36xxx.h +++ b/drivers/input/touchscreen/nova_0flash_mmi/nt36xxx.h @@ -39,7 +39,7 @@ #ifdef NOVATECH_PEN_NOTIFIER #include #endif -#ifdef NVT_CONFIG_DRM_PANEL +#if (!defined(CONFIG_INPUT_TOUCHSCREEN_MMI) && defined(NVT_CONFIG_DRM_PANEL)) #if IS_ENABLED(CONFIG_QCOM_PANEL_EVENT_NOTIFIER) #define NVT_DRM_PANEL_EVENT_NOTIFICATIONS #include