diff --git a/drivers/input/touchscreen/stm/ftm4_ts.c b/drivers/input/touchscreen/stm/ftm4_ts.c index 0e5d94b0b94c..5ab004e784d8 100644 --- a/drivers/input/touchscreen/stm/ftm4_ts.c +++ b/drivers/input/touchscreen/stm/ftm4_ts.c @@ -578,6 +578,7 @@ static unsigned char fts_event_handler_type_b(struct fts_ts_info *info, case EVENTID_ENTER_POINTER: info->touch_count++; + fallthrough; case EVENTID_MOTION_POINTER: if (info->touch_count == 0) { @@ -1102,7 +1103,7 @@ error: return retval; } -static int fts_probe(struct i2c_client *client, const struct i2c_device_id *idp) +static int fts_probe(struct i2c_client *client) { int retval = 0; struct fts_ts_info *info = NULL; @@ -1231,7 +1232,7 @@ err_setup_drv_data: return retval; } -static int fts_remove(struct i2c_client *client) +static void fts_remove(struct i2c_client *client) { struct fts_ts_info *info = i2c_get_clientdata(client); const struct fts_i2c_platform_data *pdata = info->board; @@ -1262,8 +1263,6 @@ static int fts_remove(struct i2c_client *client) gpio_free(pdata->vio_gpio); kfree(info); - - return 0; } static void fts_release_all_finger(struct fts_ts_info *info)