TechPanelGM/kernel_xiaomi_sm8250
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drivers: input: touchscreen: nt36523: Guard pm related code correctly

Browse Source 
* Power-management related code get compiled only with CONFIG_FB enabled,
   however, this config is not required.

Change-Id: Ia42812518ed1a60a8ca315a6e423d06846b2e9dc
Signed-off-by: Isaac Chen <tingyi364@gmail.com>
This commit is contained in:
Isaac Chen
2024-02-26 10:06:39 +08:00
committed by Sebastiano Barezzi
parent 79d40b9577
commit c4edd4cd8c
2 changed files with 16 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
drivers/input/touchscreen/nt36523/nt36xxx.c
View File

@@ -27,10 +27,9 @@
#include <linux/debugfs.h> #include <linux/debugfs.h>
#include <uapi/linux/sched/types.h> #include <uapi/linux/sched/types.h>
#if defined(CONFIG_FB) #if defined (CONFIG_DRM)
#ifdef CONFIG_DRM
#include <drm/drm_notifier_mi.h> #include <drm/drm_notifier_mi.h>
#endif #elif defined (CONFIG_FB)
#include <linux/notifier.h> #include <linux/notifier.h>
#include <linux/fb.h> #include <linux/fb.h>
#elif defined (CONFIG_HAS_EARLYSUSPEND) #elif defined (CONFIG_HAS_EARLYSUSPEND)
@@ -81,14 +80,12 @@ static struct workqueue_struct *nvt_lockdown_wq;
extern void Boot_Update_Firmware(struct work_struct *work); extern void Boot_Update_Firmware(struct work_struct *work);
#endif #endif
#if defined(CONFIG_FB) #if defined(CONFIG_DRM)
#ifdef CONFIG_DRM
static int nvt_drm_notifier_callback(struct notifier_block *self, static int nvt_drm_notifier_callback(struct notifier_block *self,
unsigned long event, void *data); unsigned long event, void *data);
#else #elif defined(CONFIG_FB)
static int nvt_fb_notifier_callback(struct notifier_block *self, static int nvt_fb_notifier_callback(struct notifier_block *self,
unsigned long event, void *data); unsigned long event, void *data);
#endif
#elif defined(CONFIG_HAS_EARLYSUSPEND) #elif defined(CONFIG_HAS_EARLYSUSPEND)
static void nvt_ts_early_suspend(struct early_suspend *h); static void nvt_ts_early_suspend(struct early_suspend *h);
static void nvt_ts_late_resume(struct early_suspend *h); static void nvt_ts_late_resume(struct early_suspend *h);
@@ -3327,22 +3324,20 @@ static int32_t nvt_ts_probe(struct spi_device *client)
ret); ret);
goto err_register_pen_charge_state_failed; goto err_register_pen_charge_state_failed;
} }
#if defined(CONFIG_FB) #if defined (CONFIG_DRM)
#ifdef CONFIG_DRM
ts->drm_notif.notifier_call = nvt_drm_notifier_callback; ts->drm_notif.notifier_call = nvt_drm_notifier_callback;
ret = mi_drm_register_client(&ts->drm_notif); ret = mi_drm_register_client(&ts->drm_notif);
if (ret) { if (ret) {
NVT_ERR("register drm_notifier failed. ret=%d\n", ret); NVT_ERR("register drm_notifier failed. ret=%d\n", ret);
goto err_register_drm_notif_failed; goto err_register_drm_notif_failed;
} }
#else #elif defined (CONFIG_FB)
ts->fb_notif.notifier_call = nvt_fb_notifier_callback; ts->fb_notif.notifier_call = nvt_fb_notifier_callback;
ret = fb_register_client(&ts->fb_notif); ret = fb_register_client(&ts->fb_notif);
if (ret) { if (ret) {
NVT_ERR("register fb_notifier failed. ret=%d\n", ret); NVT_ERR("register fb_notifier failed. ret=%d\n", ret);
goto err_register_fb_notif_failed; goto err_register_fb_notif_failed;
} }
#endif
#elif defined (CONFIG_HAS_EARLYSUSPEND) #elif defined (CONFIG_HAS_EARLYSUSPEND)
ts->early_suspend.level = EARLY_SUSPEND_LEVEL_BLANK_SCREEN + 1; ts->early_suspend.level = EARLY_SUSPEND_LEVEL_BLANK_SCREEN + 1;
ts->early_suspend.suspend = nvt_ts_early_suspend; ts->early_suspend.suspend = nvt_ts_early_suspend;
@@ -3397,16 +3392,14 @@ static int32_t nvt_ts_probe(struct spi_device *client)
err_register_power_supply_notif_failed: err_register_power_supply_notif_failed:
mutex_destroy(&ts->power_supply_lock); mutex_destroy(&ts->power_supply_lock);
#if defined(CONFIG_FB) #if defined (CONFIG_DRM)
#ifdef CONFIG_DRM
if (mi_drm_unregister_client(&ts->drm_notif)) if (mi_drm_unregister_client(&ts->drm_notif))
NVT_ERR("Error occurred while unregistering drm_notifier.\n"); NVT_ERR("Error occurred while unregistering drm_notifier.\n");
err_register_drm_notif_failed: err_register_drm_notif_failed:
#else #elif defined (CONFIG_FB)
if (fb_unregister_client(&ts->fb_notif)) if (fb_unregister_client(&ts->fb_notif))
NVT_ERR("Error occurred while unregistering fb_notifier.\n"); NVT_ERR("Error occurred while unregistering fb_notifier.\n");
err_register_fb_notif_failed: err_register_fb_notif_failed:
#endif
#elif defined(CONFIG_HAS_EARLYSUSPEND) #elif defined(CONFIG_HAS_EARLYSUSPEND)
unregister_early_suspend(&ts->early_suspend); unregister_early_suspend(&ts->early_suspend);
err_register_early_suspend_failed: err_register_early_suspend_failed:
@@ -3878,8 +3871,7 @@ static int32_t nvt_ts_resume(struct device *dev)
return 0; return 0;
} }
#if defined(CONFIG_FB) #if defined (CONFIG_DRM)
#ifdef CONFIG_DRM
static int nvt_drm_notifier_callback(struct notifier_block *self, static int nvt_drm_notifier_callback(struct notifier_block *self,
unsigned long event, void *data) unsigned long event, void *data)
{ {
@@ -3918,7 +3910,7 @@ static int nvt_drm_notifier_callback(struct notifier_block *self,
return 0; return 0;
} }
#else #elif defined (CONFIG_FB)
static int nvt_fb_notifier_callback(struct notifier_block *self, static int nvt_fb_notifier_callback(struct notifier_block *self,
unsigned long event, void *data) unsigned long event, void *data)
{ {
@@ -3943,7 +3935,6 @@ static int nvt_fb_notifier_callback(struct notifier_block *self,
return 0; return 0;
} }
#endif
#elif defined (CONFIG_HAS_EARLYSUSPEND) #elif defined (CONFIG_HAS_EARLYSUSPEND)
/******************************************************* /*******************************************************
Description: Description:

6
drivers/input/touchscreen/nt36523/nt36xxx.h
View File

@@ -156,12 +156,10 @@ struct nvt_ts_data {
struct completion dev_pm_suspend_completion; struct completion dev_pm_suspend_completion;
uint16_t addr; uint16_t addr;
int8_t phys[32]; int8_t phys[32];
#if defined(CONFIG_FB) #if defined (CONFIG_DRM)
#ifdef CONFIG_DRM
struct notifier_block drm_notif; struct notifier_block drm_notif;
#else #elif defined (CONFIG_FB)
struct notifier_block fb_notif; struct notifier_block fb_notif;
#endif
#elif defined (CONFIG_HAS_EARLYSUSPEND) #elif defined (CONFIG_HAS_EARLYSUSPEND)
struct early_suspend early_suspend; struct early_suspend early_suspend;
#endif #endif