diff --git a/drivers/input/touchscreen/synaptics_mmi_class/synaptics_dsx_fw_update.c b/drivers/input/touchscreen/synaptics_mmi_class/synaptics_dsx_fw_update.c
index dab482b0cc19..d8e38304031a 100644
--- a/drivers/input/touchscreen/synaptics_mmi_class/synaptics_dsx_fw_update.c
+++ b/drivers/input/touchscreen/synaptics_mmi_class/synaptics_dsx_fw_update.c
@@ -3631,7 +3631,7 @@ exit:
 }
 #endif
 
-static int synaptics_fw_updater(
+static int synaptics_fw_updater_local(
 			struct synaptics_rmi4_fwu_handle *fwu,
 			const unsigned char *fw_data)
 {
@@ -3654,7 +3654,6 @@ static int synaptics_fw_updater(
 
 	return retval;
 }
-//EXPORT_SYMBOL(synaptics_fw_updater);
 
 #ifdef CONFIG_TOUCHSCREEN_SYNAPTICS_DSX_FW_UPDATE_EXTRA_SYSFS_MMI
 static ssize_t fwu_sysfs_show_image(struct file *data_file,
@@ -3777,10 +3776,10 @@ static int synaptics_dsx_firmware_update(struct device *dev,
 		}
 	}
 
-	strlcpy(fwu->image_name, fwname, strlen(fwname));
+	strlcpy(fwu->image_name, fwname, MAX_IMAGE_NAME_LEN);
 	dev_dbg(dev, "%s: FW filename: %s\n", __func__, fwu->image_name);
 
-	retval = synaptics_fw_updater(fwu, fwu->ext_data_source);
+	retval = synaptics_fw_updater_local(fwu, NULL);
 	if (retval < 0) {
 		dev_err(dev, "%s: Failed to do reflash\n", __func__);
 		goto exit;
diff --git a/drivers/input/touchscreen/synaptics_mmi_class/synaptics_dsx_i2c.c b/drivers/input/touchscreen/synaptics_mmi_class/synaptics_dsx_i2c.c
index e56d05c04eb7..64b67758cd51 100644
--- a/drivers/input/touchscreen/synaptics_mmi_class/synaptics_dsx_i2c.c
+++ b/drivers/input/touchscreen/synaptics_mmi_class/synaptics_dsx_i2c.c
@@ -18,8 +18,6 @@
  */
 #define pr_fmt(fmt) "%s: " fmt, __func__
 
-#define DEBUG 511
-
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/slab.h>
diff --git a/drivers/input/touchscreen/synaptics_mmi_class/synaptics_mmi_class.c b/drivers/input/touchscreen/synaptics_mmi_class/synaptics_mmi_class.c
index 6540666f7382..bbc1ede6dd53 100644
--- a/drivers/input/touchscreen/synaptics_mmi_class/synaptics_mmi_class.c
+++ b/drivers/input/touchscreen/synaptics_mmi_class/synaptics_mmi_class.c
@@ -51,7 +51,7 @@ static int synaptics_mmi_get_build_id(struct device *dev, void *cdata) {
 	rmi = &(ts->rmi4_mod_info);
 	batohui(&firmware_id, rmi->build_id, sizeof(rmi->build_id));
 
-	return scnprintf(TO_CHARP(cdata), TS_MMI_MAX_ID_LEN, "%x\n", firmware_id);
+	return scnprintf(TO_CHARP(cdata), TS_MMI_MAX_ID_LEN, "%x", firmware_id);
 }
 
 static int synaptics_mmi_get_config_id(struct device *dev, void *cdata) {
@@ -63,7 +63,7 @@ static int synaptics_mmi_get_config_id(struct device *dev, void *cdata) {
 	rmi = &(ts->rmi4_mod_info);
 	batohui(&config_id, rmi->config_id, sizeof(rmi->config_id));
 
-	return scnprintf(TO_CHARP(cdata), TS_MMI_MAX_ID_LEN, "%08x\n", config_id);
+	return scnprintf(TO_CHARP(cdata), TS_MMI_MAX_ID_LEN, "%08x", config_id);
 }
 
 static int synaptics_mmi_get_bus_type(struct device *dev, void *idata) {