misc: replace __FUNCTION__ by __function__

result of :
git grep -l '__FUNCTION__' | xargs sed -i 's/__FUNCTION__/__func__/g'

63 files changed, 264 insertions, 264 deletions

diff --git a/drivers/input/touchscreen/mediatek/FTS2A052/fts2a052_driver.c b/drivers/input/touchscreen/mediatek/FTS2A052/fts2a052_driver.c
index f6a276ffd..4cb3c24e0 100644
--- a/drivers/input/touchscreen/mediatek/FTS2A052/fts2a052_driver.c
+++ b/drivers/input/touchscreen/mediatek/FTS2A052/fts2a052_driver.c
@@ -3074,7 +3074,7 @@ static int tpd_local_init(void)
 #ifdef TPD_HAVE_BUTTON     
     	tpd_button_setting(TPD_KEY_COUNT, tpd_keys_local, tpd_keys_dim_local);// initialize tpd button data
 #endif    
-	TPD_DMESG("end %s, %d\n", __FUNCTION__, __LINE__);  
+	TPD_DMESG("end %s, %d\n", __func__, __LINE__);  
 	tpd_type_cap = 1;
 	
 //set tp resulution 
@@ -3088,7 +3088,7 @@ static int tpd_local_init(void)
 static void tpd_resume( struct early_suspend *h )
 {
   int rc = 0;
-	TPD_DMESG("[st_tpd] %s\n", __FUNCTION__);
+	TPD_DMESG("[st_tpd] %s\n", __func__);
 	/*power up touch*/	
 #ifdef TPD_POWER_SOURCE_CUSTOM
 	hwPowerOn(TPD_POWER_SOURCE_CUSTOM,VOL_3300,"CTP");
@@ -3162,7 +3162,7 @@ static void tpd_resume( struct early_suspend *h )
 static void tpd_suspend( struct early_suspend *h )
 {
  
-	TPD_DMESG("[st_tpd] %s\n", __FUNCTION__);
+	TPD_DMESG("[st_tpd] %s\n", __func__);
 	
 	old_buttons = 0;		
 	mt_eint_mask(CUST_EINT_TOUCH_PANEL_NUM);
diff --git a/drivers/input/touchscreen/mediatek/GT1151/gt1x_tpd.c b/drivers/input/touchscreen/mediatek/GT1151/gt1x_tpd.c
index 4867064cc..4869e3109 100644
--- a/drivers/input/touchscreen/mediatek/GT1151/gt1x_tpd.c
+++ b/drivers/input/touchscreen/mediatek/GT1151/gt1x_tpd.c
@@ -503,7 +503,7 @@ static int tpd_irq_registration(void)
 		GTP_ERROR("tpd request_irq can not find touch eint device node!.");
 		ret = -1;
 	}
-	GTP_INFO("[%s]irq:%d, debounce:%d-%d:", __FUNCTION__, touch_irq, ints[0], ints[1]);
+	GTP_INFO("[%s]irq:%d, debounce:%d-%d:", __func__, touch_irq, ints[0], ints[1]);
 	return ret;
 }
 #endif
@@ -962,7 +962,7 @@ static int tpd_local_init(void)
 	tpd->dev->id.product = convert_productname(gt1x_version.product_id);
 	tpd->dev->id.version = (gt1x_version.patch_id >> 8);
 
-	GTP_INFO("end %s, %d\n", __FUNCTION__, __LINE__);
+	GTP_INFO("end %s, %d\n", __func__, __LINE__);
 	tpd_type_cap = 1;
 
 	return 0;
diff --git a/drivers/input/touchscreen/mediatek/GT813/gt813_driver.c b/drivers/input/touchscreen/mediatek/GT813/gt813_driver.c
index 02cc14894..55623fa57 100644
--- a/drivers/input/touchscreen/mediatek/GT813/gt813_driver.c
+++ b/drivers/input/touchscreen/mediatek/GT813/gt813_driver.c
@@ -1049,7 +1049,7 @@ static int tpd_local_init(void)
     tpd->dev->id.product = tpd_info.product_id;
     tpd->dev->id.version = (tpd_info.version_2 << 8 ) | tpd_info.version_1;
 
-    TPD_DMESG("end %s, %d\n", __FUNCTION__, __LINE__);  
+    TPD_DMESG("end %s, %d\n", __func__, __LINE__);  
     tpd_type_cap = 1;
 
     return 0;
diff --git a/drivers/input/touchscreen/mediatek/GT818B-fpga/gt818b_driver.c b/drivers/input/touchscreen/mediatek/GT818B-fpga/gt818b_driver.c
index 9dda14c60..86c34d00b 100644
--- a/drivers/input/touchscreen/mediatek/GT818B-fpga/gt818b_driver.c
+++ b/drivers/input/touchscreen/mediatek/GT818B-fpga/gt818b_driver.c
@@ -1452,7 +1452,7 @@ static int tpd_local_init(void)
     tpd->dev->id.product = (tpd_info.product_id_2 << 8 ) | tpd_info.product_id_1;
     tpd->dev->id.version = (tpd_info.version_2 << 8 ) | tpd_info.version_1;
 
-    TPD_DMESG("end %s, %d\n", __FUNCTION__, __LINE__);  
+    TPD_DMESG("end %s, %d\n", __func__, __LINE__);  
     tpd_type_cap = 1;
 
     return 0;
diff --git a/drivers/input/touchscreen/mediatek/GT818B/gt818b_driver.c b/drivers/input/touchscreen/mediatek/GT818B/gt818b_driver.c
index 4585073cd..1ba26e3f6 100644
--- a/drivers/input/touchscreen/mediatek/GT818B/gt818b_driver.c
+++ b/drivers/input/touchscreen/mediatek/GT818B/gt818b_driver.c
@@ -1492,7 +1492,7 @@ static int tpd_local_init(void)
     tpd->dev->id.product = (tpd_info.product_id_2 << 8 ) | tpd_info.product_id_1;
     tpd->dev->id.version = (tpd_info.version_2 << 8 ) | tpd_info.version_1;
 
-    TPD_DMESG("end %s, %d\n", __FUNCTION__, __LINE__);  
+    TPD_DMESG("end %s, %d\n", __func__, __LINE__);  
     tpd_type_cap = 1;
 
     return 0;
diff --git a/drivers/input/touchscreen/mediatek/GT819/gt819_driver.c b/drivers/input/touchscreen/mediatek/GT819/gt819_driver.c
index 9baa2a37d..0060bd2bf 100644
--- a/drivers/input/touchscreen/mediatek/GT819/gt819_driver.c
+++ b/drivers/input/touchscreen/mediatek/GT819/gt819_driver.c
@@ -527,7 +527,7 @@ int tpd_local_init(void)
     memcpy(tpd_calmat, tpd_def_calmat_local, 8*4);
     memcpy(tpd_def_calmat, tpd_def_calmat_local, 8*4);	
 #endif  
-    TPD_DMESG("end %s, %d\n", __FUNCTION__, __LINE__);  
+    TPD_DMESG("end %s, %d\n", __func__, __LINE__);  
     tpd_type_cap = 1;
     return 0;
 }
diff --git a/drivers/input/touchscreen/mediatek/GT910/gt9xx_driver.c b/drivers/input/touchscreen/mediatek/GT910/gt9xx_driver.c
index fb6ecebeb..4ab3d83bd 100644
--- a/drivers/input/touchscreen/mediatek/GT910/gt9xx_driver.c
+++ b/drivers/input/touchscreen/mediatek/GT910/gt9xx_driver.c
@@ -2399,7 +2399,7 @@ static int tpd_local_init(void)
     tpd->dev->id.product = tpd_info.pid;
     tpd->dev->id.version = tpd_info.vid;
     
-    GTP_INFO("end %s, %d", __FUNCTION__, __LINE__);
+    GTP_INFO("end %s, %d", __func__, __LINE__);
     tpd_type_cap = 1;
 
     return 0;
diff --git a/drivers/input/touchscreen/mediatek/GT911/gt9xx_driver.c b/drivers/input/touchscreen/mediatek/GT911/gt9xx_driver.c
index dd3833f98..89ac2210a 100644
--- a/drivers/input/touchscreen/mediatek/GT911/gt9xx_driver.c
+++ b/drivers/input/touchscreen/mediatek/GT911/gt9xx_driver.c
@@ -1162,7 +1162,7 @@ static s32 tpd_i2c_probe(struct i2c_client *client, const struct i2c_device_id *
 #endif
     tpd_load_status = 1;
 
-    GTP_INFO("%s, success run Done", __FUNCTION__);
+    GTP_INFO("%s, success run Done", __func__);
     return 0;
 out:
     return -1;
@@ -1629,7 +1629,7 @@ static int tpd_local_init(void)
     tpd->dev->id.product = tpd_info.pid;
     tpd->dev->id.version = tpd_info.vid;
     
-    GTP_INFO("end %s, %d", __FUNCTION__, __LINE__);
+    GTP_INFO("end %s, %d", __func__, __LINE__);
     tpd_type_cap = 1;
 
     return 0;
diff --git a/drivers/input/touchscreen/mediatek/GT9XX_2/gt9xx_driver.c b/drivers/input/touchscreen/mediatek/GT9XX_2/gt9xx_driver.c
index 87961c80c..ea731d451 100644
--- a/drivers/input/touchscreen/mediatek/GT9XX_2/gt9xx_driver.c
+++ b/drivers/input/touchscreen/mediatek/GT9XX_2/gt9xx_driver.c
@@ -2766,9 +2766,9 @@ static int tpd_local_init(void)
     tpd->dev->id.product = tpd_info.pid;
     tpd->dev->id.version = tpd_info.vid;
 
-    GTP_INFO("end %s, %d\n", __FUNCTION__, __LINE__);
+    GTP_INFO("end %s, %d\n", __func__, __LINE__);
     tpd_type_cap = 1;
-	printk("end %s, %d\n", __FUNCTION__, __LINE__);
+	printk("end %s, %d\n", __func__, __LINE__);
     return 0;
 }
 
diff --git a/drivers/input/touchscreen/mediatek/GT9XX_aio/gt9xx_driver.c b/drivers/input/touchscreen/mediatek/GT9XX_aio/gt9xx_driver.c
index 4b70af771..c31416e44 100644
--- a/drivers/input/touchscreen/mediatek/GT9XX_aio/gt9xx_driver.c
+++ b/drivers/input/touchscreen/mediatek/GT9XX_aio/gt9xx_driver.c
@@ -3489,7 +3489,7 @@ static int tpd_local_init(void)
     tpd->dev->id.product = tpd_info.pid;
     tpd->dev->id.version = tpd_info.vid;
 
-    GTP_INFO("end %s, %d\n", __FUNCTION__, __LINE__);
+    GTP_INFO("end %s, %d\n", __func__, __LINE__);
     tpd_type_cap = 1;
 
     return 0;
@@ -3976,7 +3976,7 @@ static void tpd_resume(struct early_suspend *h)
 {
     s32 ret = -1;
 
-    printk("mtk-tpd: %s start\n", __FUNCTION__);
+    printk("mtk-tpd: %s start\n", __func__);
 #ifdef TPD_PROXIMITY
 
     if (tpd_proximity_flag == 1)
@@ -4097,7 +4097,7 @@ static void tpd_resume(struct early_suspend *h)
 #ifdef GTP_CHARGER_DETECT
     queue_delayed_work(gtp_charger_check_workqueue, &gtp_charger_check_work, clk_tick_cnt);
 #endif
-    printk("mtk-tpd: %s end\n", __FUNCTION__);
+    printk("mtk-tpd: %s end\n", __func__);
 }
 /*Lenovo-sw xuwen1 modify 20140804 end */
 static struct tpd_driver_t tpd_device_driver =
diff --git a/drivers/input/touchscreen/mediatek/GT9XX_hotknot/gt9xx_driver.c b/drivers/input/touchscreen/mediatek/GT9XX_hotknot/gt9xx_driver.c
index 128340f6e..6955e931c 100644
--- a/drivers/input/touchscreen/mediatek/GT9XX_hotknot/gt9xx_driver.c
+++ b/drivers/input/touchscreen/mediatek/GT9XX_hotknot/gt9xx_driver.c
@@ -2064,7 +2064,7 @@ static int tpd_irq_registration(void)
 		GTP_ERROR("tpd request_irq can not find touch eint device node!.");
 		ret = -1;
 	}
-	GTP_INFO("[%s]irq:%d, debounce:%d-%d:", __FUNCTION__, touch_irq, ints[0], ints[1]);
+	GTP_INFO("[%s]irq:%d, debounce:%d-%d:", __func__, touch_irq, ints[0], ints[1]);
 	return ret;
 }
 #endif
@@ -3227,7 +3227,7 @@ static int tpd_local_init(void)
     tpd->dev->id.product = tpd_info.pid;
     tpd->dev->id.version = tpd_info.vid;
 
-    GTP_INFO("end %s, %d\n", __FUNCTION__, __LINE__);
+    GTP_INFO("end %s, %d\n", __func__, __LINE__);
     tpd_type_cap = 1;
 
     return 0;
@@ -3608,7 +3608,7 @@ static void tpd_resume(struct early_suspend *h)
 {
     s32 ret = -1;
 
-    printk("mtk-tpd: %s start\n", __FUNCTION__);
+    printk("mtk-tpd: %s start\n", __func__);
 #ifdef TPD_PROXIMITY
 
     if (tpd_proximity_flag == 1)
@@ -3673,7 +3673,7 @@ static void tpd_resume(struct early_suspend *h)
 #ifdef GTP_CHARGER_DETECT
     queue_delayed_work(gtp_charger_check_workqueue, &gtp_charger_check_work, clk_tick_cnt);
 #endif
-    printk("mtk-tpd: %s end\n", __FUNCTION__);
+    printk("mtk-tpd: %s end\n", __func__);
 }
 
 static struct tpd_driver_t tpd_device_driver =
diff --git a/drivers/input/touchscreen/mediatek/GT9XX_hotknot_FLASHLESS/gt9xx_driver.c b/drivers/input/touchscreen/mediatek/GT9XX_hotknot_FLASHLESS/gt9xx_driver.c
index d1677986a..0a020a51f 100644
--- a/drivers/input/touchscreen/mediatek/GT9XX_hotknot_FLASHLESS/gt9xx_driver.c
+++ b/drivers/input/touchscreen/mediatek/GT9XX_hotknot_FLASHLESS/gt9xx_driver.c
@@ -2873,7 +2873,7 @@ static int tpd_local_init(void)
     tpd->dev->id.product = tpd_info.pid;
     tpd->dev->id.version = tpd_info.vid;
 
-    GTP_INFO("end %s, %d\n", __FUNCTION__, __LINE__);
+    GTP_INFO("end %s, %d\n", __func__, __LINE__);
     tpd_type_cap = 1;
 
     return 0;
@@ -3237,7 +3237,7 @@ static void tpd_resume(struct early_suspend *h)
 {
     s32 ret = -1;
 
-    printk("mtk-tpd: %s start\n", __FUNCTION__);
+    printk("mtk-tpd: %s start\n", __func__);
 #ifdef TPD_PROXIMITY
 
     if (tpd_proximity_flag == 1)
@@ -3294,7 +3294,7 @@ static void tpd_resume(struct early_suspend *h)
 #ifdef GTP_CHARGER_DETECT
     queue_delayed_work(gtp_charger_check_workqueue, &gtp_charger_check_work, clk_tick_cnt);
 #endif
-    printk("mtk-tpd: %s end\n", __FUNCTION__);
+    printk("mtk-tpd: %s end\n", __func__);
 }
 
 static struct tpd_driver_t tpd_device_driver =
diff --git a/drivers/input/touchscreen/mediatek/GT9XX_hotknot_SCP/gt9xx_driver.c b/drivers/input/touchscreen/mediatek/GT9XX_hotknot_SCP/gt9xx_driver.c
index 559651015..0c77326ce 100644
--- a/drivers/input/touchscreen/mediatek/GT9XX_hotknot_SCP/gt9xx_driver.c
+++ b/drivers/input/touchscreen/mediatek/GT9XX_hotknot_SCP/gt9xx_driver.c
@@ -2178,7 +2178,7 @@ static int tpd_irq_registration(void)
 		GTP_ERROR("tpd request_irq can not find touch eint device node!.");
         ret = -1;
 	}
-    GTP_INFO("[%s]irq:%d, debounce:%d-%d:", __FUNCTION__, touch_irq, ints[0], ints[1]);
+    GTP_INFO("[%s]irq:%d, debounce:%d-%d:", __func__, touch_irq, ints[0], ints[1]);
 	return ret;
 }
 #endif
@@ -3347,7 +3347,7 @@ static int tpd_local_init(void)
     tpd->dev->id.product = tpd_info.pid;
     tpd->dev->id.version = tpd_info.vid;
 
-    GTP_INFO("end %s, %d\n", __FUNCTION__, __LINE__);
+    GTP_INFO("end %s, %d\n", __func__, __LINE__);
     tpd_type_cap = 1;
 
     return 0;
@@ -3831,7 +3831,7 @@ static void tpd_resume(struct early_suspend *h)
 {
     s32 ret = -1;
 
-    printk("mtk-tpd: %s start\n", __FUNCTION__);
+    printk("mtk-tpd: %s start\n", __func__);
 #ifdef TPD_PROXIMITY
 
     if (tpd_proximity_flag == 1)
@@ -3928,7 +3928,7 @@ static void tpd_resume(struct early_suspend *h)
 #ifdef GTP_CHARGER_DETECT
     queue_delayed_work(gtp_charger_check_workqueue, &gtp_charger_check_work, clk_tick_cnt);
 #endif
-    printk("mtk-tpd: %s end\n", __FUNCTION__);
+    printk("mtk-tpd: %s end\n", __func__);
 }
 
 static struct tpd_driver_t tpd_device_driver =
