A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-13 08:07:32 -04:00
Code Issues Projects Releases Packages Wiki Activity

Remove unused variable defination in case build error

Browse source 
Remove unused variable defination on touch screen mmi class and goodix
touch driver in case build error on SM8550.

Change-Id: Ie3c759f340c6dd7569d0bb439b7a5d5a3fef5476
Signed-off-by: Wenge Zhu <zhuwg1@motorola.com>
Reviewed-on: https://gerrit.mot.com/2284829
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
Reviewed-by: Jichao Zou <zoujc@motorola.com>
Submit-Approved: Jira Key
This commit is contained in:
Wenge Zhu 2022-05-31 15:13:56 +08:00 • committed by zhuwg1
commit f6113063b5
2 changed files with 2 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

17
drivers/input/touchscreen/goodix_berlin_mmi/goodix_ts_mmi.c
View file

@ -351,11 +351,9 @@ static ssize_t goodix_ts_stylus_mode_store(struct device *dev,
unsigned long mode = 0;
struct platform_device *pdev;
struct goodix_ts_core *core_data;
const struct goodix_ts_hw_ops *hw_ops;
dev = MMI_DEV_TO_TS_DEV(dev);
GET_GOODIX_DATA(dev);
hw_ops = core_data->hw_ops;
ret = kstrtoul(buf, 0, &mode);
if (ret < 0) {
@ -460,11 +458,9 @@ static ssize_t goodix_ts_interpolation_store(struct device *dev,
unsigned long mode = 0;
struct platform_device *pdev;
struct goodix_ts_core *core_data;
const struct goodix_ts_hw_ops *hw_ops;
dev = MMI_DEV_TO_TS_DEV(dev);
GET_GOODIX_DATA(dev);
hw_ops = core_data->hw_ops;
ret = kstrtoul(buf, 0, &mode);
if (ret < 0) {
@ -505,11 +501,9 @@ static ssize_t goodix_ts_sample_store(struct device *dev,
unsigned long mode = 0;
struct platform_device *pdev;
struct goodix_ts_core *core_data;
const struct goodix_ts_hw_ops *hw_ops;
dev = MMI_DEV_TO_TS_DEV(dev);
GET_GOODIX_DATA(dev);
hw_ops = core_data->hw_ops;
ret = kstrtoul(buf, 0, &mode);
if (ret < 0) {
@ -590,11 +584,9 @@ static ssize_t goodix_ts_edge_store(struct device *dev,
unsigned int args[2] = { 0 };
struct platform_device *pdev;
struct goodix_ts_core *core_data;
const struct goodix_ts_hw_ops *hw_ops;
dev = MMI_DEV_TO_TS_DEV(dev);
GET_GOODIX_DATA(dev);
hw_ops = core_data->hw_ops;
ret = sscanf(buf, "%d %d", &args[0], &args[1]);
if (ret < 2)
@ -884,7 +876,6 @@ static int goodix_ts_mmi_charger_mode(struct device *dev, int mode)
int timeout = 50;
struct platform_device *pdev;
struct goodix_ts_core *core_data;
const struct goodix_ts_hw_ops *hw_ops;
GET_GOODIX_DATA(dev);
@ -892,8 +883,6 @@ static int goodix_ts_mmi_charger_mode(struct device *dev, int mode)
while (core_data->init_stage < CORE_INIT_STAGE2 && timeout--)
msleep(100);
hw_ops = core_data->hw_ops;
mutex_lock(&core_data->mode_lock);
ret = goodix_ts_send_cmd(core_data, CHARGER_MODE_CMD, 5, mode, 0x00);
if (ret < 0) {
@ -952,11 +941,9 @@ static int goodix_ts_mmi_panel_state(struct device *dev,
static int goodix_ts_mmi_pre_resume(struct device *dev) {
struct platform_device *pdev;
struct goodix_ts_core *core_data;
const struct goodix_ts_hw_ops *hw_ops;
ts_info("Resume start");
GET_GOODIX_DATA(dev);
hw_ops = core_data->hw_ops;
atomic_set(&core_data->suspended, 0);
if (core_data->gesture_enabled) {
@ -971,10 +958,8 @@ static int goodix_ts_mmi_post_resume(struct device *dev) {
int ret = 0;
struct platform_device *pdev;
struct goodix_ts_core *core_data;
const struct goodix_ts_hw_ops *hw_ops;
GET_GOODIX_DATA(dev);
hw_ops = core_data->hw_ops;
/* open esd */
goodix_ts_blocking_notify(NOTIFY_RESUME, NULL);
@ -1065,10 +1050,8 @@ static int goodix_ts_mmi_pre_suspend(struct device *dev) {
int ret = 0;
struct platform_device *pdev;
struct goodix_ts_core *core_data;
const struct goodix_ts_hw_ops *hw_ops;
GET_GOODIX_DATA(dev);
hw_ops = core_data->hw_ops;
ts_info("Suspend start");
atomic_set(&core_data->suspended, 1);

6
drivers/input/touchscreen/touchscreen_mmi/touchscreen_mmi_gesture.c
View file

@ -326,7 +326,7 @@ static int ts_mmi_touch_event_edge_handler(struct touch_event_data *tev, struct
static int ts_mmi_touch_event_handler(struct touch_event_data *tev, struct input_dev *input_dev)
{
struct ts_mmi_dev *touch_cdev = events_data->touch_cdev;
int ret = 0;
__maybe_unused int ret = 0;
#ifdef TS_MMI_TOUCH_EDGE_GESTURE
ts_mmi_touch_event_edge_handler(tev, input_dev);
@ -367,9 +367,7 @@ static int ts_mmi_touch_event_handler(struct touch_event_data *tev, struct inpu
bool ts_mmi_is_sensor_enable(void)
{
struct ts_mmi_dev *touch_cdev;
if (sensor_pdata != NULL) {
touch_cdev = sensor_pdata->touch_cdev;
return !!sensor_pdata->sensor_opened;
}
else
@ -617,4 +615,4 @@ int ts_mmi_palm_remove(struct ts_mmi_dev *touch_cdev)
palm_sensor_pdata = NULL;
return 0;
}
}