From bcbc566eb4be579d5dff70be8c6a1a8605cd4c61 Mon Sep 17 00:00:00 2001 From: Konstantin Makariev Date: Sun, 25 Apr 2021 10:16:26 -0500 Subject: [PATCH] synaptics_mmi_class: fix broken build Since module name has changed, there is no more naming conflict between touchscreen class based driver and older version not using class code. Removing stale references that won't be used again and fixing broken build on some branches. Change-Id: Id8f9c2b0ce6e4adae31882b7d28d5c928ee71fd7 Signed-off-by: Konstantin Makariev Reviewed-on: https://gerrit.mot.com/1932146 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Ling Jin Submit-Approved: Jira Key --- drivers/input/touchscreen/synaptics_mmi_class/Kbuild | 3 --- .../touchscreen/synaptics_mmi_class/synaptics_dsx_i2c.h | 5 ----- 2 files changed, 8 deletions(-) diff --git a/drivers/input/touchscreen/synaptics_mmi_class/Kbuild b/drivers/input/touchscreen/synaptics_mmi_class/Kbuild index 5f3b642ccd50..9a84af8d38da 100644 --- a/drivers/input/touchscreen/synaptics_mmi_class/Kbuild +++ b/drivers/input/touchscreen/synaptics_mmi_class/Kbuild @@ -3,8 +3,6 @@ EXTRA_CFLAGS += -Wall EXTRA_CFLAGS += -I$(ANDROID_BUILD_TOP)/motorola/kernel/modules/include \ -I$(ANDROID_BUILD_TOP)/motorola/kernel/modules/drivers/input/touchscreen/synaptics_mmi_class -ifeq ($(filter m y,$(CONFIG_PANEL_NOTIFICATIONS)),) - ifneq ($(filter banks%, $(TARGET_PRODUCT)),) EXTRA_CFLAGS += -DSOFTDEP_GPIO_PCAL6408 endif @@ -28,4 +26,3 @@ obj-m += synaptics_mmi_class_rmi_dev.o obj-m += synaptics_mmi_class_test_reporting.o endif -endif diff --git a/drivers/input/touchscreen/synaptics_mmi_class/synaptics_dsx_i2c.h b/drivers/input/touchscreen/synaptics_mmi_class/synaptics_dsx_i2c.h index 31272ee7b801..49025d60a34a 100644 --- a/drivers/input/touchscreen/synaptics_mmi_class/synaptics_dsx_i2c.h +++ b/drivers/input/touchscreen/synaptics_mmi_class/synaptics_dsx_i2c.h @@ -519,11 +519,6 @@ struct synaptics_rmi4_data { struct regulator *vdd_quirk; struct mutex rmi4_io_ctrl_mutex; struct mutex state_mutex; -#if defined(CONFIG_PANEL_NOTIFICATIONS) - struct mmi_notifier panel_nb; -#elif defined(CONFIG_FB) - struct notifier_block panel_nb; -#endif atomic_t panel_off_flag; unsigned char current_page; unsigned char button_0d_enabled;