diff --git a/drivers/input/touchscreen/mediatek/GT9XX_hotknot_fpga/gt9xx_driver.c b/drivers/input/touchscreen/mediatek/GT9XX_hotknot_fpga/gt9xx_driver.c
index fcf952d7b..07cc66407 100644
--- a/drivers/input/touchscreen/mediatek/GT9XX_hotknot_fpga/gt9xx_driver.c
+++ b/drivers/input/touchscreen/mediatek/GT9XX_hotknot_fpga/gt9xx_driver.c
@@ -2062,7 +2062,7 @@ static int tpd_irq_registration(void)
 		GTP_ERROR("tpd request_irq can not find touch eint device node!.");
 		ret = -1;
 	}
-	GTP_INFO("[%s]irq:%d, debounce:%d-%d:", __FUNCTION__, touch_irq, ints[0], ints[1]);
+	GTP_INFO("[%s]irq:%d, debounce:%d-%d:", __func__, touch_irq, ints[0], ints[1]);
 	return ret;
 }
 #endif
@@ -3211,7 +3211,7 @@ static int tpd_local_init(void)
     tpd->dev->id.product = tpd_info.pid;
     tpd->dev->id.version = tpd_info.vid;
 
-    GTP_INFO("end %s, %d\n", __FUNCTION__, __LINE__);
+    GTP_INFO("end %s, %d\n", __func__, __LINE__);
     tpd_type_cap = 1;
 
     return 0;
@@ -3592,7 +3592,7 @@ static void tpd_resume(struct early_suspend *h)
 {
     s32 ret = -1;
 
-    printk("mtk-tpd: %s start\n", __FUNCTION__);
+    printk("mtk-tpd: %s start\n", __func__);
 #ifdef TPD_PROXIMITY
 
     if (tpd_proximity_flag == 1)
@@ -3657,7 +3657,7 @@ static void tpd_resume(struct early_suspend *h)
 #ifdef GTP_CHARGER_DETECT
     queue_delayed_work(gtp_charger_check_workqueue, &gtp_charger_check_work, clk_tick_cnt);
 #endif
-    printk("mtk-tpd: %s end\n", __FUNCTION__);
+    printk("mtk-tpd: %s end\n", __func__);
 }
 
 static struct tpd_driver_t tpd_device_driver =
diff --git a/drivers/input/touchscreen/mediatek/GT9XX_hotknot_wear/gt9xx_driver.c b/drivers/input/touchscreen/mediatek/GT9XX_hotknot_wear/gt9xx_driver.c
index 83813f91c..22ec1bef5 100644
--- a/drivers/input/touchscreen/mediatek/GT9XX_hotknot_wear/gt9xx_driver.c
+++ b/drivers/input/touchscreen/mediatek/GT9XX_hotknot_wear/gt9xx_driver.c
@@ -3279,7 +3279,7 @@ static int tpd_local_init(void)
     tpd->dev->id.product = tpd_info.pid;
     tpd->dev->id.version = tpd_info.vid;
 
-    GTP_INFO("end %s, %d\n", __FUNCTION__, __LINE__);
+    GTP_INFO("end %s, %d\n", __func__, __LINE__);
     tpd_type_cap = 1;
 
     return 0;
@@ -3597,7 +3597,7 @@ static void tpd_suspend(struct early_suspend *h)
     s32 ret = -1;
     u8 buf[3] = {0x81, 0xaa, 0};
 
-    GTP_INFO("mtk-tpd: %s start\n", __FUNCTION__);
+    GTP_INFO("mtk-tpd: %s start\n", __func__);
 
 #ifdef TPD_PROXIMITY
     if (tpd_proximity_flag == 1)
@@ -3684,7 +3684,7 @@ static void tpd_resume(struct early_suspend *h)
 {
     s32 ret = -1;
 
-    printk("mtk-tpd: %s start\n", __FUNCTION__);
+    printk("mtk-tpd: %s start\n", __func__);
 #ifdef TPD_PROXIMITY
 
     if (tpd_proximity_flag == 1)
@@ -3752,7 +3752,7 @@ static void tpd_resume(struct early_suspend *h)
     queue_delayed_work(gtp_charger_check_workqueue, &gtp_charger_check_work, clk_tick_cnt);
 #endif
     tpd_halt = 0;
-    printk("mtk-tpd: %s end\n", __FUNCTION__);
+    printk("mtk-tpd: %s end\n", __func__);
 }
 
 static struct tpd_driver_t tpd_device_driver =
diff --git a/drivers/input/touchscreen/mediatek/MZ_FT5346/focaltech_driver.c b/drivers/input/touchscreen/mediatek/MZ_FT5346/focaltech_driver.c
index fc746bfb4..0dcecd951 100644
--- a/drivers/input/touchscreen/mediatek/MZ_FT5346/focaltech_driver.c
+++ b/drivers/input/touchscreen/mediatek/MZ_FT5346/focaltech_driver.c
@@ -1294,7 +1294,7 @@ static int tpd_local_init(void)
 	memcpy(tpd_def_calmat, tpd_def_calmat_local, 8*4);

 #endif

 

-	TPD_DMESG("end %s, %d\n", __FUNCTION__, __LINE__);

+	TPD_DMESG("end %s, %d\n", __func__, __LINE__);

 	tpd_type_cap = 1;

 	return 0;

 }

diff --git a/drivers/input/touchscreen/mediatek/MZ_GT9XX/gt9xx_driver.c b/drivers/input/touchscreen/mediatek/MZ_GT9XX/gt9xx_driver.c
index 2386906a7..57a5d8ef9 100644
--- a/drivers/input/touchscreen/mediatek/MZ_GT9XX/gt9xx_driver.c
+++ b/drivers/input/touchscreen/mediatek/MZ_GT9XX/gt9xx_driver.c
@@ -3043,7 +3043,7 @@ static int tpd_local_init(void)
     tpd->dev->id.product = tpd_info.pid;
     tpd->dev->id.version = tpd_info.vid;
 
-    GTP_INFO("end %s, %d\n", __FUNCTION__, __LINE__);
+    GTP_INFO("end %s, %d\n", __func__, __LINE__);
     tpd_type_cap = 1;
 
     return 0;
diff --git a/drivers/input/touchscreen/mediatek/S3203/s3203_driver.c b/drivers/input/touchscreen/mediatek/S3203/s3203_driver.c
index 674f11929..da6b9a07f 100644
--- a/drivers/input/touchscreen/mediatek/S3203/s3203_driver.c
+++ b/drivers/input/touchscreen/mediatek/S3203/s3203_driver.c
@@ -627,7 +627,7 @@ static int RMI4_read_PDT(struct i2c_client *client)
 		
 		if(i2c_transfer(client->adapter, msg, 2) < 0)
 		{
-			printk("%s:%d: read RIM4 PDT error!\n",__FUNCTION__,__LINE__);
+			printk("%s:%d: read RIM4 PDT error!\n",__func__,__LINE__);
 			return -1;
 		}
 
@@ -647,7 +647,7 @@ static int RMI4_read_PDT(struct i2c_client *client)
 
 	if((m_PdtF01Common.m_CommandBase != fd_01.commandBase) || (m_PdtF34Flash.m_QueryBase != fd_34.queryBase))
 	{
-		printk("%s:%d: RIM4 PDT has changed!!!\n",__FUNCTION__,__LINE__);
+		printk("%s:%d: RIM4 PDT has changed!!!\n",__func__,__LINE__);
 		
 		ret = tpd_rmi4_read_pdt(ts);
 		if(ret < 0)
@@ -903,21 +903,21 @@ static int synaptics_download(struct i2c_client *client,const unsigned char *pgm
 	ret = RMI4_enable_program(client);
 	if( ret != 0)
 	{
-		printk("%s:%d:RMI enable program error,return...\n",__FUNCTION__,__LINE__);
+		printk("%s:%d:RMI enable program error,return...\n",__func__,__LINE__);
 		goto error;
 	}
 
 	ret = RMI4_check_firmware(client,pgm_data);
 	if( ret != 0)
 	{
-		printk("%s:%d:RMI check firmware error,return...\n",__FUNCTION__,__LINE__);
+		printk("%s:%d:RMI check firmware error,return...\n",__func__,__LINE__);
 		goto error;
 	}
 
 	ret = RMI4_program_firmware(client, pgm_data + 0x100);
 	if( ret != 0)
 	{
-		printk("%s:%d:RMI program firmware error,return...",__FUNCTION__,__LINE__);
+		printk("%s:%d:RMI program firmware error,return...",__func__,__LINE__);
 		goto error;
 	}
 
@@ -926,7 +926,7 @@ static int synaptics_download(struct i2c_client *client,const unsigned char *pgm
 
 error:
 	RMI4_disable_program_hw(client);
-	printk("%s:%d:error,return ....",__FUNCTION__,__LINE__);
+	printk("%s:%d:error,return ....",__func__,__LINE__);
 	return -1;
 
 }
@@ -947,14 +947,14 @@ static int i2c_update_firmware(struct i2c_client *client)
 	filp = filp_open(filename, O_RDONLY, S_IRUSR);
 	if (IS_ERR(filp))
 	{
-            printk("%s: file %s filp_open error\n", __FUNCTION__,filename);
+            printk("%s: file %s filp_open error\n", __func__,filename);
             set_fs(oldfs);
             return -1;
 	}
 
 	if (!filp->f_op)
 	{
-            printk("%s: File Operation Method Error\n", __FUNCTION__);
+            printk("%s: File Operation Method Error\n", __func__);
             filp_close(filp, NULL);
             set_fs(oldfs);
             return -1;
@@ -963,7 +963,7 @@ static int i2c_update_firmware(struct i2c_client *client)
     inode = filp->f_path.dentry->d_inode;
     if (!inode) 
     {
-        printk("%s: Get inode from filp failed\n", __FUNCTION__);
+        printk("%s: Get inode from filp failed\n", __func__);
         filp_close(filp, NULL);
         set_fs(oldfs);
         return -1;
@@ -992,7 +992,7 @@ static int i2c_update_firmware(struct i2c_client *client)
     /* read data */
     if (filp->f_op->read(filp, buf, length, &filp->f_pos) != length)
     {
-        printk("%s: file read error\n", __FUNCTION__);
+        printk("%s: file read error\n", __func__);
         filp_close(filp, NULL);
         set_fs(oldfs);
         vfree(buf);
@@ -1098,7 +1098,7 @@ static int tpd_local_init(void)
 	boot_mode = get_boot_mode();
 	if (boot_mode == 3) boot_mode = NORMAL_BOOT;
 #endif
-	TPD_DMESG("end %s, %d\n", __FUNCTION__, __LINE__);  
+	TPD_DMESG("end %s, %d\n", __func__, __LINE__);  
 	tpd_type_cap = 1;
     return 0; 
  }
diff --git a/drivers/input/touchscreen/mediatek/S7020/synaptics_driver.c b/drivers/input/touchscreen/mediatek/S7020/synaptics_driver.c
index bcf9e454b..28339e8c2 100644
--- a/drivers/input/touchscreen/mediatek/S7020/synaptics_driver.c
+++ b/drivers/input/touchscreen/mediatek/S7020/synaptics_driver.c
@@ -1857,7 +1857,7 @@ static int tpd_local_init(void)
     boot_mode = get_boot_mode();
     //if (boot_mode == 3) boot_mode = NORMAL_BOOT;		//No need
     input_set_abs_params(tpd->dev, ABS_MT_TRACKING_ID, 0, (10-1), 0, 0);
-    TPD_DMESG("end %s, %d\n", __FUNCTION__, __LINE__);
+    TPD_DMESG("end %s, %d\n", __func__, __LINE__);
     tpd_type_cap = 1;
     return 0;
  }
diff --git a/drivers/input/touchscreen/mediatek/cy8ctma300/cy8ctma300_driver.c b/drivers/input/touchscreen/mediatek/cy8ctma300/cy8ctma300_driver.c
index f7fabfe37..a2254003c 100644
--- a/drivers/input/touchscreen/mediatek/cy8ctma300/cy8ctma300_driver.c
+++ b/drivers/input/touchscreen/mediatek/cy8ctma300/cy8ctma300_driver.c
@@ -188,8 +188,8 @@ static int tpd_i2c_probe(struct i2c_client *client, const struct i2c_device_id *
 }
 
 void tpd_eint_interrupt_handler(void) { 
-//	if(tpd_debuglog==1) TPD_DMESG("[mtk-tpd], %s\n", __FUNCTION__);
-	if(1) TPD_DMESG("[mtk-tpd], %s\n", __FUNCTION__);
+//	if(tpd_debuglog==1) TPD_DMESG("[mtk-tpd], %s\n", __func__);
+	if(1) TPD_DMESG("[mtk-tpd], %s\n", __func__);
     TPD_DEBUG_PRINT_INT; tpd_flag=1; wake_up_interruptible(&waiter);
 } 
 static int tpd_i2c_remove(struct i2c_client *client) {return 0;}
@@ -240,11 +240,11 @@ static int touch_event_handler(void *unused) {
     g_temptimerdiff=get_jiffies_64();//jiffies;
     do {
 		if(tpd_debuglog==1) {
-			TPD_DMESG("[mtk-tpd] %s\n", __FUNCTION__); 
+			TPD_DMESG("[mtk-tpd] %s\n", __func__); 
 		}	    	
         set_current_state(TASK_INTERRUPTIBLE);
 	if(tpd_debuglog==1)
-		TPD_DMESG("[mtk-tpd], %s, tpd_halt=%d\n", __FUNCTION__, tpd_halt);
+		TPD_DMESG("[mtk-tpd], %s, tpd_halt=%d\n", __func__, tpd_halt);
         while (tpd_halt) {tpd_flag = 0; msleep(20);}
         #ifndef POLL_MODE
         wait_event_interruptible(waiter, tpd_flag != 0);
@@ -536,7 +536,7 @@ int tpd_local_init(void)
 {
 	//tpd_debuglog = 1;
 	if(tpd_debuglog==1) {
-		TPD_DMESG("[mtk-tpd] %s\n", __FUNCTION__); 
+		TPD_DMESG("[mtk-tpd] %s\n", __func__); 
 	}
      if(i2c_add_driver(&tpd_i2c_driver)!=0) {
       TPD_DMESG("unable to add i2c driver.\n");
@@ -562,7 +562,7 @@ int tpd_local_init(void)
     memcpy(tpd_calmat, tpd_calmat_local, 8*4);
     memcpy(tpd_def_calmat, tpd_def_calmat_local, 8*4);	
 #endif  
-		TPD_DMESG("end %s, %d\n", __FUNCTION__, __LINE__);  
+		TPD_DMESG("end %s, %d\n", __func__, __LINE__);  
 		tpd_type_cap = 1;
     return 0;
 }
@@ -571,7 +571,7 @@ int tpd_local_init(void)
 void tpd_suspend(struct early_suspend *h)
 {
 	if(tpd_debuglog==1) {
-		TPD_DMESG("[mtk-tpd] %s\n", __FUNCTION__); 
+		TPD_DMESG("[mtk-tpd] %s\n", __func__); 
 	}
   	tpd_halt = 1;	
 	while(1){
@@ -596,7 +596,7 @@ void tpd_suspend(struct early_suspend *h)
 void tpd_resume(struct early_suspend *h) 
 {
 	if(tpd_debuglog==1) {
-		TPD_DMESG("[mtk-tpd] %s\n", __FUNCTION__); 
+		TPD_DMESG("[mtk-tpd] %s\n", __func__); 
 	}
 #ifndef TPD_NO_GPIO	
     #ifdef TPD_HAVE_POWER_ON_OFF
diff --git a/drivers/input/touchscreen/mediatek/eeti_pcap7200/etti_pcap7200_driver.c b/drivers/input/touchscreen/mediatek/eeti_pcap7200/etti_pcap7200_driver.c
index 0c9046c82..0d8ee303f 100644
--- a/drivers/input/touchscreen/mediatek/eeti_pcap7200/etti_pcap7200_driver.c
+++ b/drivers/input/touchscreen/mediatek/eeti_pcap7200/etti_pcap7200_driver.c
@@ -126,7 +126,7 @@ static int tpd_local_init(void) {
     memcpy(tpd_calmat, tpd_def_calmat_local, 8*4);
     memcpy(tpd_def_calmat, tpd_def_calmat_local, 8*4);	
 #endif  
-		TPD_DMESG("end %s, %d\n", __FUNCTION__, __LINE__);  
+		TPD_DMESG("end %s, %d\n", __func__, __LINE__);  
 		tpd_type_cap = 1;
     return 0;
 }
diff --git a/drivers/input/touchscreen/mediatek/ektf3248/ektf3248_tpd_driver.c b/drivers/input/touchscreen/mediatek/ektf3248/ektf3248_tpd_driver.c
index 9f541025b..d7bfecc5d 100644
--- a/drivers/input/touchscreen/mediatek/ektf3248/ektf3248_tpd_driver.c
+++ b/drivers/input/touchscreen/mediatek/ektf3248/ektf3248_tpd_driver.c
@@ -2173,7 +2173,7 @@ static int tpd_local_init(void)
          memcpy(tpd_def_calmat, tpd_def_calmat_local, 8*4);         
 #endif 
 
-    printk("mtk-tpd:end %s, %d\n", __FUNCTION__, __LINE__);
+    printk("mtk-tpd:end %s, %d\n", __func__, __LINE__);
     tpd_type_cap = 1;
     return 0;
 }
diff --git a/drivers/input/touchscreen/mediatek/excp7200/excp7200_driver.c b/drivers/input/touchscreen/mediatek/excp7200/excp7200_driver.c
index c89061b5d..ca8f4c7dc 100644
--- a/drivers/input/touchscreen/mediatek/excp7200/excp7200_driver.c
+++ b/drivers/input/touchscreen/mediatek/excp7200/excp7200_driver.c
@@ -351,7 +351,7 @@ int tpd_local_init(void)
     memcpy(tpd_calmat, tpd_def_calmat_local, 8*4);
     memcpy(tpd_def_calmat, tpd_def_calmat_local, 8*4);	
 #endif  
-		TPD_DMESG("end %s, %d\n", __FUNCTION__, __LINE__);  
+		TPD_DMESG("end %s, %d\n", __func__, __LINE__);  
 		tpd_type_cap = 1;
     return 0;
 }
diff --git a/drivers/input/touchscreen/mediatek/ft5206/focaltech_driver.c b/drivers/input/touchscreen/mediatek/ft5206/focaltech_driver.c
index 0b2bd5a59..c08438e1f 100644
--- a/drivers/input/touchscreen/mediatek/ft5206/focaltech_driver.c
+++ b/drivers/input/touchscreen/mediatek/ft5206/focaltech_driver.c
@@ -665,7 +665,7 @@ static int tpd_local_init(void)
     memcpy(tpd_calmat, tpd_def_calmat_local, 8*4);
     memcpy(tpd_def_calmat, tpd_def_calmat_local, 8*4);	
 #endif  
-    TPD_DMESG("end %s, %d\n", __FUNCTION__, __LINE__);  
+    TPD_DMESG("end %s, %d\n", __func__, __LINE__);  
     tpd_type_cap = 1;
     return 0; 
  }
diff --git a/drivers/input/touchscreen/mediatek/ft5316/ft5316_driver.c b/drivers/input/touchscreen/mediatek/ft5316/ft5316_driver.c
index f79dc0675..c48b6dadf 100644
--- a/drivers/input/touchscreen/mediatek/ft5316/ft5316_driver.c
+++ b/drivers/input/touchscreen/mediatek/ft5316/ft5316_driver.c
@@ -1314,7 +1314,7 @@ reset_proc:
     memcpy(tpd_calmat, tpd_def_calmat_local, 8*4);
     memcpy(tpd_def_calmat, tpd_def_calmat_local, 8*4);	
 #endif  
-		TPD_DMESG("end %s, %d\n", __FUNCTION__, __LINE__);  
+		TPD_DMESG("end %s, %d\n", __func__, __LINE__);  
 		tpd_type_cap = 1;
     return 0; 
  }
diff --git a/drivers/input/touchscreen/mediatek/ft5406/ft5406_driver.c b/drivers/input/touchscreen/mediatek/ft5406/ft5406_driver.c
index e24ea70a3..5eb659162 100644
--- a/drivers/input/touchscreen/mediatek/ft5406/ft5406_driver.c
+++ b/drivers/input/touchscreen/mediatek/ft5406/ft5406_driver.c
@@ -1107,7 +1107,7 @@ static int tpd_local_init(void)
 		return -1;
 	}
 
-	TPD_DMESG("end %s, %d\n", __FUNCTION__, __LINE__);  
+	TPD_DMESG("end %s, %d\n", __func__, __LINE__);  
 	tpd_type_cap = 1;
 
 	return 0; 
diff --git a/drivers/input/touchscreen/mediatek/ft5406_82/ft5406_82_driver.c b/drivers/input/touchscreen/mediatek/ft5406_82/ft5406_82_driver.c
index d67bbf7f1..38cb1bfb4 100644
--- a/drivers/input/touchscreen/mediatek/ft5406_82/ft5406_82_driver.c
+++ b/drivers/input/touchscreen/mediatek/ft5406_82/ft5406_82_driver.c
@@ -1336,7 +1336,7 @@ static int tpd_local_init(void)
 		return -1;
 	}
 
-	TPD_DMESG("end %s, %d\n", __FUNCTION__, __LINE__);  
+	TPD_DMESG("end %s, %d\n", __func__, __LINE__);  
 	tpd_type_cap = 1;
 
 	return 0; 
diff --git a/drivers/input/touchscreen/mediatek/ft5x0x/ft5x0x_driver.c b/drivers/input/touchscreen/mediatek/ft5x0x/ft5x0x_driver.c
index 9578f4026..bdd1dcf06 100644
--- a/drivers/input/touchscreen/mediatek/ft5x0x/ft5x0x_driver.c
+++ b/drivers/input/touchscreen/mediatek/ft5x0x/ft5x0x_driver.c
@@ -664,7 +664,7 @@ static int tpd_local_init(void)
 	
 #endif
 
-	TPD_DMESG("end %s, %d\n", __FUNCTION__, __LINE__);  
+	TPD_DMESG("end %s, %d\n", __func__, __LINE__);  
 	tpd_type_cap = 1;
 
 	return 0; 
diff --git a/drivers/input/touchscreen/mediatek/gn_melfas_mms144/gn_mms144.c b/drivers/input/touchscreen/mediatek/gn_melfas_mms144/gn_mms144.c
index ddf7d4cf4..008d9f689 100644
--- a/drivers/input/touchscreen/mediatek/gn_melfas_mms144/gn_mms144.c
+++ b/drivers/input/touchscreen/mediatek/gn_melfas_mms144/gn_mms144.c
@@ -263,7 +263,7 @@ static int melfas_touch_event_handler(void *unused)
 				  {
 					REPORT_MT_DOWN(i, g_Mtouch_info[i].posX, g_Mtouch_info[i].posY, g_Mtouch_info[i].area, g_Mtouch_info[i].pressure);
 				  }
-                 TPD_DEBUG("[TSP] %s: Touch ID: %d, State : %d, x: %d, y: %d, z: %d w: %d\n", __FUNCTION__,
+                 TPD_DEBUG("[TSP] %s: Touch ID: %d, State : %d, x: %d, y: %d, z: %d w: %d\n", __func__,
                         i, (g_Mtouch_info[i].pressure > 0), g_Mtouch_info[i].posX, g_Mtouch_info[i].posY, g_Mtouch_info[i].pressure, g_Mtouch_info[i].area);
 
 
@@ -434,7 +434,7 @@ static int melfas_check_firmware(struct i2c_client *client, u8 *val)
 
     if (ret < 0)
     {
-        TPD_DMESG("[melfas_tpd] %s,%d: i2c read fail[%d] \n", __FUNCTION__, __LINE__, ret);
+        TPD_DMESG("[melfas_tpd] %s,%d: i2c read fail[%d] \n", __func__, __LINE__, ret);
     }
 	
 	return ret;
@@ -540,7 +540,7 @@ static int melfas_tpd_i2c_detect(struct i2c_client *client, struct i2c_board_inf
 static int melfas_tpd_local_init(void) 
 {
 
-	TPD_DMESG("[melfas_tpd] end %s, %d\n", __FUNCTION__, __LINE__);  
+	TPD_DMESG("[melfas_tpd] end %s, %d\n", __func__, __LINE__);  
     if(i2c_add_driver(&melfas_tpd_i2c_driver)!=0)
     {
         TPD_DMESG("[melfas_tpd] unable to add i2c driver.\n");
diff --git a/drivers/input/touchscreen/mediatek/max1187x/max1187x.c b/drivers/input/touchscreen/mediatek/max1187x/max1187x.c
index fb88879b4..595e570f9 100644
--- a/drivers/input/touchscreen/mediatek/max1187x/max1187x.c
+++ b/drivers/input/touchscreen/mediatek/max1187x/max1187x.c
@@ -2520,7 +2520,7 @@ static int tpd_irq_registration(unsigned int irq, irq_handler_t handler, unsigne
 		printk("tpd request_irq can not find touch eint device node!.");
 		ret = -1;
 	}
-	printk("[%s]irq:%d, debounce:%d-%d:", __FUNCTION__, irq, ints[0], ints[1]);
+	printk("[%s]irq:%d, debounce:%d-%d:", __func__, irq, ints[0], ints[1]);
 	return ret;
 }
 #endif
@@ -3519,7 +3519,7 @@ static int tpd_local_init(void)
     tpd->dev->id.product = tpd_info.pid;
     tpd->dev->id.version = tpd_info.vid;
 
-    TPD_DMESG("end %s, %d\n", __FUNCTION__, __LINE__);
+    TPD_DMESG("end %s, %d\n", __func__, __LINE__);
     tpd_type_cap = 1;
 #if GTP_SUPPORT_I2C_DMA
 		tpd->dev->dev.coherent_dma_mask = DMA_BIT_MASK(32);
diff --git a/drivers/input/touchscreen/mediatek/mms100s/mms100s_cfg_fw_download.c b/drivers/input/touchscreen/mediatek/mms100s/mms100s_cfg_fw_download.c
index febff94e7..39d1d680e 100644
--- a/drivers/input/touchscreen/mediatek/mms100s/mms100s_cfg_fw_download.c
+++ b/drivers/input/touchscreen/mediatek/mms100s/mms100s_cfg_fw_download.c
@@ -24,8 +24,8 @@
 
 #define __MSG_DMA_MODE__
 
-#define	FUNC_START		TPD_DEBUG("[%s] begin\n", __FUNCTION__);
-#define	FUNC_END		TPD_DEBUG("[%s] end  \n", __FUNCTION__);
+#define	FUNC_START		TPD_DEBUG("[%s] begin\n", __func__);
+#define	FUNC_END		TPD_DEBUG("[%s] end  \n", __func__);
 
 extern void tpd_hw_enable(void);
 extern void tpd_hw_disable(void);
diff --git a/drivers/input/touchscreen/mediatek/mms100s/mms100s_ts.c b/drivers/input/touchscreen/mediatek/mms100s/mms100s_ts.c
index 4631cd008..a97de60fc 100644
--- a/drivers/input/touchscreen/mediatek/mms100s/mms100s_ts.c
+++ b/drivers/input/touchscreen/mediatek/mms100s/mms100s_ts.c
@@ -1059,7 +1059,7 @@ static int melfas_tpd_i2c_detect(struct i2c_client *client, struct i2c_board_inf
 static int melfas_tpd_local_init(void) 
 {
 
-	TPD_DMESG("[melfas_tpd] end %s, %d\n", __FUNCTION__, __LINE__);  
+	TPD_DMESG("[melfas_tpd] end %s, %d\n", __func__, __LINE__);  
     if(i2c_add_driver(&melfas_tpd_i2c_driver)!=0)
     {
         TPD_DMESG("[melfas_tpd] unable to add i2c driver.\n");
diff --git a/drivers/input/touchscreen/mediatek/mms128/mms128_driver.c b/drivers/input/touchscreen/mediatek/mms128/mms128_driver.c
index 243827d65..e16e826ce 100644
--- a/drivers/input/touchscreen/mediatek/mms128/mms128_driver.c
+++ b/drivers/input/touchscreen/mediatek/mms128/mms128_driver.c
@@ -100,8 +100,8 @@ enum {
 * Macros
 ****************************************************************************/
 #define TPD_TAG                  "[Melfas] "
-#define TPD_FUN(f)               printk(KERN_ERR TPD_TAG"%s\n", __FUNCTION__)
-#define TPD_ERR(fmt, args...)    printk(KERN_ERR TPD_TAG"%s %d : "fmt, __FUNCTION__, __LINE__, ##args)
+#define TPD_FUN(f)               printk(KERN_ERR TPD_TAG"%s\n", __func__)
+#define TPD_ERR(fmt, args...)    printk(KERN_ERR TPD_TAG"%s %d : "fmt, __func__, __LINE__, ##args)
 #define TPD_LOG(fmt, args...)    printk(KERN_ERR TPD_TAG fmt, ##args)
 
 /****************************************************************************
diff --git a/drivers/input/touchscreen/mediatek/mms244/mms200_ts.c b/drivers/input/touchscreen/mediatek/mms244/mms200_ts.c
index b6093fbfe..ec9e02f84 100644
--- a/drivers/input/touchscreen/mediatek/mms244/mms200_ts.c
+++ b/drivers/input/touchscreen/mediatek/mms244/mms200_ts.c
@@ -426,7 +426,7 @@ static int melfas_touch_event_handler(void *unused)
 
 			for (i = 0; i < read_num; i = i + FINGER_EVENT_SZ) {
 				Touch_Type = (buf[i] >> 5) & 0x03;
-                		//TPD_DMESG("%s : touch type = %d, buf[i] = %x \n",__FUNCTION__,Touch_Type, buf[i]);
+                		//TPD_DMESG("%s : touch type = %d, buf[i] = %x \n",__func__,Touch_Type, buf[i]);
                 		/* touch type is panel */
                 		if (Touch_Type == MMS_TOUCH_KEY_EVENT) {
                     			touchkey_handler((buf[i] & 0x0f),(bool)(buf[i] & 0x80));
@@ -824,7 +824,7 @@ int melfas_check_firmware(struct i2c_client *client)
     }
     else if (ret < 0)
     {
-        TPD_DMESG("[melfas_tpd] %s,%d: i2c read fail[%d] \n", __FUNCTION__, __LINE__, ret);
+        TPD_DMESG("[melfas_tpd] %s,%d: i2c read fail[%d] \n", __func__, __LINE__, ret);
         goto out;
     }
 
@@ -1059,7 +1059,7 @@ static int melfas_tpd_i2c_detect(struct i2c_client *client,
 static int melfas_tpd_local_init(void) 
 {
 
-	TPD_DMESG("[melfas_tpd] end %s, %d\n", __FUNCTION__, __LINE__);  
+	TPD_DMESG("[melfas_tpd] end %s, %d\n", __func__, __LINE__);  
 	if(i2c_add_driver(&melfas_tpd_i2c_driver)!= 0) {
         	TPD_DMESG("[melfas_tpd] unable to add i2c driver.\n");
         	return -1;
diff --git a/drivers/input/touchscreen/mediatek/msg2133/msg2133_driver.c b/drivers/input/touchscreen/mediatek/msg2133/msg2133_driver.c
index 3582f89a6..62e034af5 100644
--- a/drivers/input/touchscreen/mediatek/msg2133/msg2133_driver.c
+++ b/drivers/input/touchscreen/mediatek/msg2133/msg2133_driver.c
@@ -2364,7 +2364,7 @@ void msg2133_init_class()
 //WARP CHECK IS NEED --XB.PANG
 //#endif 
 
-	TPD_DMESG("end %s, %d\n", __FUNCTION__, __LINE__);  
+	TPD_DMESG("end %s, %d\n", __func__, __LINE__);  
 		
     return 0; 
  }
diff --git a/drivers/input/touchscreen/mediatek/pixcir168/pixcir168_driver.c b/drivers/input/touchscreen/mediatek/pixcir168/pixcir168_driver.c
index 712df74cd..75a092ab2 100644
--- a/drivers/input/touchscreen/mediatek/pixcir168/pixcir168_driver.c
+++ b/drivers/input/touchscreen/mediatek/pixcir168/pixcir168_driver.c
@@ -369,7 +369,7 @@ int tpd_local_init(void)
     memcpy(tpd_calmat, tpd_def_calmat_local, 8*4);
     memcpy(tpd_def_calmat, tpd_def_calmat_local, 8*4);	
 #endif  
-		TPD_DMESG("end %s, %d\n", __FUNCTION__, __LINE__);  
+		TPD_DMESG("end %s, %d\n", __func__, __LINE__);  
 		tpd_type_cap = 1;
     return 0;
 }
diff --git a/drivers/input/touchscreen/mediatek/synaptics_2200/s2200_driver.h b/drivers/input/touchscreen/mediatek/synaptics_2200/s2200_driver.h
index 1529d8b47..5919cec56 100644
--- a/drivers/input/touchscreen/mediatek/synaptics_2200/s2200_driver.h
+++ b/drivers/input/touchscreen/mediatek/synaptics_2200/s2200_driver.h
@@ -18,6 +18,6 @@
 * Debugging Macros
 ****************************************************************************/
 #define TPD_TAG                  "[S2200] "
-#define TPD_FUN(f)               printk(KERN_ERR TPD_TAG"%s\n", __FUNCTION__)
-#define TPD_ERR(fmt, args...)    printk(KERN_ERR TPD_TAG"%s %d : "fmt, __FUNCTION__, __LINE__, ##args)
+#define TPD_FUN(f)               printk(KERN_ERR TPD_TAG"%s\n", __func__)
+#define TPD_ERR(fmt, args...)    printk(KERN_ERR TPD_TAG"%s %d : "fmt, __func__, __LINE__, ##args)
 #define TPD_LOG(fmt, args...)    printk(KERN_ERR TPD_TAG fmt, ##args)
diff --git a/drivers/input/touchscreen/mediatek/synaptics_2200/s2200_fw_update.c b/drivers/input/touchscreen/mediatek/synaptics_2200/s2200_fw_update.c
index 59639236a..a18b28661 100644
--- a/drivers/input/touchscreen/mediatek/synaptics_2200/s2200_fw_update.c
+++ b/drivers/input/touchscreen/mediatek/synaptics_2200/s2200_fw_update.c
@@ -172,7 +172,7 @@ void SynaSetup(struct i2c_client *client)
 {
     unsigned char address;
     unsigned char buffer[6];
-	TPD_LOG("%s\n", __FUNCTION__);
+	TPD_LOG("%s\n", __func__);
 
 	for (address = 0xe9; address > 0xd0; address = address - 6)
 	{
@@ -230,7 +230,7 @@ void SynaInitialize(struct i2c_client *client)
 {	
 	unsigned char uData[2];
 	
-	TPD_LOG("%s\n", __FUNCTION__);
+	TPD_LOG("%s\n", __func__);
 
 	TPD_LOG("Initializing Reflash Process...\n");
 	uData[0] = 0x00;
@@ -256,7 +256,7 @@ void SynaReadFirmwareInfo(struct i2c_client *client)
 	uData[0] = 0;
 	uData[1] = 0;
 
-	TPD_LOG("%s\n", __FUNCTION__);
+	TPD_LOG("%s\n", __func__);
 
 	TPD_LOG("Read Firmware Info\n");
 
@@ -274,7 +274,7 @@ void SynaReadFirmwareInfo(struct i2c_client *client)
 void SynaReadConfigInfo(struct i2c_client *client)
 {
 	unsigned char uData[2];
-	TPD_LOG("%s\n", __FUNCTION__);
+	TPD_LOG("%s\n", __func__);
 
 	TPD_LOG("Read Config Info\n");
 
@@ -291,7 +291,7 @@ void SynaReadConfigInfo(struct i2c_client *client)
 void SynaReadBootloadID(struct i2c_client *client)
 {
 	unsigned char uData[2];
-	TPD_LOG("%s\n", __FUNCTION__);
+	TPD_LOG("%s\n", __func__);
 
 	readRMI(client, SynaF34ReflashQuery_BootID, &uData[0], 2);
 	SynaBootloadID = uData[0] + uData[1] * 0x100;
@@ -302,7 +302,7 @@ void SynaReadBootloadID(struct i2c_client *client)
 void SynaWriteBootloadID(struct i2c_client *client)
 {
 	unsigned char uData[2];
-	TPD_LOG("%s\n", __FUNCTION__);
+	TPD_LOG("%s\n", __func__);
 
 	uData[0] = SynaBootloadID % 0x100;
 	uData[1] = SynaBootloadID / 0x100;
@@ -357,7 +357,7 @@ int SynaEnableFlashing(struct i2c_client *client)
 	int ret;
 	unsigned char uData;
 	unsigned char uStatus;
-	TPD_LOG("%s\n", __FUNCTION__);
+	TPD_LOG("%s\n", __func__);
 
 	TPD_LOG("Enable Reflash...\n");
     
@@ -407,7 +407,7 @@ int SynaProgramConfiguration(struct i2c_client *client)
 	unsigned char *puData = (unsigned char *)&my_image_bin[0xb100];
 	
 	unsigned short blockNum;
-	TPD_LOG("%s\n", __FUNCTION__);
+	TPD_LOG("%s\n", __func__);
 
 	TPD_LOG("Program Configuration Section...\n");
 
@@ -437,7 +437,7 @@ int SynaFinalizeReflash(struct i2c_client *client)
 	int ret;
 	unsigned char uData;
 	unsigned char uStatus;
-	TPD_LOG("%s\n", __FUNCTION__);
+	TPD_LOG("%s\n", __func__);
 
 	TPD_LOG("Finalizing Reflash...\n");
 
@@ -483,7 +483,7 @@ int SynaFlashFirmwareWrite(struct i2c_client *client)
 	unsigned char *puFirmwareData = (unsigned char *)&my_image_bin[0x100];
 	unsigned char uData[2];
 	unsigned short blockNum;
-	TPD_LOG("%s\n", __FUNCTION__);
+	TPD_LOG("%s\n", __func__);
 
 	for (blockNum = 0; blockNum < SynaFirmwareBlockCount; ++blockNum)
 	{
@@ -513,7 +513,7 @@ int SynaProgramFirmware(struct i2c_client *client)
 {
 	int ret;
 	unsigned char uData;    
-	TPD_LOG("%s\n", __FUNCTION__);
+	TPD_LOG("%s\n", __func__);
 
 	TPD_LOG("Program Firmware Section...\n");
 
@@ -541,7 +541,7 @@ int SynaProgramFirmware(struct i2c_client *client)
 int eraseConfigBlock(struct i2c_client *client)
 {
 	unsigned char uData;    
-	TPD_LOG("%s\n", __FUNCTION__);
+	TPD_LOG("%s\n", __func__);
 
 	// Erase of config block is done by first entering into bootloader mode
 	SynaReadBootloadID(client);
@@ -567,7 +567,7 @@ void CRC_Calculate(unsigned short * data, unsigned short len)
     unsigned long Data_CRC = 0xffffffff;
     unsigned long sum1 = (unsigned long)(Data_CRC & 0xFFFF);
     unsigned long sum2 = (unsigned long)(Data_CRC >> 16);
-	TPD_LOG("%s\n", __FUNCTION__);
+	TPD_LOG("%s\n", __func__);
 
     for (i = 0; i < len; i++)
     {
@@ -663,7 +663,7 @@ int ConfigBlockReflash(struct i2c_client *client)
 {
 	int ret;
 	unsigned char uData[2];
-	TPD_LOG("%s\n", __FUNCTION__);
+	TPD_LOG("%s\n", __func__);
 
     SynaInitialize(client);
 	
@@ -720,7 +720,7 @@ int ConfigBlockReflash(struct i2c_client *client)
 int CompleteReflash(struct i2c_client *client)
 {   
 	int ret;
-	TPD_LOG("%s\n", __FUNCTION__);
+	TPD_LOG("%s\n", __func__);
 	SynaInitialize(client);
 	
 	SynaReadConfigInfo(client);
@@ -759,7 +759,7 @@ int CompleteReflash(struct i2c_client *client)
 int CompleteReflash_Lockdown(struct i2c_client *client)
 {   
 	int ret;
-	TPD_LOG("%s\n", __FUNCTION__);
+	TPD_LOG("%s\n", __func__);
 	
 	SynaInitialize(client);
 	
diff --git a/drivers/input/touchscreen/mediatek/synaptics_2202/synaptics_ts.h b/drivers/input/touchscreen/mediatek/synaptics_2202/synaptics_ts.h
index 336d81d5b..8a17e40b9 100644
--- a/drivers/input/touchscreen/mediatek/synaptics_2202/synaptics_ts.h
+++ b/drivers/input/touchscreen/mediatek/synaptics_2202/synaptics_ts.h
@@ -42,13 +42,13 @@
 #endif
 
 #if defined(SYNAPTICS_RMI4_I2C_DEBUG_PRINT)
-#define SYNAPTICS_DEBUG_MSG(fmt, args...) printk(KERN_ERR "[Touch D] [%s %d] " fmt, __FUNCTION__, __LINE__, ##args);
+#define SYNAPTICS_DEBUG_MSG(fmt, args...) printk(KERN_ERR "[Touch D] [%s %d] " fmt, __func__, __LINE__, ##args);
 #else
 #define SYNAPTICS_DEBUG_MSG(fmt, args...) {};
 #endif
 
 #if defined(SYNAPTICS_RMI4_I2C_ERROR_PRINT)
-#define SYNAPTICS_ERR_MSG(fmt, args...) printk(KERN_ERR "[Touch E] [%s %d] " fmt, __FUNCTION__, __LINE__, ##args);
+#define SYNAPTICS_ERR_MSG(fmt, args...) printk(KERN_ERR "[Touch E] [%s %d] " fmt, __func__, __LINE__, ##args);
 #else
 #define SYNAPTICS_ERR_MSG(fmt, args...) {};
 #endif
diff --git a/drivers/input/touchscreen/mediatek/synaptics_2202/synaptics_ts_fw_upgrade.c b/drivers/input/touchscreen/mediatek/synaptics_2202/synaptics_ts_fw_upgrade.c
index accd0e9e7..e53da9303 100644
--- a/drivers/input/touchscreen/mediatek/synaptics_2202/synaptics_ts_fw_upgrade.c
+++ b/drivers/input/touchscreen/mediatek/synaptics_2202/synaptics_ts_fw_upgrade.c
@@ -172,7 +172,7 @@ void SynaSetup(struct synaptics_ts_data *ts)
 {
     unsigned char address;
     unsigned char buffer[6];
-	SYNAPTICS_INFO_MSG("%s\n", __FUNCTION__);
+	SYNAPTICS_INFO_MSG("%s\n", __func__);
 
 	for (address = 0xe9; address > 0xd0; address = address - 6)
 	{
@@ -230,7 +230,7 @@ void SynaInitialize(struct synaptics_ts_data *ts)
 {	
 	unsigned char uData[2];
 	
-	SYNAPTICS_INFO_MSG("%s\n", __FUNCTION__);
+	SYNAPTICS_INFO_MSG("%s\n", __func__);
 
 	SYNAPTICS_INFO_MSG("Initializing Reflash Process...\n");
 	uData[0] = 0x00;
@@ -256,7 +256,7 @@ void SynaReadFirmwareInfo(struct synaptics_ts_data *ts)
 	uData[0] = 0;
 	uData[1] = 0;
 
-	SYNAPTICS_INFO_MSG("%s\n", __FUNCTION__);
+	SYNAPTICS_INFO_MSG("%s\n", __func__);
 
 	SYNAPTICS_INFO_MSG("Read Firmware Info\n");
 
@@ -274,7 +274,7 @@ void SynaReadFirmwareInfo(struct synaptics_ts_data *ts)
 void SynaReadConfigInfo(struct synaptics_ts_data *ts)
 {
 	unsigned char uData[2];
-	SYNAPTICS_INFO_MSG("%s\n", __FUNCTION__);
+	SYNAPTICS_INFO_MSG("%s\n", __func__);
 
 	SYNAPTICS_INFO_MSG("Read Config Info\n");
 
@@ -291,7 +291,7 @@ void SynaReadConfigInfo(struct synaptics_ts_data *ts)
 void SynaReadBootloadID(struct synaptics_ts_data *ts)
 {
 	unsigned char uData[2];
-	SYNAPTICS_INFO_MSG("%s\n", __FUNCTION__);
+	SYNAPTICS_INFO_MSG("%s\n", __func__);
 
 	readRMI(ts->client, SynaF34ReflashQuery_BootID, &uData[0], 2);
 	SynaBootloadID = uData[0] + uData[1] * 0x100;
@@ -302,7 +302,7 @@ void SynaReadBootloadID(struct synaptics_ts_data *ts)
 void SynaWriteBootloadID(struct synaptics_ts_data *ts)
 {
 	unsigned char uData[2];
-	SYNAPTICS_INFO_MSG("%s\n", __FUNCTION__);
+	SYNAPTICS_INFO_MSG("%s\n", __func__);
 
 	uData[0] = SynaBootloadID % 0x100;
 	uData[1] = SynaBootloadID / 0x100;
@@ -357,7 +357,7 @@ int SynaEnableFlashing(struct synaptics_ts_data *ts)
 	int ret;
 	unsigned char uData;
 	unsigned char uStatus;
-	SYNAPTICS_INFO_MSG("%s\n", __FUNCTION__);
+	SYNAPTICS_INFO_MSG("%s\n", __func__);
 
 	SYNAPTICS_INFO_MSG("Enable Reflash...\n");
     
@@ -407,7 +407,7 @@ int SynaProgramConfiguration(struct synaptics_ts_data *ts)
 	unsigned char *puData = (unsigned char *)&my_image_bin[0xb100];
 	
 	unsigned short blockNum;
-	SYNAPTICS_INFO_MSG("%s\n", __FUNCTION__);
+	SYNAPTICS_INFO_MSG("%s\n", __func__);
 
 	SYNAPTICS_INFO_MSG("Program Configuration Section...\n");
 
@@ -437,7 +437,7 @@ int SynaFinalizeReflash(struct synaptics_ts_data *ts)
 	int ret;
 	unsigned char uData;
 	unsigned char uStatus;
-	SYNAPTICS_INFO_MSG("%s\n", __FUNCTION__);
+	SYNAPTICS_INFO_MSG("%s\n", __func__);
 
 	SYNAPTICS_INFO_MSG("Finalizing Reflash...\n");
 
@@ -483,7 +483,7 @@ int SynaFlashFirmwareWrite(struct synaptics_ts_data *ts)
 	unsigned char *puFirmwareData = (unsigned char *)&my_image_bin[0x100];
 	unsigned char uData[2];
 	unsigned short blockNum;
-	SYNAPTICS_INFO_MSG("%s\n", __FUNCTION__);
+	SYNAPTICS_INFO_MSG("%s\n", __func__);
 
 	for (blockNum = 0; blockNum < SynaFirmwareBlockCount; ++blockNum)
 	{
@@ -513,7 +513,7 @@ int SynaProgramFirmware(struct synaptics_ts_data *ts)
 {
 	int ret;
 	unsigned char uData;    
-	SYNAPTICS_INFO_MSG("%s\n", __FUNCTION__);
+	SYNAPTICS_INFO_MSG("%s\n", __func__);
 
 	SYNAPTICS_INFO_MSG("Program Firmware Section...\n");
 
@@ -541,7 +541,7 @@ int SynaProgramFirmware(struct synaptics_ts_data *ts)
 int eraseConfigBlock(struct synaptics_ts_data *ts)
 {
 	unsigned char uData;    
-	SYNAPTICS_INFO_MSG("%s\n", __FUNCTION__);
+	SYNAPTICS_INFO_MSG("%s\n", __func__);
 
 	// Erase of config block is done by first entering into bootloader mode
 	SynaReadBootloadID(ts);
@@ -567,7 +567,7 @@ void CRC_Calculate(unsigned short * data, unsigned short len)
     unsigned long Data_CRC = 0xffffffff;
     unsigned long sum1 = (unsigned long)(Data_CRC & 0xFFFF);
     unsigned long sum2 = (unsigned long)(Data_CRC >> 16);
-	SYNAPTICS_INFO_MSG("%s\n", __FUNCTION__);
+	SYNAPTICS_INFO_MSG("%s\n", __func__);
 
     for (i = 0; i < len; i++)
     {
@@ -663,7 +663,7 @@ int ConfigBlockReflash(struct synaptics_ts_data *ts)
 {
 	int ret;
 	unsigned char uData[2];
-	SYNAPTICS_INFO_MSG("%s\n", __FUNCTION__);
+	SYNAPTICS_INFO_MSG("%s\n", __func__);
 
     SynaInitialize(ts);
 	
@@ -720,7 +720,7 @@ int ConfigBlockReflash(struct synaptics_ts_data *ts)
 int CompleteReflash(struct synaptics_ts_data *ts)
 {   
 	int ret;
-	SYNAPTICS_INFO_MSG("%s\n", __FUNCTION__);
+	SYNAPTICS_INFO_MSG("%s\n", __func__);
 	SynaInitialize(ts);
 	
 	SynaReadConfigInfo(ts);
@@ -759,7 +759,7 @@ int CompleteReflash(struct synaptics_ts_data *ts)
 int CompleteReflash_Lockdown(struct synaptics_ts_data *ts)
 {   
 	int ret;
-	SYNAPTICS_INFO_MSG("%s\n", __FUNCTION__);
+	SYNAPTICS_INFO_MSG("%s\n", __func__);
 	
 	SynaInitialize(ts);
 	
diff --git a/drivers/input/touchscreen/mediatek/synaptics_3320/RefCode_CustomerImplementation.c b/drivers/input/touchscreen/mediatek/synaptics_3320/RefCode_CustomerImplementation.c
index bea0a9841..22f08a863 100644
--- a/drivers/input/touchscreen/mediatek/synaptics_3320/RefCode_CustomerImplementation.c
+++ b/drivers/input/touchscreen/mediatek/synaptics_3320/RefCode_CustomerImplementation.c
@@ -207,7 +207,7 @@ void read_log(char *filename, const struct touch_platform_data *pdata)
 	printk("[s3528-read_log]read file open %s, fd : %d\n", (fd >= 0)? "success": "fail", fd);
 
 	if (fd >= 0) {
-		printk("[s3528-read_log]open read_log funcion in /sns/touch/cap_diff_test.txt\n",__FUNCTION__);
+		printk("[s3528-read_log]open read_log funcion in /sns/touch/cap_diff_test.txt\n",__func__);
 		while(sys_read(fd, buf, 1024)) {
 
 			printk("[s3528-read_log]sys_read success\n");
diff --git a/drivers/input/touchscreen/mediatek/synaptics_3320/RefCode_F54.c b/drivers/input/touchscreen/mediatek/synaptics_3320/RefCode_F54.c
index e929263b0..285a95e79 100644
--- a/drivers/input/touchscreen/mediatek/synaptics_3320/RefCode_F54.c
+++ b/drivers/input/touchscreen/mediatek/synaptics_3320/RefCode_F54.c
@@ -2249,7 +2249,7 @@ int ImageTest(int mode, char *buf)
 		// Assign report type for Full Raw Image
 
 		data = 20;//raw capacitance mode
-		TOUCH_INFO_MSG("[Touch][%s] raw capacitance mode!\n", __FUNCTION__);
+		TOUCH_INFO_MSG("[Touch][%s] raw capacitance mode!\n", __func__);
 
 		Write8BitRegisters(F54DataBase, &data, 1);
 		//mode setting
@@ -2276,7 +2276,7 @@ int DeltaTest(char *buf)
 
 	// Assign report type for Full Raw Image
 	data = 0x02;//delta mode
-	TOUCH_INFO_MSG("[Touch][%s] delta mode!\n", __FUNCTION__);
+	TOUCH_INFO_MSG("[Touch][%s] delta mode!\n", __func__);
 
 	Write8BitRegisters(F54DataBase, &data, 1);
 
@@ -2296,7 +2296,7 @@ int NoiseDeltaTest(char *buf)
 	memset(NoiseDeltaMin, 0, TRX_MAX * TRX_MAX * sizeof(short));
 	memset(NoiseDeltaMax, 0, TRX_MAX * TRX_MAX * sizeof(short));
 
-	TOUCH_INFO_MSG("[Touch][%s] Noise Delta mode!\n", __FUNCTION__);
+	TOUCH_INFO_MSG("[Touch][%s] Noise Delta mode!\n", __func__);
 
 	// Assign report type for Full Raw Image
 	data = 0x02;//delta mode
diff --git a/drivers/input/touchscreen/mediatek/synaptics_3320/RefCode_F54.h b/drivers/input/touchscreen/mediatek/synaptics_3320/RefCode_F54.h
index 56961b568..8bdff5736 100644
--- a/drivers/input/touchscreen/mediatek/synaptics_3320/RefCode_F54.h
+++ b/drivers/input/touchscreen/mediatek/synaptics_3320/RefCode_F54.h
@@ -65,8 +65,8 @@ extern int ReadF54BitRegisters(unsigned short regAddr, unsigned char *data, int
 extern int get_limit(unsigned char Tx, unsigned char Rx, struct i2c_client client, const struct touch_platform_data *pdata, char *breakpoint, int limit_data[32][32]);
 
 #define TPD_TAG                  "[S3320] "
-#define TPD_FUN(f)               printk(KERN_ERR TPD_TAG"%s\n", __FUNCTION__)
-#define TPD_ERR(fmt, args...)    printk(KERN_ERR TPD_TAG"%s %d : "fmt, __FUNCTION__, __LINE__, ##args)
+#define TPD_FUN(f)               printk(KERN_ERR TPD_TAG"%s\n", __func__)
+#define TPD_ERR(fmt, args...)    printk(KERN_ERR TPD_TAG"%s %d : "fmt, __func__, __LINE__, ##args)
 #define TPD_LOG(fmt, args...)    printk(KERN_ERR TPD_TAG fmt, ##args)
 
 #define TOUCH_INFO_MSG(fmt, args...) \
diff --git a/drivers/input/touchscreen/mediatek/synaptics_3320/s3320_driver.h b/drivers/input/touchscreen/mediatek/synaptics_3320/s3320_driver.h
index aa3ac1e5d..4e8e47b3b 100644
--- a/drivers/input/touchscreen/mediatek/synaptics_3320/s3320_driver.h
+++ b/drivers/input/touchscreen/mediatek/synaptics_3320/s3320_driver.h
@@ -18,8 +18,8 @@
 * Debugging Macros
 ****************************************************************************/
 #define TPD_TAG                  "[S3320] "
-#define TPD_FUN(f)               printk(KERN_ERR TPD_TAG"%s\n", __FUNCTION__)
-#define TPD_ERR(fmt, args...)    printk(KERN_ERR TPD_TAG"%s %d : "fmt, __FUNCTION__, __LINE__, ##args)
+#define TPD_FUN(f)               printk(KERN_ERR TPD_TAG"%s\n", __func__)
+#define TPD_ERR(fmt, args...)    printk(KERN_ERR TPD_TAG"%s %d : "fmt, __func__, __LINE__, ##args)
 #define TPD_LOG(fmt, args...)    printk(KERN_ERR TPD_TAG fmt, ##args)
 
 
diff --git a/drivers/input/touchscreen/mediatek/synaptics_3320/s3320_fw_update.c b/drivers/input/touchscreen/mediatek/synaptics_3320/s3320_fw_update.c
index 487ecb9b4..6c00b5b03 100644
--- a/drivers/input/touchscreen/mediatek/synaptics_3320/s3320_fw_update.c
+++ b/drivers/input/touchscreen/mediatek/synaptics_3320/s3320_fw_update.c
@@ -230,7 +230,7 @@ bool CheckFlashStatus(enum FlashCommand command, struct i2c_client *client)
 
 void SynaImageParser(struct i2c_client *client)
 {
-TPD_LOG("%s\n", __FUNCTION__);
+TPD_LOG("%s\n", __func__);
   // img file parsing
   SynaImageSize = ( (unsigned int)my_image_bin[0x08] | 
                     (unsigned int)my_image_bin[0x09] <<8 | 
@@ -263,7 +263,7 @@ void SynaBootloaderLock(struct i2c_client *client)
   unsigned short uBlockNum = 0;
   enum FlashCommand cmd;
 
-TPD_LOG("%s\n", __FUNCTION__);
+TPD_LOG("%s\n", __func__);
 
   if (my_image_bin[0x1E] == 0)
   {
@@ -343,7 +343,7 @@ void SynaScanPDT(struct i2c_client *client)
 	unsigned char address=0;
 	unsigned char uData[2]={0,};
 	unsigned char buffer[6]={0,};
-	TPD_LOG("%s\n", __FUNCTION__);
+	TPD_LOG("%s\n", __func__);
 
 	for (address = 0xe9; address > 0xc0; address = address - 6)
 	{
@@ -400,7 +400,7 @@ void SynaInitialize(struct i2c_client *client)
 {	
 	u8 data;
 
-	TPD_LOG("%s\n", __FUNCTION__);
+	TPD_LOG("%s\n", __func__);
 	TPD_LOG("\nInitializing Reflash Process...\n");
 
 	data = 0x00;
@@ -429,7 +429,7 @@ void SynaReadFirmwareInfo(struct i2c_client *client)
 	unsigned char uData[3] = {0,};
   unsigned char product_id[11] = {0,};
   int firmware_version = 0;
-	TPD_LOG("%s\n", __FUNCTION__);
+	TPD_LOG("%s\n", __func__);
   
   readRMI(client, SynaF01QueryBase + 11, product_id, 10);
   product_id[10] = '\0';
@@ -448,7 +448,7 @@ void SynaReadFirmwareInfo(struct i2c_client *client)
 void SynaReadBootloadID(struct i2c_client *client)
 {
 	unsigned char uData[2] = {0,};
-	TPD_LOG("%s\n", __FUNCTION__);
+	TPD_LOG("%s\n", __func__);
 
 	readRMI(client, SynaF34ReflashQuery_BootID, &uData[0], 2);
 	SynaBootloadID = uData[0] | (uData[1] << 8);
@@ -459,7 +459,7 @@ void SynaReadBootloadID(struct i2c_client *client)
 void SynaWriteBootloadID(struct i2c_client *client)
 {
 	unsigned char uData[2];
-	TPD_LOG("%s\n", __FUNCTION__);
+	TPD_LOG("%s\n", __func__);
 
 	uData[0] = SynaBootloadID % 0x100;
 	uData[1] = SynaBootloadID / 0x100;
@@ -497,7 +497,7 @@ void SynaEnableFlashing(struct i2c_client *client)
 {
 	unsigned char uStatus = 0;
   enum FlashCommand cmd;
-	TPD_LOG("%s\n", __FUNCTION__);
+	TPD_LOG("%s\n", __func__);
 	TPD_LOG("Enable Reflash...\n");
 
 	readRMI (client, SynaF01DataBase, &uStatus, 1);
@@ -622,7 +622,7 @@ void SynaFinalizeReflash(struct i2c_client *client)
     "CRC in progress\n"
     };
 
-	TPD_LOG("%s\n", __FUNCTION__);
+	TPD_LOG("%s\n", __func__);
 	TPD_LOG("\nFinalizing Reflash...\n");
 
 	// Issue the "Reset" command to F01 command register to reset the chip
@@ -658,7 +658,7 @@ void SynaFlashFirmwareWrite(struct i2c_client *client)
 	unsigned short blockNum;
   enum FlashCommand cmd;
 
-	TPD_LOG("%s\n", __FUNCTION__);
+	TPD_LOG("%s\n", __func__);
 	for (blockNum = 0; blockNum < SynaFirmwareBlockCount; ++blockNum)
 	{
     if (blockNum == 0)
@@ -699,7 +699,7 @@ void SynaFlashConfigWrite(struct i2c_client *client)
 	unsigned short blockNum;
   enum FlashCommand cmd;
 
-	TPD_LOG("%s\n", __FUNCTION__);
+	TPD_LOG("%s\n", __func__);
 	for (blockNum = 0; blockNum < SynaConfigBlockCount; ++blockNum)
 	{
 		//Block by blcok, write the block number and data to the corresponding F34 data registers
@@ -732,7 +732,7 @@ void SynaFlashConfigWrite(struct i2c_client *client)
  */
 void SynaProgramFirmware(struct i2c_client *client)
 {
-	TPD_LOG("%s\n", __FUNCTION__);
+	TPD_LOG("%s\n", __func__);
 	TPD_LOG("\nProgram Firmware Section...\n");
 
   eraseAllBlock(client);
@@ -746,7 +746,7 @@ void SynaProgramFirmware(struct i2c_client *client)
  */
 void SynaUpdateConfig(struct i2c_client *client)
 {
-	TPD_LOG("%s\n", __FUNCTION__);
+	TPD_LOG("%s\n", __func__);
 	TPD_LOG("\nUpdate Config Section...\n");
 
   EraseConfigBlock(client);
@@ -760,7 +760,7 @@ void eraseAllBlock(struct i2c_client *client)
 { 
   enum FlashCommand cmd;
 
-	TPD_LOG("%s\n", __FUNCTION__);
+	TPD_LOG("%s\n", __func__);
 	// Erase of config block is done by first entering into bootloader mode
 	SynaReadBootloadID(client);
 	SynaWriteBootloadID(client);
@@ -779,7 +779,7 @@ void EraseConfigBlock(struct i2c_client *client)
 {  
   enum FlashCommand cmd;
 
-	TPD_LOG("%s\n", __FUNCTION__);
+	TPD_LOG("%s\n", __func__);
 	// Erase of config block is done by first entering into bootloader mode
 	SynaReadBootloadID(client);
 	SynaWriteBootloadID(client);
@@ -800,7 +800,7 @@ bool CheckTouchControllerType(struct i2c_client *client)
 	char controllerType[20]={0,};
 	unsigned char uData[4]={0,};
 
-	TPD_LOG("%s\n", __FUNCTION__);
+	TPD_LOG("%s\n", __func__);
 	readRMI(client, (SynaF01QueryBase + 22), &SynaF01Query43Length, 1); //43
 
 	if ((SynaF01Query43Length & 0x0f) > 0)
@@ -827,7 +827,7 @@ bool CheckFimrwareRevision(struct i2c_client *client)
 	unsigned char uData[16];
 	char revision[106];
 
-	TPD_LOG("%s\n", __FUNCTION__);
+	TPD_LOG("%s\n", __func__);
 	readRMI((SynaF01QueryBase + 28 + SynaF01Query43Length), &uData[0], 16);
 
 	for (int i = 0; i < 0; i++)
diff --git a/drivers/input/touchscreen/mediatek/synaptics_3320_47/RefCode_CustomerImplementation.c b/drivers/input/touchscreen/mediatek/synaptics_3320_47/RefCode_CustomerImplementation.c
index bea0a9841..22f08a863 100644
--- a/drivers/input/touchscreen/mediatek/synaptics_3320_47/RefCode_CustomerImplementation.c
+++ b/drivers/input/touchscreen/mediatek/synaptics_3320_47/RefCode_CustomerImplementation.c
@@ -207,7 +207,7 @@ void read_log(char *filename, const struct touch_platform_data *pdata)
 	printk("[s3528-read_log]read file open %s, fd : %d\n", (fd >= 0)? "success": "fail", fd);
 
 	if (fd >= 0) {
-		printk("[s3528-read_log]open read_log funcion in /sns/touch/cap_diff_test.txt\n",__FUNCTION__);
+		printk("[s3528-read_log]open read_log funcion in /sns/touch/cap_diff_test.txt\n",__func__);
 		while(sys_read(fd, buf, 1024)) {
 
 			printk("[s3528-read_log]sys_read success\n");
diff --git a/drivers/input/touchscreen/mediatek/synaptics_3320_47/RefCode_F54.c b/drivers/input/touchscreen/mediatek/synaptics_3320_47/RefCode_F54.c
index e929263b0..285a95e79 100644
--- a/drivers/input/touchscreen/mediatek/synaptics_3320_47/RefCode_F54.c
+++ b/drivers/input/touchscreen/mediatek/synaptics_3320_47/RefCode_F54.c
@@ -2249,7 +2249,7 @@ int ImageTest(int mode, char *buf)
 		// Assign report type for Full Raw Image
 
 		data = 20;//raw capacitance mode
-		TOUCH_INFO_MSG("[Touch][%s] raw capacitance mode!\n", __FUNCTION__);
+		TOUCH_INFO_MSG("[Touch][%s] raw capacitance mode!\n", __func__);
 
 		Write8BitRegisters(F54DataBase, &data, 1);
 		//mode setting
@@ -2276,7 +2276,7 @@ int DeltaTest(char *buf)
 
 	// Assign report type for Full Raw Image
 	data = 0x02;//delta mode
-	TOUCH_INFO_MSG("[Touch][%s] delta mode!\n", __FUNCTION__);
+	TOUCH_INFO_MSG("[Touch][%s] delta mode!\n", __func__);
 
 	Write8BitRegisters(F54DataBase, &data, 1);
 
@@ -2296,7 +2296,7 @@ int NoiseDeltaTest(char *buf)
 	memset(NoiseDeltaMin, 0, TRX_MAX * TRX_MAX * sizeof(short));
 	memset(NoiseDeltaMax, 0, TRX_MAX * TRX_MAX * sizeof(short));
 
-	TOUCH_INFO_MSG("[Touch][%s] Noise Delta mode!\n", __FUNCTION__);
+	TOUCH_INFO_MSG("[Touch][%s] Noise Delta mode!\n", __func__);
 
 	// Assign report type for Full Raw Image
 	data = 0x02;//delta mode
diff --git a/drivers/input/touchscreen/mediatek/synaptics_3320_47/RefCode_F54.h b/drivers/input/touchscreen/mediatek/synaptics_3320_47/RefCode_F54.h
index 56961b568..8bdff5736 100644
--- a/drivers/input/touchscreen/mediatek/synaptics_3320_47/RefCode_F54.h
+++ b/drivers/input/touchscreen/mediatek/synaptics_3320_47/RefCode_F54.h
@@ -65,8 +65,8 @@ extern int ReadF54BitRegisters(unsigned short regAddr, unsigned char *data, int
 extern int get_limit(unsigned char Tx, unsigned char Rx, struct i2c_client client, const struct touch_platform_data *pdata, char *breakpoint, int limit_data[32][32]);
 
 #define TPD_TAG                  "[S3320] "
-#define TPD_FUN(f)               printk(KERN_ERR TPD_TAG"%s\n", __FUNCTION__)
-#define TPD_ERR(fmt, args...)    printk(KERN_ERR TPD_TAG"%s %d : "fmt, __FUNCTION__, __LINE__, ##args)
+#define TPD_FUN(f)               printk(KERN_ERR TPD_TAG"%s\n", __func__)
+#define TPD_ERR(fmt, args...)    printk(KERN_ERR TPD_TAG"%s %d : "fmt, __func__, __LINE__, ##args)
 #define TPD_LOG(fmt, args...)    printk(KERN_ERR TPD_TAG fmt, ##args)
 
 #define TOUCH_INFO_MSG(fmt, args...) \
diff --git a/drivers/input/touchscreen/mediatek/synaptics_3320_47/s3320_driver.h b/drivers/input/touchscreen/mediatek/synaptics_3320_47/s3320_driver.h
index aa3ac1e5d..4e8e47b3b 100644
--- a/drivers/input/touchscreen/mediatek/synaptics_3320_47/s3320_driver.h
+++ b/drivers/input/touchscreen/mediatek/synaptics_3320_47/s3320_driver.h
@@ -18,8 +18,8 @@
 * Debugging Macros
 ****************************************************************************/
 #define TPD_TAG                  "[S3320] "
-#define TPD_FUN(f)               printk(KERN_ERR TPD_TAG"%s\n", __FUNCTION__)
-#define TPD_ERR(fmt, args...)    printk(KERN_ERR TPD_TAG"%s %d : "fmt, __FUNCTION__, __LINE__, ##args)
+#define TPD_FUN(f)               printk(KERN_ERR TPD_TAG"%s\n", __func__)
+#define TPD_ERR(fmt, args...)    printk(KERN_ERR TPD_TAG"%s %d : "fmt, __func__, __LINE__, ##args)
 #define TPD_LOG(fmt, args...)    printk(KERN_ERR TPD_TAG fmt, ##args)
 
 
diff --git a/drivers/input/touchscreen/mediatek/synaptics_3320_47/s3320_fw_update.c b/drivers/input/touchscreen/mediatek/synaptics_3320_47/s3320_fw_update.c
index 487ecb9b4..6c00b5b03 100644
--- a/drivers/input/touchscreen/mediatek/synaptics_3320_47/s3320_fw_update.c
+++ b/drivers/input/touchscreen/mediatek/synaptics_3320_47/s3320_fw_update.c
@@ -230,7 +230,7 @@ bool CheckFlashStatus(enum FlashCommand command, struct i2c_client *client)
 
 void SynaImageParser(struct i2c_client *client)
 {
-TPD_LOG("%s\n", __FUNCTION__);
+TPD_LOG("%s\n", __func__);
   // img file parsing
   SynaImageSize = ( (unsigned int)my_image_bin[0x08] | 
                     (unsigned int)my_image_bin[0x09] <<8 | 
@@ -263,7 +263,7 @@ void SynaBootloaderLock(struct i2c_client *client)
   unsigned short uBlockNum = 0;
   enum FlashCommand cmd;
 
-TPD_LOG("%s\n", __FUNCTION__);
+TPD_LOG("%s\n", __func__);
 
   if (my_image_bin[0x1E] == 0)
   {
@@ -343,7 +343,7 @@ void SynaScanPDT(struct i2c_client *client)
 	unsigned char address=0;
 	unsigned char uData[2]={0,};
 	unsigned char buffer[6]={0,};
-	TPD_LOG("%s\n", __FUNCTION__);
+	TPD_LOG("%s\n", __func__);
 
 	for (address = 0xe9; address > 0xc0; address = address - 6)
 	{
@@ -400,7 +400,7 @@ void SynaInitialize(struct i2c_client *client)
 {	
 	u8 data;
 
-	TPD_LOG("%s\n", __FUNCTION__);
+	TPD_LOG("%s\n", __func__);
 	TPD_LOG("\nInitializing Reflash Process...\n");
 
 	data = 0x00;
@@ -429,7 +429,7 @@ void SynaReadFirmwareInfo(struct i2c_client *client)
 	unsigned char uData[3] = {0,};
   unsigned char product_id[11] = {0,};
   int firmware_version = 0;
-	TPD_LOG("%s\n", __FUNCTION__);
+	TPD_LOG("%s\n", __func__);
   
   readRMI(client, SynaF01QueryBase + 11, product_id, 10);
   product_id[10] = '\0';
@@ -448,7 +448,7 @@ void SynaReadFirmwareInfo(struct i2c_client *client)
 void SynaReadBootloadID(struct i2c_client *client)
 {
 	unsigned char uData[2] = {0,};
-	TPD_LOG("%s\n", __FUNCTION__);
+	TPD_LOG("%s\n", __func__);
 
 	readRMI(client, SynaF34ReflashQuery_BootID, &uData[0], 2);
 	SynaBootloadID = uData[0] | (uData[1] << 8);
@@ -459,7 +459,7 @@ void SynaReadBootloadID(struct i2c_client *client)
 void SynaWriteBootloadID(struct i2c_client *client)
 {
 	unsigned char uData[2];
-	TPD_LOG("%s\n", __FUNCTION__);
+	TPD_LOG("%s\n", __func__);
 
 	uData[0] = SynaBootloadID % 0x100;
 	uData[1] = SynaBootloadID / 0x100;
@@ -497,7 +497,7 @@ void SynaEnableFlashing(struct i2c_client *client)
 {
 	unsigned char uStatus = 0;
   enum FlashCommand cmd;
-	TPD_LOG("%s\n", __FUNCTION__);
+	TPD_LOG("%s\n", __func__);
 	TPD_LOG("Enable Reflash...\n");
 
 	readRMI (client, SynaF01DataBase, &uStatus, 1);
@@ -622,7 +622,7 @@ void SynaFinalizeReflash(struct i2c_client *client)
     "CRC in progress\n"
     };
 
-	TPD_LOG("%s\n", __FUNCTION__);
+	TPD_LOG("%s\n", __func__);
 	TPD_LOG("\nFinalizing Reflash...\n");
 
 	// Issue the "Reset" command to F01 command register to reset the chip
@@ -658,7 +658,7 @@ void SynaFlashFirmwareWrite(struct i2c_client *client)
 	unsigned short blockNum;
   enum FlashCommand cmd;
 
-	TPD_LOG("%s\n", __FUNCTION__);
+	TPD_LOG("%s\n", __func__);
 	for (blockNum = 0; blockNum < SynaFirmwareBlockCount; ++blockNum)
 	{
     if (blockNum == 0)
@@ -699,7 +699,7 @@ void SynaFlashConfigWrite(struct i2c_client *client)
 	unsigned short blockNum;
   enum FlashCommand cmd;
 
-	TPD_LOG("%s\n", __FUNCTION__);
+	TPD_LOG("%s\n", __func__);
 	for (blockNum = 0; blockNum < SynaConfigBlockCount; ++blockNum)
 	{
 		//Block by blcok, write the block number and data to the corresponding F34 data registers
@@ -732,7 +732,7 @@ void SynaFlashConfigWrite(struct i2c_client *client)
  */
 void SynaProgramFirmware(struct i2c_client *client)
 {
-	TPD_LOG("%s\n", __FUNCTION__);
+	TPD_LOG("%s\n", __func__);
 	TPD_LOG("\nProgram Firmware Section...\n");
 
   eraseAllBlock(client);
@@ -746,7 +746,7 @@ void SynaProgramFirmware(struct i2c_client *client)
  */
 void SynaUpdateConfig(struct i2c_client *client)
 {
-	TPD_LOG("%s\n", __FUNCTION__);
+	TPD_LOG("%s\n", __func__);
 	TPD_LOG("\nUpdate Config Section...\n");
 
   EraseConfigBlock(client);
@@ -760,7 +760,7 @@ void eraseAllBlock(struct i2c_client *client)
 { 
   enum FlashCommand cmd;
 
-	TPD_LOG("%s\n", __FUNCTION__);
+	TPD_LOG("%s\n", __func__);
 	// Erase of config block is done by first entering into bootloader mode
 	SynaReadBootloadID(client);
 	SynaWriteBootloadID(client);
@@ -779,7 +779,7 @@ void EraseConfigBlock(struct i2c_client *client)
 {  
   enum FlashCommand cmd;
 
-	TPD_LOG("%s\n", __FUNCTION__);
+	TPD_LOG("%s\n", __func__);
 	// Erase of config block is done by first entering into bootloader mode
 	SynaReadBootloadID(client);
 	SynaWriteBootloadID(client);
@@ -800,7 +800,7 @@ bool CheckTouchControllerType(struct i2c_client *client)
 	char controllerType[20]={0,};
 	unsigned char uData[4]={0,};
 
-	TPD_LOG("%s\n", __FUNCTION__);
+	TPD_LOG("%s\n", __func__);
 	readRMI(client, (SynaF01QueryBase + 22), &SynaF01Query43Length, 1); //43
 
 	if ((SynaF01Query43Length & 0x0f) > 0)
@@ -827,7 +827,7 @@ bool CheckFimrwareRevision(struct i2c_client *client)
 	unsigned char uData[16];
 	char revision[106];
 
-	TPD_LOG("%s\n", __FUNCTION__);
+	TPD_LOG("%s\n", __func__);
 	readRMI((SynaF01QueryBase + 28 + SynaF01Query43Length), &uData[0], 16);
 
 	for (int i = 0; i < 0; i++)
diff --git a/drivers/input/touchscreen/mediatek/synaptics_3320_50/RefCode_CustomerImplementation.c b/drivers/input/touchscreen/mediatek/synaptics_3320_50/RefCode_CustomerImplementation.c
index a45fd1287..763973bde 100644
--- a/drivers/input/touchscreen/mediatek/synaptics_3320_50/RefCode_CustomerImplementation.c
+++ b/drivers/input/touchscreen/mediatek/synaptics_3320_50/RefCode_CustomerImplementation.c
@@ -208,7 +208,7 @@ void read_log(char *filename, const struct touch_platform_data *pdata)
 	printk("[s3528-read_log]read file open %s, fd : %d\n", (fd >= 0)? "success": "fail", fd);
 
 	if (fd >= 0) {
-		printk("[s3528-read_log]open read_log funcion in /sns/touch/cap_diff_test.txt\n",__FUNCTION__);
+		printk("[s3528-read_log]open read_log funcion in /sns/touch/cap_diff_test.txt\n",__func__);
 		while(sys_read(fd, buf, 1024)) {
 
 			printk("[s3528-read_log]sys_read success\n");
diff --git a/drivers/input/touchscreen/mediatek/synaptics_3320_50/RefCode_F54.c b/drivers/input/touchscreen/mediatek/synaptics_3320_50/RefCode_F54.c
index 91c0d1a4a..3d8e674e9 100644
--- a/drivers/input/touchscreen/mediatek/synaptics_3320_50/RefCode_F54.c
+++ b/drivers/input/touchscreen/mediatek/synaptics_3320_50/RefCode_F54.c
@@ -2249,7 +2249,7 @@ int ImageTest(int mode, char *buf)
 		// Assign report type for Full Raw Image
 
 		data = 20;//raw capacitance mode
-		TOUCH_INFO_MSG("[Touch][%s] raw capacitance mode!\n", __FUNCTION__);
+		TOUCH_INFO_MSG("[Touch][%s] raw capacitance mode!\n", __func__);
 
 		Write8BitRegisters(F54DataBase, &data, 1);
 		//mode setting
@@ -2276,7 +2276,7 @@ int DeltaTest(char *buf)
 
 	// Assign report type for Full Raw Image
 	data = 0x02;//delta mode
-	TOUCH_INFO_MSG("[Touch][%s] delta mode!\n", __FUNCTION__);
+	TOUCH_INFO_MSG("[Touch][%s] delta mode!\n", __func__);
 
 	Write8BitRegisters(F54DataBase, &data, 1);
 
@@ -2296,7 +2296,7 @@ int NoiseDeltaTest(char *buf)
 	memset(NoiseDeltaMin, 0, TRX_MAX * TRX_MAX * sizeof(short));
 	memset(NoiseDeltaMax, 0, TRX_MAX * TRX_MAX * sizeof(short));
 
-	TOUCH_INFO_MSG("[Touch][%s] Noise Delta mode!\n", __FUNCTION__);
+	TOUCH_INFO_MSG("[Touch][%s] Noise Delta mode!\n", __func__);
 
 	// Assign report type for Full Raw Image
 	data = 0x02;//delta mode
diff --git a/drivers/input/touchscreen/mediatek/synaptics_3320_50/RefCode_F54.h b/drivers/input/touchscreen/mediatek/synaptics_3320_50/RefCode_F54.h
index 3bf5b5de6..98b2feb4e 100644
--- a/drivers/input/touchscreen/mediatek/synaptics_3320_50/RefCode_F54.h
+++ b/drivers/input/touchscreen/mediatek/synaptics_3320_50/RefCode_F54.h
@@ -65,8 +65,8 @@ extern int ReadF54BitRegisters(unsigned short regAddr, unsigned char *data, int
 extern int get_limit(unsigned char Tx, unsigned char Rx, struct i2c_client client, const struct touch_platform_data *pdata, char *breakpoint, int limit_data[32][32]);
 
 #define TPD_TAG                  "[S3320] "
-#define TPD_FUN(f)               printk(KERN_ERR TPD_TAG"%s\n", __FUNCTION__)
-#define TPD_ERR(fmt, args...)    printk(KERN_ERR TPD_TAG"%s %d : "fmt, __FUNCTION__, __LINE__, ##args)
+#define TPD_FUN(f)               printk(KERN_ERR TPD_TAG"%s\n", __func__)
+#define TPD_ERR(fmt, args...)    printk(KERN_ERR TPD_TAG"%s %d : "fmt, __func__, __LINE__, ##args)
 #define TPD_LOG(fmt, args...)    printk(KERN_ERR TPD_TAG fmt, ##args)
 
 #define TOUCH_INFO_MSG(fmt, args...) \
diff --git a/drivers/input/touchscreen/mediatek/synaptics_3320_50/s3320_driver.h b/drivers/input/touchscreen/mediatek/synaptics_3320_50/s3320_driver.h
index aa3ac1e5d..4e8e47b3b 100644
--- a/drivers/input/touchscreen/mediatek/synaptics_3320_50/s3320_driver.h
+++ b/drivers/input/touchscreen/mediatek/synaptics_3320_50/s3320_driver.h
@@ -18,8 +18,8 @@
 * Debugging Macros
 ****************************************************************************/
 #define TPD_TAG                  "[S3320] "
-#define TPD_FUN(f)               printk(KERN_ERR TPD_TAG"%s\n", __FUNCTION__)
-#define TPD_ERR(fmt, args...)    printk(KERN_ERR TPD_TAG"%s %d : "fmt, __FUNCTION__, __LINE__, ##args)
+#define TPD_FUN(f)               printk(KERN_ERR TPD_TAG"%s\n", __func__)
+#define TPD_ERR(fmt, args...)    printk(KERN_ERR TPD_TAG"%s %d : "fmt, __func__, __LINE__, ##args)
 #define TPD_LOG(fmt, args...)    printk(KERN_ERR TPD_TAG fmt, ##args)
 
 
diff --git a/drivers/input/touchscreen/mediatek/synaptics_3320_50/s3320_fw_update.c b/drivers/input/touchscreen/mediatek/synaptics_3320_50/s3320_fw_update.c
index 487ecb9b4..6c00b5b03 100644
--- a/drivers/input/touchscreen/mediatek/synaptics_3320_50/s3320_fw_update.c
+++ b/drivers/input/touchscreen/mediatek/synaptics_3320_50/s3320_fw_update.c
@@ -230,7 +230,7 @@ bool CheckFlashStatus(enum FlashCommand command, struct i2c_client *client)
 
 void SynaImageParser(struct i2c_client *client)
 {
-TPD_LOG("%s\n", __FUNCTION__);
+TPD_LOG("%s\n", __func__);
   // img file parsing
   SynaImageSize = ( (unsigned int)my_image_bin[0x08] | 
                     (unsigned int)my_image_bin[0x09] <<8 | 
@@ -263,7 +263,7 @@ void SynaBootloaderLock(struct i2c_client *client)
   unsigned short uBlockNum = 0;
   enum FlashCommand cmd;
 
-TPD_LOG("%s\n", __FUNCTION__);
+TPD_LOG("%s\n", __func__);
 
   if (my_image_bin[0x1E] == 0)
   {
@@ -343,7 +343,7 @@ void SynaScanPDT(struct i2c_client *client)
 	unsigned char address=0;
 	unsigned char uData[2]={0,};
 	unsigned char buffer[6]={0,};
-	TPD_LOG("%s\n", __FUNCTION__);
+	TPD_LOG("%s\n", __func__);
 
 	for (address = 0xe9; address > 0xc0; address = address - 6)
 	{
@@ -400,7 +400,7 @@ void SynaInitialize(struct i2c_client *client)
 {	
 	u8 data;
 
-	TPD_LOG("%s\n", __FUNCTION__);
+	TPD_LOG("%s\n", __func__);
 	TPD_LOG("\nInitializing Reflash Process...\n");
 
 	data = 0x00;
@@ -429,7 +429,7 @@ void SynaReadFirmwareInfo(struct i2c_client *client)
 	unsigned char uData[3] = {0,};
   unsigned char product_id[11] = {0,};
   int firmware_version = 0;
-	TPD_LOG("%s\n", __FUNCTION__);
+	TPD_LOG("%s\n", __func__);
   
   readRMI(client, SynaF01QueryBase + 11, product_id, 10);
   product_id[10] = '\0';
@@ -448,7 +448,7 @@ void SynaReadFirmwareInfo(struct i2c_client *client)
 void SynaReadBootloadID(struct i2c_client *client)
 {
 	unsigned char uData[2] = {0,};
-	TPD_LOG("%s\n", __FUNCTION__);
+	TPD_LOG("%s\n", __func__);
 
 	readRMI(client, SynaF34ReflashQuery_BootID, &uData[0], 2);
 	SynaBootloadID = uData[0] | (uData[1] << 8);
@@ -459,7 +459,7 @@ void SynaReadBootloadID(struct i2c_client *client)
 void SynaWriteBootloadID(struct i2c_client *client)
 {
 	unsigned char uData[2];
-	TPD_LOG("%s\n", __FUNCTION__);
+	TPD_LOG("%s\n", __func__);
 
 	uData[0] = SynaBootloadID % 0x100;
 	uData[1] = SynaBootloadID / 0x100;
@@ -497,7 +497,7 @@ void SynaEnableFlashing(struct i2c_client *client)
 {
 	unsigned char uStatus = 0;
   enum FlashCommand cmd;
-	TPD_LOG("%s\n", __FUNCTION__);
+	TPD_LOG("%s\n", __func__);
 	TPD_LOG("Enable Reflash...\n");
 
 	readRMI (client, SynaF01DataBase, &uStatus, 1);
@@ -622,7 +622,7 @@ void SynaFinalizeReflash(struct i2c_client *client)
     "CRC in progress\n"
     };
 
-	TPD_LOG("%s\n", __FUNCTION__);
+	TPD_LOG("%s\n", __func__);
 	TPD_LOG("\nFinalizing Reflash...\n");
 
 	// Issue the "Reset" command to F01 command register to reset the chip
@@ -658,7 +658,7 @@ void SynaFlashFirmwareWrite(struct i2c_client *client)
 	unsigned short blockNum;
   enum FlashCommand cmd;
 
-	TPD_LOG("%s\n", __FUNCTION__);
+	TPD_LOG("%s\n", __func__);
 	for (blockNum = 0; blockNum < SynaFirmwareBlockCount; ++blockNum)
 	{
     if (blockNum == 0)
@@ -699,7 +699,7 @@ void SynaFlashConfigWrite(struct i2c_client *client)
 	unsigned short blockNum;
   enum FlashCommand cmd;
 
-	TPD_LOG("%s\n", __FUNCTION__);
+	TPD_LOG("%s\n", __func__);
 	for (blockNum = 0; blockNum < SynaConfigBlockCount; ++blockNum)
 	{
 		//Block by blcok, write the block number and data to the corresponding F34 data registers
@@ -732,7 +732,7 @@ void SynaFlashConfigWrite(struct i2c_client *client)
  */
 void SynaProgramFirmware(struct i2c_client *client)
 {
-	TPD_LOG("%s\n", __FUNCTION__);
+	TPD_LOG("%s\n", __func__);
 	TPD_LOG("\nProgram Firmware Section...\n");
 
   eraseAllBlock(client);
@@ -746,7 +746,7 @@ void SynaProgramFirmware(struct i2c_client *client)
  */
 void SynaUpdateConfig(struct i2c_client *client)
 {
-	TPD_LOG("%s\n", __FUNCTION__);
+	TPD_LOG("%s\n", __func__);
 	TPD_LOG("\nUpdate Config Section...\n");
 
   EraseConfigBlock(client);
@@ -760,7 +760,7 @@ void eraseAllBlock(struct i2c_client *client)
 { 
   enum FlashCommand cmd;
 
-	TPD_LOG("%s\n", __FUNCTION__);
+	TPD_LOG("%s\n", __func__);
 	// Erase of config block is done by first entering into bootloader mode
 	SynaReadBootloadID(client);
 	SynaWriteBootloadID(client);
@@ -779,7 +779,7 @@ void EraseConfigBlock(struct i2c_client *client)
 {  
   enum FlashCommand cmd;
 
-	TPD_LOG("%s\n", __FUNCTION__);
+	TPD_LOG("%s\n", __func__);
 	// Erase of config block is done by first entering into bootloader mode
 	SynaReadBootloadID(client);
 	SynaWriteBootloadID(client);
@@ -800,7 +800,7 @@ bool CheckTouchControllerType(struct i2c_client *client)
 	char controllerType[20]={0,};
 	unsigned char uData[4]={0,};
 
-	TPD_LOG("%s\n", __FUNCTION__);
+	TPD_LOG("%s\n", __func__);
 	readRMI(client, (SynaF01QueryBase + 22), &SynaF01Query43Length, 1); //43
 
 	if ((SynaF01Query43Length & 0x0f) > 0)
@@ -827,7 +827,7 @@ bool CheckFimrwareRevision(struct i2c_client *client)
 	unsigned char uData[16];
 	char revision[106];
 
-	TPD_LOG("%s\n", __FUNCTION__);
+	TPD_LOG("%s\n", __func__);
 	readRMI((SynaF01QueryBase + 28 + SynaF01Query43Length), &uData[0], 16);
 
 	for (int i = 0; i < 0; i++)
diff --git a/drivers/input/touchscreen/mediatek/synaptics_3528/s3528_driver.h b/drivers/input/touchscreen/mediatek/synaptics_3528/s3528_driver.h
index c7e5773d8..365df3894 100644
--- a/drivers/input/touchscreen/mediatek/synaptics_3528/s3528_driver.h
+++ b/drivers/input/touchscreen/mediatek/synaptics_3528/s3528_driver.h
@@ -18,8 +18,8 @@
 * Debugging Macros
 ****************************************************************************/
 #define TPD_TAG                  "[Synaptics S3528] "
-#define TPD_FUN(f)               printk(KERN_ERR TPD_TAG"[%s %d]\n", __FUNCTION__, __LINE__)
-#define TPD_ERR(fmt, args...)    printk(KERN_ERR TPD_TAG"[%s %d] : "fmt, __FUNCTION__, __LINE__, ##args)
+#define TPD_FUN(f)               printk(KERN_ERR TPD_TAG"[%s %d]\n", __func__, __LINE__)
+#define TPD_ERR(fmt, args...)    printk(KERN_ERR TPD_TAG"[%s %d] : "fmt, __func__, __LINE__, ##args)
 #define TPD_LOG(fmt, args...)    printk(KERN_ERR TPD_TAG fmt, ##args)
 struct synaptics_ts_f12_query_5 
 {	
diff --git a/drivers/input/touchscreen/mediatek/synaptics_3528/s3528_fw_update.c b/drivers/input/touchscreen/mediatek/synaptics_3528/s3528_fw_update.c
index 4dd2d1e58..cb77a3a49 100644
--- a/drivers/input/touchscreen/mediatek/synaptics_3528/s3528_fw_update.c
+++ b/drivers/input/touchscreen/mediatek/synaptics_3528/s3528_fw_update.c
@@ -230,7 +230,7 @@ bool CheckFlashStatus(enum FlashCommand command, struct i2c_client *client)
 
 void SynaImageParser(struct i2c_client *client)
 {
-TPD_LOG("%s\n", __FUNCTION__);
+TPD_LOG("%s\n", __func__);
   // img file parsing
   SynaImageSize = ( (unsigned int)my_image_bin[0x08] | 
                     (unsigned int)my_image_bin[0x09] <<8 | 
@@ -263,7 +263,7 @@ void SynaBootloaderLock(struct i2c_client *client)
   unsigned short uBlockNum = 0;
   enum FlashCommand cmd;
 
-TPD_LOG("%s\n", __FUNCTION__);
+TPD_LOG("%s\n", __func__);
 
   if (my_image_bin[0x1E] == 0)
   {
@@ -343,7 +343,7 @@ void SynaScanPDT(struct i2c_client *client)
 	unsigned char address=0;
 	unsigned char uData[2]={0,};
 	unsigned char buffer[6]={0,};
-	TPD_LOG("%s\n", __FUNCTION__);
+	TPD_LOG("%s\n", __func__);
 
 	for (address = 0xe9; address > 0xc0; address = address - 6)
 	{
@@ -400,7 +400,7 @@ void SynaInitialize(struct i2c_client *client)
 {	
 	u8 data;
 
-	TPD_LOG("%s\n", __FUNCTION__);
+	TPD_LOG("%s\n", __func__);
 	TPD_LOG("\nInitializing Reflash Process...\n");
 
 	data = 0x00;
@@ -429,7 +429,7 @@ void SynaReadFirmwareInfo(struct i2c_client *client)
 	unsigned char uData[3] = {0,};
   unsigned char product_id[11] = {0,};
   int firmware_version = 0;
-	TPD_LOG("%s\n", __FUNCTION__);
+	TPD_LOG("%s\n", __func__);
   
   readRMI(client, SynaF01QueryBase + 11, product_id, 10);
   product_id[10] = '\0';
@@ -448,7 +448,7 @@ void SynaReadFirmwareInfo(struct i2c_client *client)
 void SynaReadBootloadID(struct i2c_client *client)
 {
 	unsigned char uData[2] = {0,};
-	TPD_LOG("%s\n", __FUNCTION__);
+	TPD_LOG("%s\n", __func__);
 
 	readRMI(client, SynaF34ReflashQuery_BootID, &uData[0], 2);
 	SynaBootloadID = uData[0] | (uData[1] << 8);
@@ -459,7 +459,7 @@ void SynaReadBootloadID(struct i2c_client *client)
 void SynaWriteBootloadID(struct i2c_client *client)
 {
 	unsigned char uData[2];
-	TPD_LOG("%s\n", __FUNCTION__);
+	TPD_LOG("%s\n", __func__);
 
 	uData[0] = SynaBootloadID % 0x100;
 	uData[1] = SynaBootloadID / 0x100;
@@ -497,7 +497,7 @@ void SynaEnableFlashing(struct i2c_client *client)
 {
 	unsigned char uStatus = 0;
   enum FlashCommand cmd;
-	TPD_LOG("%s\n", __FUNCTION__);
+	TPD_LOG("%s\n", __func__);
 	TPD_LOG("Enable Reflash...\n");
 
 	readRMI (client, SynaF01DataBase, &uStatus, 1);
@@ -622,7 +622,7 @@ void SynaFinalizeReflash(struct i2c_client *client)
     "CRC in progress\n"
     };
 
-	TPD_LOG("%s\n", __FUNCTION__);
+	TPD_LOG("%s\n", __func__);
 	TPD_LOG("\nFinalizing Reflash...\n");
 
 	// Issue the "Reset" command to F01 command register to reset the chip
@@ -658,7 +658,7 @@ void SynaFlashFirmwareWrite(struct i2c_client *client)
 	unsigned short blockNum;
   enum FlashCommand cmd;
 
-	TPD_LOG("%s\n", __FUNCTION__);
+	TPD_LOG("%s\n", __func__);
 	for (blockNum = 0; blockNum < SynaFirmwareBlockCount; ++blockNum)
 	{
     if (blockNum == 0)
@@ -699,7 +699,7 @@ void SynaFlashConfigWrite(struct i2c_client *client)
 	unsigned short blockNum;
   enum FlashCommand cmd;
 
-	TPD_LOG("%s\n", __FUNCTION__);
+	TPD_LOG("%s\n", __func__);
 	for (blockNum = 0; blockNum < SynaConfigBlockCount; ++blockNum)
 	{
 		//Block by blcok, write the block number and data to the corresponding F34 data registers
@@ -730,7 +730,7 @@ void SynaFlashConfigWrite(struct i2c_client *client)
  */
 void SynaProgramFirmware(struct i2c_client *client)
 {
-	TPD_LOG("%s\n", __FUNCTION__);
+	TPD_LOG("%s\n", __func__);
 	TPD_LOG("\nProgram Firmware Section...\n");
 
   eraseAllBlock(client);
@@ -744,7 +744,7 @@ void SynaProgramFirmware(struct i2c_client *client)
  */
 void SynaUpdateConfig(struct i2c_client *client)
 {
-	TPD_LOG("%s\n", __FUNCTION__);
+	TPD_LOG("%s\n", __func__);
 	TPD_LOG("\nUpdate Config Section...\n");
 
   EraseConfigBlock(client);
@@ -758,7 +758,7 @@ void eraseAllBlock(struct i2c_client *client)
 { 
   enum FlashCommand cmd;
 
-	TPD_LOG("%s\n", __FUNCTION__);
+	TPD_LOG("%s\n", __func__);
 	// Erase of config block is done by first entering into bootloader mode
 	SynaReadBootloadID(client);
 	SynaWriteBootloadID(client);
@@ -777,7 +777,7 @@ void EraseConfigBlock(struct i2c_client *client)
 {  
   enum FlashCommand cmd;
 
-	TPD_LOG("%s\n", __FUNCTION__);
+	TPD_LOG("%s\n", __func__);
 	// Erase of config block is done by first entering into bootloader mode
 	SynaReadBootloadID(client);
 	SynaWriteBootloadID(client);
@@ -798,7 +798,7 @@ bool CheckTouchControllerType(struct i2c_client *client)
 	char controllerType[20]={0,};
 	unsigned char uData[4]={0,};
 
-	TPD_LOG("%s\n", __FUNCTION__);
+	TPD_LOG("%s\n", __func__);
 	readRMI(client, (SynaF01QueryBase + 22), &SynaF01Query43Length, 1); //43
 
 	if ((SynaF01Query43Length & 0x0f) > 0)
@@ -825,7 +825,7 @@ bool CheckFimrwareRevision(struct i2c_client *client)
 	unsigned char uData[16];
 	char revision[106];
 
-	TPD_LOG("%s\n", __FUNCTION__);
+	TPD_LOG("%s\n", __func__);
 	readRMI((SynaF01QueryBase + 28 + SynaF01Query43Length), &uData[0], 16);
 
 	for (int i = 0; i < 0; i++)
diff --git a/drivers/input/touchscreen/mediatek/synaptics_7020/synaptics_ts.h b/drivers/input/touchscreen/mediatek/synaptics_7020/synaptics_ts.h
index 671fd0095..f8c1603f9 100644
--- a/drivers/input/touchscreen/mediatek/synaptics_7020/synaptics_ts.h
+++ b/drivers/input/touchscreen/mediatek/synaptics_7020/synaptics_ts.h
@@ -42,13 +42,13 @@
 #endif
 
 #if defined(SYNAPTICS_RMI4_I2C_DEBUG_PRINT)
-#define SYNAPTICS_DEBUG_MSG(fmt, args...) printk(KERN_ERR "[Touch D] [%s %d] " fmt, __FUNCTION__, __LINE__, ##args);
+#define SYNAPTICS_DEBUG_MSG(fmt, args...) printk(KERN_ERR "[Touch D] [%s %d] " fmt, __func__, __LINE__, ##args);
 #else
 #define SYNAPTICS_DEBUG_MSG(fmt, args...) {};
 #endif
 
 #if defined(SYNAPTICS_RMI4_I2C_ERROR_PRINT)
-#define SYNAPTICS_ERR_MSG(fmt, args...) printk(KERN_ERR "[Touch E] [%s %d] " fmt, __FUNCTION__, __LINE__, ##args);
+#define SYNAPTICS_ERR_MSG(fmt, args...) printk(KERN_ERR "[Touch E] [%s %d] " fmt, __func__, __LINE__, ##args);
 #else
 #define SYNAPTICS_ERR_MSG(fmt, args...) {};
 #endif
diff --git a/drivers/input/touchscreen/mediatek/synaptics_7020/synaptics_ts_fw_upgrade.c b/drivers/input/touchscreen/mediatek/synaptics_7020/synaptics_ts_fw_upgrade.c
index ddb54e011..8de6f4959 100644
--- a/drivers/input/touchscreen/mediatek/synaptics_7020/synaptics_ts_fw_upgrade.c
+++ b/drivers/input/touchscreen/mediatek/synaptics_7020/synaptics_ts_fw_upgrade.c
@@ -172,7 +172,7 @@ void SynaSetup(struct synaptics_ts_data *ts)
 {
     unsigned char address;
     unsigned char buffer[6];
-    SYNAPTICS_INFO_MSG("%s\n", __FUNCTION__);
+    SYNAPTICS_INFO_MSG("%s\n", __func__);
 
     for (address = 0xe9; address > 0xd0; address = address - 6)
     {
@@ -230,7 +230,7 @@ void SynaInitialize(struct synaptics_ts_data *ts)
 {
     unsigned char uData[2];
 
-    SYNAPTICS_INFO_MSG("%s\n", __FUNCTION__);
+    SYNAPTICS_INFO_MSG("%s\n", __func__);
 
     SYNAPTICS_INFO_MSG("Initializing Reflash Process...\n");
     uData[0] = 0x00;
@@ -256,7 +256,7 @@ void SynaReadFirmwareInfo(struct synaptics_ts_data *ts)
     uData[0] = 0;
     uData[1] = 0;
 
-    SYNAPTICS_INFO_MSG("%s\n", __FUNCTION__);
+    SYNAPTICS_INFO_MSG("%s\n", __func__);
 
     SYNAPTICS_INFO_MSG("Read Firmware Info\n");
 
@@ -274,7 +274,7 @@ void SynaReadFirmwareInfo(struct synaptics_ts_data *ts)
 void SynaReadConfigInfo(struct synaptics_ts_data *ts)
 {
     unsigned char uData[2];
-    SYNAPTICS_INFO_MSG("%s\n", __FUNCTION__);
+    SYNAPTICS_INFO_MSG("%s\n", __func__);
 
     SYNAPTICS_INFO_MSG("Read Config Info\n");
 
@@ -291,7 +291,7 @@ void SynaReadConfigInfo(struct synaptics_ts_data *ts)
 void SynaReadBootloadID(struct synaptics_ts_data *ts)
 {
     unsigned char uData[2];
-    SYNAPTICS_INFO_MSG("%s\n", __FUNCTION__);
+    SYNAPTICS_INFO_MSG("%s\n", __func__);
 
     readRMI(ts->client, SynaF34ReflashQuery_BootID, &uData[0], 2);
     SynaBootloadID = uData[0] + uData[1] * 0x100;
@@ -302,7 +302,7 @@ void SynaReadBootloadID(struct synaptics_ts_data *ts)
 void SynaWriteBootloadID(struct synaptics_ts_data *ts)
 {
     unsigned char uData[2];
-    SYNAPTICS_INFO_MSG("%s\n", __FUNCTION__);
+    SYNAPTICS_INFO_MSG("%s\n", __func__);
 
     uData[0] = SynaBootloadID % 0x100;
     uData[1] = SynaBootloadID / 0x100;
@@ -357,7 +357,7 @@ int SynaEnableFlashing(struct synaptics_ts_data *ts)
     int ret;
     unsigned char uData;
     unsigned char uStatus;
-    SYNAPTICS_INFO_MSG("%s\n", __FUNCTION__);
+    SYNAPTICS_INFO_MSG("%s\n", __func__);
 
     SYNAPTICS_INFO_MSG("Enable Reflash...\n");
 
@@ -407,7 +407,7 @@ int SynaProgramConfiguration(struct synaptics_ts_data *ts)
     unsigned char *puData = (unsigned char *)&my_image_bin[0xb100];
 
     unsigned short blockNum;
-    SYNAPTICS_INFO_MSG("%s\n", __FUNCTION__);
+    SYNAPTICS_INFO_MSG("%s\n", __func__);
 
     SYNAPTICS_INFO_MSG("Program Configuration Section...\n");
 
@@ -437,7 +437,7 @@ int SynaFinalizeReflash(struct synaptics_ts_data *ts)
     int ret;
     unsigned char uData;
     unsigned char uStatus;
-    SYNAPTICS_INFO_MSG("%s\n", __FUNCTION__);
+    SYNAPTICS_INFO_MSG("%s\n", __func__);
 
     SYNAPTICS_INFO_MSG("Finalizing Reflash...\n");
 
@@ -483,7 +483,7 @@ int SynaFlashFirmwareWrite(struct synaptics_ts_data *ts)
     unsigned char *puFirmwareData = (unsigned char *)&my_image_bin[0x100];
     unsigned char uData[2];
     unsigned short blockNum;
-    SYNAPTICS_INFO_MSG("%s\n", __FUNCTION__);
+    SYNAPTICS_INFO_MSG("%s\n", __func__);
 
     for (blockNum = 0; blockNum < SynaFirmwareBlockCount; ++blockNum)
     {
@@ -513,7 +513,7 @@ int SynaProgramFirmware(struct synaptics_ts_data *ts)
 {
     int ret;
     unsigned char uData;
-    SYNAPTICS_INFO_MSG("%s\n", __FUNCTION__);
+    SYNAPTICS_INFO_MSG("%s\n", __func__);
 
     SYNAPTICS_INFO_MSG("Program Firmware Section...\n");
 
@@ -541,7 +541,7 @@ int SynaProgramFirmware(struct synaptics_ts_data *ts)
 int eraseConfigBlock(struct synaptics_ts_data *ts)
 {
     unsigned char uData;
-    SYNAPTICS_INFO_MSG("%s\n", __FUNCTION__);
+    SYNAPTICS_INFO_MSG("%s\n", __func__);
 
     // Erase of config block is done by first entering into bootloader mode
     SynaReadBootloadID(ts);
@@ -567,7 +567,7 @@ void CRC_Calculate(unsigned short * data, unsigned short len)
     unsigned long Data_CRC = 0xffffffff;
     unsigned long sum1 = (unsigned long)(Data_CRC & 0xFFFF);
     unsigned long sum2 = (unsigned long)(Data_CRC >> 16);
-    SYNAPTICS_INFO_MSG("%s\n", __FUNCTION__);
+    SYNAPTICS_INFO_MSG("%s\n", __func__);
 
     for (i = 0; i < len; i++)
     {
@@ -663,7 +663,7 @@ int ConfigBlockReflash(struct synaptics_ts_data *ts)
 {
     int ret;
     unsigned char uData[2];
-    SYNAPTICS_INFO_MSG("%s\n", __FUNCTION__);
+    SYNAPTICS_INFO_MSG("%s\n", __func__);
 
     SynaInitialize(ts);
 
@@ -720,7 +720,7 @@ int ConfigBlockReflash(struct synaptics_ts_data *ts)
 int CompleteReflash(struct synaptics_ts_data *ts)
 {
     int ret;
-    SYNAPTICS_INFO_MSG("%s\n", __FUNCTION__);
+    SYNAPTICS_INFO_MSG("%s\n", __func__);
     SynaInitialize(ts);
 
     SynaReadConfigInfo(ts);
@@ -759,7 +759,7 @@ int CompleteReflash(struct synaptics_ts_data *ts)
 int CompleteReflash_Lockdown(struct synaptics_ts_data *ts)
 {
     int ret;
-    SYNAPTICS_INFO_MSG("%s\n", __FUNCTION__);
+    SYNAPTICS_INFO_MSG("%s\n", __func__);
 
     SynaInitialize(ts);
 
diff --git a/drivers/input/touchscreen/mediatek/synaptics_7020_s7/s7020_driver.h b/drivers/input/touchscreen/mediatek/synaptics_7020_s7/s7020_driver.h
index 02edfa553..60fef60b4 100644
--- a/drivers/input/touchscreen/mediatek/synaptics_7020_s7/s7020_driver.h
+++ b/drivers/input/touchscreen/mediatek/synaptics_7020_s7/s7020_driver.h
@@ -18,6 +18,6 @@
 * Debugging Macros
 ****************************************************************************/
 #define TPD_TAG                  "[Synaptics S7020] "
-#define TPD_FUN(f)               printk(KERN_ERR TPD_TAG"[%s %d]\n", __FUNCTION__, __LINE__)
-#define TPD_ERR(fmt, args...)    printk(KERN_ERR TPD_TAG"[%s %d] : "fmt, __FUNCTION__, __LINE__, ##args)
+#define TPD_FUN(f)               printk(KERN_ERR TPD_TAG"[%s %d]\n", __func__, __LINE__)
+#define TPD_ERR(fmt, args...)    printk(KERN_ERR TPD_TAG"[%s %d] : "fmt, __func__, __LINE__, ##args)
 #define TPD_LOG(fmt, args...)    printk(KERN_ERR TPD_TAG fmt, ##args)
\ No newline at end of file
diff --git a/drivers/input/touchscreen/mediatek/synaptics_7020_s7/s7020_fw_update.c b/drivers/input/touchscreen/mediatek/synaptics_7020_s7/s7020_fw_update.c
index 8863fd7f0..72615f5b3 100644
--- a/drivers/input/touchscreen/mediatek/synaptics_7020_s7/s7020_fw_update.c
+++ b/drivers/input/touchscreen/mediatek/synaptics_7020_s7/s7020_fw_update.c
@@ -173,7 +173,7 @@ void SynaSetup(struct i2c_client *client)
     unsigned char address;
     unsigned char buffer[6];
 	memset(buffer, 0, sizeof(buffer));
-	TPD_LOG("%s\n", __FUNCTION__);
+	TPD_LOG("%s\n", __func__);
 
 	for (address = 0xe9; address > 0xd0; address = address - 6)
 	{
@@ -233,7 +233,7 @@ void SynaInitialize(struct i2c_client *client)
 	uData[0] = 0;
 	uData[1] = 0;
 	
-	TPD_LOG("%s\n", __FUNCTION__);
+	TPD_LOG("%s\n", __func__);
 
 	TPD_LOG("Initializing Reflash Process...\n");
 	uData[0] = 0x00;
@@ -259,7 +259,7 @@ void SynaReadFirmwareInfo(struct i2c_client *client)
 	uData[0] = 0;
 	uData[1] = 0;
 
-	TPD_LOG("%s\n", __FUNCTION__);
+	TPD_LOG("%s\n", __func__);
 
 	TPD_LOG("Read Firmware Info\n");
 
@@ -279,7 +279,7 @@ void SynaReadConfigInfo(struct i2c_client *client)
 	unsigned char uData[2];
 	uData[0] = 0;
 	uData[1] = 0;
-	TPD_LOG("%s\n", __FUNCTION__);
+	TPD_LOG("%s\n", __func__);
 
 	TPD_LOG("Read Config Info\n");
 
@@ -298,7 +298,7 @@ void SynaReadBootloadID(struct i2c_client *client)
 	unsigned char uData[2];
 	uData[0] = 0;
 	uData[1] = 0;
-	TPD_LOG("%s\n", __FUNCTION__);
+	TPD_LOG("%s\n", __func__);
 
 	readRMI(client, SynaF34ReflashQuery_BootID, &uData[0], 2);
 	SynaBootloadID = uData[0] + uData[1] * 0x100;
@@ -309,7 +309,7 @@ void SynaReadBootloadID(struct i2c_client *client)
 void SynaWriteBootloadID(struct i2c_client *client)
 {
 	unsigned char uData[2];
-	TPD_LOG("%s\n", __FUNCTION__);
+	TPD_LOG("%s\n", __func__);
 
 	uData[0] = SynaBootloadID % 0x100;
 	uData[1] = SynaBootloadID / 0x100;
@@ -364,7 +364,7 @@ int SynaEnableFlashing(struct i2c_client *client)
 	int ret;
 	unsigned char uData = 0;
 	unsigned char uStatus = 0;
-	TPD_LOG("%s\n", __FUNCTION__);
+	TPD_LOG("%s\n", __func__);
 
 	TPD_LOG("Enable Reflash...\n");
     
@@ -414,7 +414,7 @@ int SynaProgramConfiguration(struct i2c_client *client)
 	unsigned char *puData = (unsigned char *)&my_image_bin[0xb100];
 	
 	unsigned short blockNum;
-	TPD_LOG("%s\n", __FUNCTION__);
+	TPD_LOG("%s\n", __func__);
 
 	TPD_LOG("Program Configuration Section...\n");
 
@@ -444,7 +444,7 @@ int SynaFinalizeReflash(struct i2c_client *client)
 	int ret;
 	unsigned char uData = 0;
 	unsigned char uStatus = 0;
-	TPD_LOG("%s\n", __FUNCTION__);
+	TPD_LOG("%s\n", __func__);
 
 	TPD_LOG("Finalizing Reflash...\n");
 
@@ -490,7 +490,7 @@ int SynaFlashFirmwareWrite(struct i2c_client *client)
 	unsigned char *puFirmwareData = (unsigned char *)&my_image_bin[0x100];
 	unsigned char uData[2];
 	unsigned short blockNum;
-	TPD_LOG("%s\n", __FUNCTION__);
+	TPD_LOG("%s\n", __func__);
 
 	for (blockNum = 0; blockNum < SynaFirmwareBlockCount; ++blockNum)
 	{
@@ -520,7 +520,7 @@ int SynaProgramFirmware(struct i2c_client *client)
 {
 	int ret;
 	unsigned char uData;    
-	TPD_LOG("%s\n", __FUNCTION__);
+	TPD_LOG("%s\n", __func__);
 
 	TPD_LOG("Program Firmware Section...\n");
 
@@ -548,7 +548,7 @@ int SynaProgramFirmware(struct i2c_client *client)
 int eraseConfigBlock(struct i2c_client *client)
 {
 	unsigned char uData;    
-	TPD_LOG("%s\n", __FUNCTION__);
+	TPD_LOG("%s\n", __func__);
 
 	// Erase of config block is done by first entering into bootloader mode
 	SynaReadBootloadID(client);
@@ -574,7 +574,7 @@ void CRC_Calculate(unsigned short * data, unsigned short len)
     unsigned long Data_CRC = 0xffffffff;
     unsigned long sum1 = (unsigned long)(Data_CRC & 0xFFFF);
     unsigned long sum2 = (unsigned long)(Data_CRC >> 16);
-	TPD_LOG("%s\n", __FUNCTION__);
+	TPD_LOG("%s\n", __func__);
 
     for (i = 0; i < len; i++)
     {
@@ -676,7 +676,7 @@ int ConfigBlockReflash(struct i2c_client *client)
 	uData[0] = 0;
 	uData[1] = 0;
 	
-	TPD_LOG("%s\n", __FUNCTION__);
+	TPD_LOG("%s\n", __func__);
 
     SynaInitialize(client);
 	
@@ -733,7 +733,7 @@ int ConfigBlockReflash(struct i2c_client *client)
 int CompleteReflash(struct i2c_client *client)
 {   
 	int ret;
-	TPD_LOG("%s\n", __FUNCTION__);
+	TPD_LOG("%s\n", __func__);
 	SynaInitialize(client);
 	
 	SynaReadConfigInfo(client);
@@ -772,7 +772,7 @@ int CompleteReflash(struct i2c_client *client)
 int CompleteReflash_Lockdown(struct i2c_client *client)
 {   
 	int ret;
-	TPD_LOG("%s\n", __FUNCTION__);
+	TPD_LOG("%s\n", __func__);
 	
 	SynaInitialize(client);
 	
diff --git a/drivers/input/touchscreen/mediatek/tangleM32_16/tangleM32_16_driver.c b/drivers/input/touchscreen/mediatek/tangleM32_16/tangleM32_16_driver.c
index 42e0b1308..4f547668f 100644
--- a/drivers/input/touchscreen/mediatek/tangleM32_16/tangleM32_16_driver.c
+++ b/drivers/input/touchscreen/mediatek/tangleM32_16/tangleM32_16_driver.c
@@ -382,7 +382,7 @@ static int tpd_i2c_probe(struct i2c_client *client, const struct i2c_device_id *
 }
 
 void tpd_eint_interrupt_handler(void) { 
-	TPD_DMESG("[mtk-tpd], %s\n", __FUNCTION__);
+	TPD_DMESG("[mtk-tpd], %s\n", __func__);
     TPD_DEBUG_PRINT_INT; tpd_flag=1; wake_up_interruptible(&waiter);
 } 
 static int tpd_i2c_remove(struct i2c_client *client) {return 0;}
@@ -459,7 +459,7 @@ static int touch_event_handler(void *unused) {
             msleep(20);
         }
 
-		TPD_DMESG("[mtk-tpd] %s: wait for touch event \n", __FUNCTION__);
+		TPD_DMESG("[mtk-tpd] %s: wait for touch event \n", __func__);
 
         wait_event_interruptible(waiter, tpd_flag != 0);
         
@@ -513,7 +513,7 @@ static int touch_event_handler(void *unused) {
 int tpd_local_init(void) 
 {
 	if(tpd_debuglog==1) {
-		TPD_DMESG("[mtk-tpd] %s\n", __FUNCTION__); 
+		TPD_DMESG("[mtk-tpd] %s\n", __func__); 
 	}
      if(i2c_add_driver(&tpd_i2c_driver)!=0) {
       TPD_DMESG("unable to add i2c driver.\n");
@@ -539,7 +539,7 @@ int tpd_local_init(void)
     memcpy(tpd_calmat, tpd_calmat_local, 8*4);
     memcpy(tpd_def_calmat, tpd_def_calmat_local, 8*4);	
 #endif  
-		TPD_DMESG("end %s, %d\n", __FUNCTION__, __LINE__);  
+		TPD_DMESG("end %s, %d\n", __func__, __LINE__);  
 		tpd_type_cap = 1;
     return 0;
 }
@@ -548,7 +548,7 @@ int tpd_local_init(void)
 void tpd_suspend(struct early_suspend *h)
 {
 	if(tpd_debuglog==1) {
-		TPD_DMESG("[mtk-tpd] %s\n", __FUNCTION__); 
+		TPD_DMESG("[mtk-tpd] %s\n", __func__); 
 	}
     tpd_halt = 1;
     mt_eint_mask(CUST_EINT_TOUCH_PANEL_NUM);
@@ -567,7 +567,7 @@ void tpd_suspend(struct early_suspend *h)
 void tpd_resume(struct early_suspend *h) 
 {
 	if(tpd_debuglog==1) {
-		TPD_DMESG("[mtk-tpd] %s\n", __FUNCTION__); 
+		TPD_DMESG("[mtk-tpd] %s\n", __func__); 
 	}
     #ifdef TPD_HAVE_POWER_ON_OFF
     msleep(100);
diff --git a/drivers/input/touchscreen/mediatek/tm01564/tm1896_driver.c b/drivers/input/touchscreen/mediatek/tm01564/tm1896_driver.c
index 0a0d19080..51197f712 100644
--- a/drivers/input/touchscreen/mediatek/tm01564/tm1896_driver.c
+++ b/drivers/input/touchscreen/mediatek/tm01564/tm1896_driver.c
@@ -579,7 +579,7 @@ static int RMI4_read_PDT(struct i2c_client *client)
 		
 		if(i2c_transfer(client->adapter, msg, 2) < 0)
 		{
-			printk("%s:%d: read RIM4 PDT error!\n",__FUNCTION__,__LINE__);
+			printk("%s:%d: read RIM4 PDT error!\n",__func__,__LINE__);
 			return -1;
 		}
 
@@ -599,7 +599,7 @@ static int RMI4_read_PDT(struct i2c_client *client)
 
 	if((m_PdtF01Common.m_CommandBase != fd_01.commandBase) || (m_PdtF34Flash.m_QueryBase != fd_34.queryBase))
 	{
-		printk("%s:%d: RIM4 PDT has changed!!!\n",__FUNCTION__,__LINE__);
+		printk("%s:%d: RIM4 PDT has changed!!!\n",__func__,__LINE__);
 		
 		ret = tpd_rmi4_read_pdt(ts);
 		if(ret < 0)
@@ -855,21 +855,21 @@ static int synaptics_download(struct i2c_client *client,const unsigned char *pgm
 	ret = RMI4_enable_program(client);
 	if( ret != 0)
 	{
-		printk("%s:%d:RMI enable program error,return...\n",__FUNCTION__,__LINE__);
+		printk("%s:%d:RMI enable program error,return...\n",__func__,__LINE__);
 		goto error;
 	}
 
 	ret = RMI4_check_firmware(client,pgm_data);
 	if( ret != 0)
 	{
-		printk("%s:%d:RMI check firmware error,return...\n",__FUNCTION__,__LINE__);
+		printk("%s:%d:RMI check firmware error,return...\n",__func__,__LINE__);
 		goto error;
 	}
 
 	ret = RMI4_program_firmware(client, pgm_data + 0x100);
 	if( ret != 0)
 	{
-		printk("%s:%d:RMI program firmware error,return...",__FUNCTION__,__LINE__);
+		printk("%s:%d:RMI program firmware error,return...",__func__,__LINE__);
 		goto error;
 	}
 
@@ -878,7 +878,7 @@ static int synaptics_download(struct i2c_client *client,const unsigned char *pgm
 
 error:
 	RMI4_disable_program_hw(client);
-	printk("%s:%d:error,return ....",__FUNCTION__,__LINE__);
+	printk("%s:%d:error,return ....",__func__,__LINE__);
 	return -1;
 
 }
@@ -899,14 +899,14 @@ static int i2c_update_firmware(struct i2c_client *client)
 	filp = filp_open(filename, O_RDONLY, S_IRUSR);
 	if (IS_ERR(filp))
 	{
-            printk("%s: file %s filp_open error\n", __FUNCTION__,filename);
+            printk("%s: file %s filp_open error\n", __func__,filename);
             set_fs(oldfs);
             return -1;
 	}
 
 	if (!filp->f_op)
 	{
-            printk("%s: File Operation Method Error\n", __FUNCTION__);
+            printk("%s: File Operation Method Error\n", __func__);
             filp_close(filp, NULL);
             set_fs(oldfs);
             return -1;
@@ -915,7 +915,7 @@ static int i2c_update_firmware(struct i2c_client *client)
     inode = filp->f_path.dentry->d_inode;
     if (!inode) 
     {
-        printk("%s: Get inode from filp failed\n", __FUNCTION__);
+        printk("%s: Get inode from filp failed\n", __func__);
         filp_close(filp, NULL);
         set_fs(oldfs);
         return -1;
@@ -944,7 +944,7 @@ static int i2c_update_firmware(struct i2c_client *client)
     /* read data */
     if (filp->f_op->read(filp, buf, length, &filp->f_pos) != length)
     {
-        printk("%s: file read error\n", __FUNCTION__);
+        printk("%s: file read error\n", __func__);
         filp_close(filp, NULL);
         set_fs(oldfs);
         vfree(buf);
@@ -1050,7 +1050,7 @@ static int tpd_local_init(void)
 	boot_mode = get_boot_mode();
 	if (boot_mode == 3) boot_mode = NORMAL_BOOT;
 
-	TPD_DMESG("end %s, %d\n", __FUNCTION__, __LINE__);  
+	TPD_DMESG("end %s, %d\n", __func__, __LINE__);  
 	tpd_type_cap = 1;
     return 0; 
  }