misc: replace __FUNCTION__ by __function__

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

16 files changed, 80 insertions, 80 deletions

diff --git a/drivers/misc/mediatek/alsps/APDS9930-new/APDS9930.c b/drivers/misc/mediatek/alsps/APDS9930-new/APDS9930.c
index 9a04c68d7..549140ab6 100644
--- a/drivers/misc/mediatek/alsps/APDS9930-new/APDS9930.c
+++ b/drivers/misc/mediatek/alsps/APDS9930-new/APDS9930.c
@@ -51,8 +51,8 @@
 #define APDS9930_DEV_NAME     "APDS9930"
 /*----------------------------------------------------------------------------*/
 #define APS_TAG                  "[ALS/PS] "
-#define APS_FUN(f)               printk(KERN_INFO APS_TAG"%s\n", __FUNCTION__)
-#define APS_ERR(fmt, args...)    printk(KERN_ERR  APS_TAG"%s %d : "fmt, __FUNCTION__, __LINE__, ##args)
+#define APS_FUN(f)               printk(KERN_INFO APS_TAG"%s\n", __func__)
+#define APS_ERR(fmt, args...)    printk(KERN_ERR  APS_TAG"%s %d : "fmt, __func__, __LINE__, ##args)
 #define APS_LOG(fmt, args...)    printk(KERN_ERR APS_TAG fmt, ##args)
 #define APS_DBG(fmt, args...)    printk(KERN_INFO APS_TAG fmt, ##args) 
 
@@ -1453,7 +1453,7 @@ static long APDS9930_unlocked_ioctl(struct file *file, unsigned int cmd,
 				break;
 			/*------------------------------------------------------------------------------------------*/
 		default:
-			APS_ERR("%s not supported = 0x%04x", __FUNCTION__, cmd);
+			APS_ERR("%s not supported = 0x%04x", __func__, cmd);
 			err = -ENOIOCTLCMD;
 			break;
 	}
diff --git a/drivers/misc/mediatek/alsps/APDS9930/APDS9930.c b/drivers/misc/mediatek/alsps/APDS9930/APDS9930.c
index 99acabbec..13a0133a5 100644
--- a/drivers/misc/mediatek/alsps/APDS9930/APDS9930.c
+++ b/drivers/misc/mediatek/alsps/APDS9930/APDS9930.c
@@ -49,8 +49,8 @@
 #define APDS9930_DEV_NAME     "APDS9930"
 /*----------------------------------------------------------------------------*/
 #define APS_TAG                  "[ALS/PS] "
-#define APS_FUN(f)               printk(KERN_INFO APS_TAG"%s\n", __FUNCTION__)
-#define APS_ERR(fmt, args...)    printk(KERN_ERR  APS_TAG"%s %d : "fmt, __FUNCTION__, __LINE__, ##args)
+#define APS_FUN(f)               printk(KERN_INFO APS_TAG"%s\n", __func__)
+#define APS_ERR(fmt, args...)    printk(KERN_ERR  APS_TAG"%s %d : "fmt, __func__, __LINE__, ##args)
 #define APS_LOG(fmt, args...)    printk(KERN_ERR APS_TAG fmt, ##args)
 #define APS_DBG(fmt, args...)    printk(KERN_INFO APS_TAG fmt, ##args) 
 
@@ -1441,7 +1441,7 @@ static long APDS9930_unlocked_ioctl(struct file *file, unsigned int cmd,
 				break;
 			/*------------------------------------------------------------------------------------------*/
 		default:
-			APS_ERR("%s not supported = 0x%04x", __FUNCTION__, cmd);
+			APS_ERR("%s not supported = 0x%04x", __func__, cmd);
 			err = -ENOIOCTLCMD;
 			break;
 	}
diff --git a/drivers/misc/mediatek/alsps/EPL2182-new/epl2182.c b/drivers/misc/mediatek/alsps/EPL2182-new/epl2182.c
index 26e90255a..1570ad07e 100644
--- a/drivers/misc/mediatek/alsps/EPL2182-new/epl2182.c
+++ b/drivers/misc/mediatek/alsps/EPL2182-new/epl2182.c
@@ -100,8 +100,8 @@ typedef struct _epl_raw_data
 
 /*----------------------------------------------------------------------------*/
 #define APS_TAG                  "[ALS/PS] "
-#define APS_FUN(f)               printk(KERN_ERR APS_TAG"%s\n", __FUNCTION__)
-#define APS_ERR(fmt, args...)    printk(KERN_ERR  APS_TAG"%s %d : "fmt, __FUNCTION__, __LINE__, ##args)
+#define APS_FUN(f)               printk(KERN_ERR APS_TAG"%s\n", __func__)
+#define APS_ERR(fmt, args...)    printk(KERN_ERR  APS_TAG"%s %d : "fmt, __func__, __LINE__, ##args)
 #define APS_LOG(fmt, args...)    printk(KERN_ERR APS_TAG fmt, ##args)
 #define APS_DBG(fmt, args...)    printk(KERN_ERR APS_TAG fmt, ##args)
 #define FTM_CUST_ALSPS "/data/epl2182"
@@ -1523,7 +1523,7 @@ static long epl2182_unlocked_ioctl(struct file *file, unsigned int cmd, unsigned
 
 
         default:
-            APS_ERR("%s not supported = 0x%04x", __FUNCTION__, cmd);
+            APS_ERR("%s not supported = 0x%04x", __func__, cmd);
             err = -ENOIOCTLCMD;
             break;
     }
diff --git a/drivers/misc/mediatek/alsps/aal_control.c b/drivers/misc/mediatek/alsps/aal_control.c
index d452da3f6..1971780e1 100644
--- a/drivers/misc/mediatek/alsps/aal_control.c
+++ b/drivers/misc/mediatek/alsps/aal_control.c
@@ -72,7 +72,7 @@ static long AAL_unlocked_ioctl(struct file *file, unsigned int cmd, unsigned lon
 				break;
 			
 			default:
-				AAL_ERR("%s not supported = 0x%04x", __FUNCTION__, cmd);
+				AAL_ERR("%s not supported = 0x%04x", __func__, cmd);
 				err = -ENOIOCTLCMD;
 				break;
 		}
diff --git a/drivers/misc/mediatek/alsps/apm_16d/apm_16d.c b/drivers/misc/mediatek/alsps/apm_16d/apm_16d.c
index 485bbbac3..5eccbaa43 100644
--- a/drivers/misc/mediatek/alsps/apm_16d/apm_16d.c
+++ b/drivers/misc/mediatek/alsps/apm_16d/apm_16d.c
@@ -40,8 +40,8 @@
 /*----------------------------------------------------------------------------*/
 
 #define APM_TAG                  "[ALS/PS] "
-#define APM_FUN()                printk( APM_TAG"%s\n", __FUNCTION__)
-#define APM_ERR(fmt, args...)    printk( APM_TAG"%s %d : "fmt, __FUNCTION__, __LINE__, ##args)
+#define APM_FUN()                printk( APM_TAG"%s\n", __func__)
+#define APM_ERR(fmt, args...)    printk( APM_TAG"%s %d : "fmt, __func__, __LINE__, ##args)
 #define APM_LOG(fmt, args...)    printk( APM_TAG fmt, ##args)
 #define APM_DBG(fmt, args...)    printk( fmt, ##args)
 
@@ -348,11 +348,11 @@ int apm_16d_write_als(struct i2c_client *client, u8 data)
 	if(ret < 0)
 	{
 		APM_ERR("write als = %d\n", ret);
-		printk("[%s] 123 i2c addr = 0x%x, als_cmd = 0x%x, data = 0x%x\n", __FUNCTION__, client->addr, obj->addr.als_cmd, data);
+		printk("[%s] 123 i2c addr = 0x%x, als_cmd = 0x%x, data = 0x%x\n", __func__, client->addr, obj->addr.als_cmd, data);
 		return -EFAULT;
 	}
         else
-       printk("[%s] cc_i2c addr = 0x%x,cc_ als_cmd = 0x%x, cc_data = 0x%x\n", __FUNCTION__, client->addr, obj->addr.als_cmd, data);
+       printk("[%s] cc_i2c addr = 0x%x,cc_ als_cmd = 0x%x, cc_data = 0x%x\n", __func__, client->addr, obj->addr.als_cmd, data);
 
 	return 0;
 }
@@ -382,12 +382,12 @@ int apm_16d_read_ps(struct i2c_client *client, int *data)
 
 	apm_16d_master_recv(client, obj->addr.ps_cmd, buf, 1);
 	//apm_16d_master_recv(client, client->addr, buf, 1);
-	printk("[%s] read ps cmd = 0x%x\n", __FUNCTION__, buf[0]);
+	printk("[%s] read ps cmd = 0x%x\n", __func__, buf[0]);
 	
 	//buf[0]=obj->addr.status;
 	apm_16d_master_recv(client, obj->addr.status, buf, 1);
 	//apm_16d_master_recv(client, client->addr, buf, 1);
-	printk("[%s] read apm status = 0x%x\n", __FUNCTION__, buf[0]);
+	printk("[%s] read apm status = 0x%x\n", __func__, buf[0]);
 #endif
 	
 	return 0;
@@ -454,7 +454,7 @@ static void apm_16d_power(struct alsps_hw *hw, unsigned int on)
 	static unsigned int power_on = 0;
 
 #if (defined(DCT_H958))
-	printk("[%s] line = %d on = %d\n", __FUNCTION__, __LINE__, on);
+	printk("[%s] line = %d on = %d\n", __func__, __LINE__, on);
         if(power_on == on)
         {
 	        APM_LOG("ignore power control: %d\n", on);
@@ -1020,7 +1020,7 @@ static ssize_t apm_16d_show_als(struct device_driver *ddri, char *buf)
 		int dat;
 #endif
 		
-		printk("\n[%s]---line = %d----\n",__FUNCTION__, __LINE__);
+		printk("\n[%s]---line = %d----\n",__func__, __LINE__);
 
 
 	if(!apm_16d_obj)
@@ -2020,7 +2020,7 @@ static long apm_16d_unlocked_ioctl(struct file *file, unsigned int cmd,
 		#endif
 
 		default:
-			APM_ERR("%s not supported = 0x%04x", __FUNCTION__, cmd);
+			APM_ERR("%s not supported = 0x%04x", __func__, cmd);
 			err = -ENOIOCTLCMD;
 			break;
 	}
@@ -2049,7 +2049,7 @@ static int apm_16d_i2c_suspend(struct i2c_client *client, pm_message_t msg)
 	int err;
 	APM_FUN();
 	
-printk("[%s] line  =%d called \n",__FUNCTION__, __LINE__);
+printk("[%s] line  =%d called \n",__func__, __LINE__);
 	if(msg.event == PM_EVENT_SUSPEND)
 	{
 		if(!obj)
@@ -2084,7 +2084,7 @@ static int apm_16d_i2c_resume(struct i2c_client *client)
 	struct apm_16d_priv *obj = i2c_get_clientdata(client);
 	int err;
 	APM_FUN();
-	printk("[%s] line  =%d called \n",__FUNCTION__, __LINE__);
+	printk("[%s] line  =%d called \n",__func__, __LINE__);
 	if(!obj)
 	{
 		APM_ERR("null pointer!!\n");
@@ -2137,7 +2137,7 @@ static void apm_16d_early_suspend(struct early_suspend *h)
 		APM_ERR("disable als fail: %d\n", err);
 	}
 #endif
-printk("[%s] line  =%d called \n",__FUNCTION__, __LINE__);
+printk("[%s] line  =%d called \n",__func__, __LINE__);
 }
 /*----------------------------------------------------------------------------*/
 static void apm_16d_late_resume(struct early_suspend *h)
@@ -2167,7 +2167,7 @@ static void apm_16d_late_resume(struct early_suspend *h)
 		}
 	}
 #endif
-printk("[%s] line  =%d called \n",__FUNCTION__, __LINE__);
+printk("[%s] line  =%d called \n",__func__, __LINE__);
 }
 
 int apm_16d_ps_operate(void* self, uint32_t command, void* buff_in, int size_in,
@@ -2373,7 +2373,7 @@ static int apm_16d_i2c_probe(struct i2c_client *client, const struct i2c_device_
 		goto exit;
 	}
 
-	printk("\n\n[%s] amp_16d chip addr = 0x%x\n\n",__FUNCTION__, client->addr);
+	printk("\n\n[%s] amp_16d chip addr = 0x%x\n\n",__func__, client->addr);
 	memset(obj, 0, sizeof(*obj));
 	apm_16d_obj = obj;
 	#if defined(CONFIG_MTK_AUTO_DETECT_ALSPS)
diff --git a/drivers/misc/mediatek/alsps/cm3232-new/cm3232.c b/drivers/misc/mediatek/alsps/cm3232-new/cm3232.c
index 787db7005..8ca2b536d 100644
--- a/drivers/misc/mediatek/alsps/cm3232-new/cm3232.c
+++ b/drivers/misc/mediatek/alsps/cm3232-new/cm3232.c
@@ -56,8 +56,8 @@
 #define CM3232_DEV_NAME     "cm3232"
 /*----------------------------------------------------------------------------*/
 #define APS_TAG                  "[ALS/PS] "
-#define APS_FUN(f)               printk(KERN_INFO APS_TAG"%s\n", __FUNCTION__)
-#define APS_ERR(fmt, args...)    printk(KERN_ERR  APS_TAG"%s %d : "fmt, __FUNCTION__, __LINE__, ##args)
+#define APS_FUN(f)               printk(KERN_INFO APS_TAG"%s\n", __func__)
+#define APS_ERR(fmt, args...)    printk(KERN_ERR  APS_TAG"%s %d : "fmt, __func__, __LINE__, ##args)
 #define APS_LOG(fmt, args...)    printk(KERN_INFO APS_TAG fmt, ##args)
 #define APS_DBG(fmt, args...)    printk(KERN_INFO APS_TAG fmt, ##args)                 
 /******************************************************************************
@@ -1023,7 +1023,7 @@ static long cm3232_unlocked_ioctl(struct file *file, unsigned int cmd, unsigned
 			/*------------------------------------------------------------------------------------------*/
 			
 			default:
-				APS_ERR("%s not supported = 0x%04x", __FUNCTION__, cmd);
+				APS_ERR("%s not supported = 0x%04x", __func__, cmd);
 				err = -ENOIOCTLCMD;
 				break;
 		}
diff --git a/drivers/misc/mediatek/alsps/cm36283-new/cm36283.c b/drivers/misc/mediatek/alsps/cm36283-new/cm36283.c
index fbb67913e..c6ae837ca 100644
--- a/drivers/misc/mediatek/alsps/cm36283-new/cm36283.c
+++ b/drivers/misc/mediatek/alsps/cm36283-new/cm36283.c
@@ -52,8 +52,8 @@
 #define CM36283_DEV_NAME     "cm36283"
 /*----------------------------------------------------------------------------*/
 #define APS_TAG                  "[ALS/PS] "
-#define APS_FUN(f)               printk(KERN_INFO APS_TAG"%s\n", __FUNCTION__)
-#define APS_ERR(fmt, args...)    printk(KERN_ERR  APS_TAG"%s %d : "fmt, __FUNCTION__, __LINE__, ##args)
+#define APS_FUN(f)               printk(KERN_INFO APS_TAG"%s\n", __func__)
+#define APS_ERR(fmt, args...)    printk(KERN_ERR  APS_TAG"%s %d : "fmt, __func__, __LINE__, ##args)
 #define APS_LOG(fmt, args...)    printk(KERN_ERR APS_TAG fmt, ##args)
 #define APS_DBG(fmt, args...)    printk(KERN_INFO APS_TAG fmt, ##args)    
 
@@ -1693,7 +1693,7 @@ static long cm36283_unlocked_ioctl(struct file *file, unsigned int cmd, unsigned
 			/*------------------------------------------------------------------------------------------*/
 			
 			default:
-				APS_ERR("%s not supported = 0x%04x", __FUNCTION__, cmd);
+				APS_ERR("%s not supported = 0x%04x", __func__, cmd);
 				err = -ENOIOCTLCMD;
 				break;
 		}
diff --git a/drivers/misc/mediatek/alsps/cm36283/cm36283.c b/drivers/misc/mediatek/alsps/cm36283/cm36283.c
index 686a864d2..a339e53e4 100644
--- a/drivers/misc/mediatek/alsps/cm36283/cm36283.c
+++ b/drivers/misc/mediatek/alsps/cm36283/cm36283.c
@@ -47,8 +47,8 @@
 #define CM36283_DEV_NAME     "cm36283"
 /*----------------------------------------------------------------------------*/
 #define APS_TAG                  "[ALS/PS] "
-#define APS_FUN(f)               printk(KERN_INFO APS_TAG"%s\n", __FUNCTION__)
-#define APS_ERR(fmt, args...)    printk(KERN_ERR  APS_TAG"%s %d : "fmt, __FUNCTION__, __LINE__, ##args)
+#define APS_FUN(f)               printk(KERN_INFO APS_TAG"%s\n", __func__)
+#define APS_ERR(fmt, args...)    printk(KERN_ERR  APS_TAG"%s %d : "fmt, __func__, __LINE__, ##args)
 #define APS_LOG(fmt, args...)    printk(KERN_ERR APS_TAG fmt, ##args)
 #define APS_DBG(fmt, args...)    printk(KERN_INFO APS_TAG fmt, ##args)    
 
@@ -1391,7 +1391,7 @@ static long cm36283_unlocked_ioctl(struct file *file, unsigned int cmd, unsigned
 			/*------------------------------------------------------------------------------------------*/
 			
 			default:
-				APS_ERR("%s not supported = 0x%04x", __FUNCTION__, cmd);
+				APS_ERR("%s not supported = 0x%04x", __func__, cmd);
 				err = -ENOIOCTLCMD;
 				break;
 		}
diff --git a/drivers/misc/mediatek/alsps/cm36652-new/cm36652.c b/drivers/misc/mediatek/alsps/cm36652-new/cm36652.c
index d679b94d6..ae286ab03 100644
--- a/drivers/misc/mediatek/alsps/cm36652-new/cm36652.c
+++ b/drivers/misc/mediatek/alsps/cm36652-new/cm36652.c
@@ -57,8 +57,8 @@
 #define CM36652_DEV_NAME     "cm36652"
 /*----------------------------------------------------------------------------*/
 #define APS_TAG                  "[ALS/PS] "
-#define APS_FUN(f)               printk(KERN_INFO 	APS_TAG"%s\n", __FUNCTION__)
-#define APS_ERR(fmt, args...)    printk(KERN_ERR  	APS_TAG"%s %d : "fmt, __FUNCTION__, __LINE__, ##args)
+#define APS_FUN(f)               printk(KERN_INFO 	APS_TAG"%s\n", __func__)
+#define APS_ERR(fmt, args...)    printk(KERN_ERR  	APS_TAG"%s %d : "fmt, __func__, __LINE__, ##args)
 #define APS_LOG(fmt, args...)    printk(KERN_NOTICE	APS_TAG fmt, ##args)
 #define APS_DBG(fmt, args...)    printk(KERN_ERR 	APS_TAG fmt, ##args)    
 
@@ -1678,7 +1678,7 @@ static long cm36652_unlocked_ioctl(struct file *file, unsigned int cmd, unsigned
 			/*------------------------------------------------------------------------------------------*/
 			
 			default:
-				APS_ERR("%s not supported = 0x%04x", __FUNCTION__, cmd);
+				APS_ERR("%s not supported = 0x%04x", __func__, cmd);
 				err = -ENOIOCTLCMD;
 				break;
 		}
diff --git a/drivers/misc/mediatek/alsps/epl2182/epl2182.c b/drivers/misc/mediatek/alsps/epl2182/epl2182.c
index cd9595b81..5ca840381 100644
--- a/drivers/misc/mediatek/alsps/epl2182/epl2182.c
+++ b/drivers/misc/mediatek/alsps/epl2182/epl2182.c
@@ -93,8 +93,8 @@ typedef struct _epl_raw_data
 
 /*----------------------------------------------------------------------------*/
 #define APS_TAG                  "[ALS/PS] "
-#define APS_FUN(f)               printk(KERN_INFO APS_TAG"%s\n", __FUNCTION__)
-#define APS_ERR(fmt, args...)    printk(KERN_ERR  APS_TAG"%s %d : "fmt, __FUNCTION__, __LINE__, ##args)
+#define APS_FUN(f)               printk(KERN_INFO APS_TAG"%s\n", __func__)
+#define APS_ERR(fmt, args...)    printk(KERN_ERR  APS_TAG"%s %d : "fmt, __func__, __LINE__, ##args)
 #define APS_LOG(fmt, args...)    printk(KERN_DEBUG APS_TAG fmt, ##args)
 #define APS_DBG(fmt, args...)    printk(KERN_DEBUG fmt, ##args)
 #define FTM_CUST_ALSPS "/data/epl2182"
@@ -1275,7 +1275,7 @@ static long epl2182_unlocked_ioctl(struct file *file, unsigned int cmd, unsigned
 
 
         default:
-            APS_ERR("%s not supported = 0x%04x", __FUNCTION__, cmd);
+            APS_ERR("%s not supported = 0x%04x", __func__, cmd);
             err = -ENOIOCTLCMD;
             break;
     }
diff --git a/drivers/misc/mediatek/alsps/inc/aal_control.h b/drivers/misc/mediatek/alsps/inc/aal_control.h
index d0259cfb3..9a6a5f2fc 100644
--- a/drivers/misc/mediatek/alsps/inc/aal_control.h
+++ b/drivers/misc/mediatek/alsps/inc/aal_control.h
@@ -3,8 +3,8 @@
 
 #define AAL_TAG                  "[ALS/AAL]"
 #define AAL_LOG(fmt, args...)	 printk(KERN_ERR AAL_TAG fmt, ##args)
-#define AAL_FUN(f)               printk(KERN_INFO 	AAL_TAG"%s\n", __FUNCTION__)
-#define AAL_ERR(fmt, args...)    printk(KERN_ERR  	AAL_TAG"%s %d : "fmt, __FUNCTION__, __LINE__, ##args)
+#define AAL_FUN(f)               printk(KERN_INFO 	AAL_TAG"%s\n", __func__)
+#define AAL_ERR(fmt, args...)    printk(KERN_ERR  	AAL_TAG"%s %d : "fmt, __func__, __LINE__, ##args)
 #endif
 extern int aal_use;
 
diff --git a/drivers/misc/mediatek/alsps/rpr410/rpr410.c b/drivers/misc/mediatek/alsps/rpr410/rpr410.c
index bb370afef..36e5dab20 100644
--- a/drivers/misc/mediatek/alsps/rpr410/rpr410.c
+++ b/drivers/misc/mediatek/alsps/rpr410/rpr410.c
@@ -54,8 +54,8 @@
 #define RPR410_DEV_NAME     "RPR410"
 /*----------------------------------------------------------------------------*/
 #define APS_TAG                  "[ALS/PS] "
-#define APS_FUN(f)               printk(KERN_INFO APS_TAG"%s\n", __FUNCTION__)
-#define APS_ERR(fmt, args...)    printk(KERN_ERR  APS_TAG"%s %d : "fmt, __FUNCTION__, __LINE__, ##args)
+#define APS_FUN(f)               printk(KERN_INFO APS_TAG"%s\n", __func__)
+#define APS_ERR(fmt, args...)    printk(KERN_ERR  APS_TAG"%s %d : "fmt, __func__, __LINE__, ##args)
 #define APS_LOG(fmt, args...)    printk(KERN_INFO APS_TAG fmt, ##args)
 #define APS_DBG(fmt, args...)    printk(KERN_ERR APS_TAG fmt, ##args)                 
 /******************************************************************************
@@ -1622,7 +1622,7 @@ static long rpr410_unlocked_ioctl(struct file *file, unsigned int cmd,
 			break;
 
 		default:
-			APS_ERR("%s not supported = 0x%04x\n", __FUNCTION__, cmd);
+			APS_ERR("%s not supported = 0x%04x\n", __func__, cmd);
 			err = -ENOIOCTLCMD;
 			break;
 	}
diff --git a/drivers/misc/mediatek/alsps/stk3x1x-new/stk3x1x.c b/drivers/misc/mediatek/alsps/stk3x1x-new/stk3x1x.c
index 160a6e4ad..6658dba2b 100644
--- a/drivers/misc/mediatek/alsps/stk3x1x-new/stk3x1x.c
+++ b/drivers/misc/mediatek/alsps/stk3x1x-new/stk3x1x.c
@@ -73,8 +73,8 @@
 #define stk3x1x_DEV_NAME     "stk3x1x"
 /*----------------------------------------------------------------------------*/
 #define APS_TAG                  "[ALS/PS] "
-#define APS_FUN(f)               printk(APS_TAG"%s\n", __FUNCTION__)
-#define APS_ERR(fmt, args...)    printk(APS_TAG"%s %d : "fmt, __FUNCTION__, __LINE__, ##args)
+#define APS_FUN(f)               printk(APS_TAG"%s\n", __func__)
+#define APS_ERR(fmt, args...)    printk(APS_TAG"%s %d : "fmt, __func__, __LINE__, ##args)
 #define APS_LOG(fmt, args...)    printk(APS_TAG fmt, ##args)
 #define APS_DBG(fmt, args...)    printk(fmt, ##args)                 
 /******************************************************************************
@@ -1078,7 +1078,7 @@ static int stk3x1x_enable_ps(struct i2c_client *client, int enable)
 		}		
 	}
 
-	APS_LOG("%s: enable=%d\n", __FUNCTION__, enable);	
+	APS_LOG("%s: enable=%d\n", __func__, enable);	
 	cur &= (~(0x45)); 
 	if(enable)
 	{
@@ -1137,7 +1137,7 @@ static int stk3x1x_enable_ps(struct i2c_client *client, int enable)
 				sensor_data.values[0] = err;
 				sensor_data.value_divide = 1;
 				sensor_data.status = SENSOR_STATUS_ACCURACY_MEDIUM;
-				APS_LOG("%s:ps raw 0x%x -> value 0x%x \n",__FUNCTION__, obj->ps,sensor_data.values[0]);
+				APS_LOG("%s:ps raw 0x%x -> value 0x%x \n",__func__, obj->ps,sensor_data.values[0]);
 				if(ps_report_interrupt_data(sensor_data.values[0]))
 				{	
 					APS_ERR("call ps_report_interrupt_data fail\n");
@@ -1283,7 +1283,7 @@ static void stk3x1x_eint_work(struct work_struct *work)
 		sensor_data.values[0] = stk3x1x_get_als_value(obj, obj->als);
 		sensor_data.value_divide = 1;
 		sensor_data.status = SENSOR_STATUS_ACCURACY_MEDIUM;
-		APS_LOG("%s:als raw 0x%x -> value 0x%x \n", __FUNCTION__, obj->als,sensor_data.values[0]);
+		APS_LOG("%s:als raw 0x%x -> value 0x%x \n", __func__, obj->als,sensor_data.values[0]);
 		//let up layer to know
 		if(ps_report_interrupt_data(sensor_data.values[0]))
 		{
@@ -1304,7 +1304,7 @@ static void stk3x1x_eint_work(struct work_struct *work)
 		sensor_data.values[0] = (flag_reg & STK_FLG_NF_MASK)? 1 : 0;
 		sensor_data.value_divide = 1;
 		sensor_data.status = SENSOR_STATUS_ACCURACY_MEDIUM;
-		APS_LOG("%s:ps raw 0x%x -> value 0x%x \n",__FUNCTION__, obj->ps,sensor_data.values[0]);
+		APS_LOG("%s:ps raw 0x%x -> value 0x%x \n",__func__, obj->ps,sensor_data.values[0]);
 		//let up layer to know
 		if(ps_report_interrupt_data(sensor_data.values[0]))
 		{	
@@ -2367,7 +2367,7 @@ static int stk3x1x_ioctl(struct inode *inode, struct file *file, unsigned int cm
 				goto err_out;
 			}
 #ifdef STK_PS_POLLING_LOG	
-			APS_LOG("%s:ps raw 0x%x -> value 0x%x \n",__FUNCTION__, obj->ps, dat);			
+			APS_LOG("%s:ps raw 0x%x -> value 0x%x \n",__func__, obj->ps, dat);			
 #endif			
 			if(copy_to_user(ptr, &dat, sizeof(dat)))
 			{
@@ -2556,7 +2556,7 @@ static int stk3x1x_ioctl(struct inode *inode, struct file *file, unsigned int cm
 			/*------------------------------------------------------------------------------------------*/
 		
 		default:
-			APS_ERR("%s not supported = 0x%04x", __FUNCTION__, cmd);
+			APS_ERR("%s not supported = 0x%04x", __func__, cmd);
 			err = -ENOIOCTLCMD;
 			break;
 	}
@@ -2782,7 +2782,7 @@ int stk3x1x_ps_operate(void* self, uint32_t command, void* buff_in, int size_in,
 						sensor_data->value_divide = 1;
 						sensor_data->status = SENSOR_STATUS_ACCURACY_MEDIUM;
 #ifdef STK_PS_POLLING_LOG						
-						APS_LOG("%s:ps raw 0x%x -> value 0x%x \n",__FUNCTION__, obj->ps, sensor_data->values[0]);					
+						APS_LOG("%s:ps raw 0x%x -> value 0x%x \n",__func__, obj->ps, sensor_data->values[0]);					
 #endif				
 					}	
 				}				
@@ -3097,7 +3097,7 @@ static int stk3x1x_i2c_probe(struct i2c_client *client, const struct i2c_device_
 	struct ps_control_path ps_ctl={0};
 	struct ps_data_path ps_data={0};
 
-	APS_LOG("%s: driver version: %s\n", __FUNCTION__, DRIVER_VERSION);
+	APS_LOG("%s: driver version: %s\n", __func__, DRIVER_VERSION);
 	if(!(obj = kzalloc(sizeof(*obj), GFP_KERNEL)))
 	{
 		err = -ENOMEM;
@@ -3138,18 +3138,18 @@ static int stk3x1x_i2c_probe(struct i2c_client *client, const struct i2c_device_
 	
 	if(obj->hw->polling_mode_ps == 0)
 	{
-		APS_LOG("%s: enable PS interrupt\n", __FUNCTION__);
+		APS_LOG("%s: enable PS interrupt\n", __func__);
 	}
 	obj->int_val |= STK_INT_PS_MODE1;
 	
 	if(obj->hw->polling_mode_als == 0)
 	{
 	  obj->int_val |= STK_INT_ALS;		
-	  APS_LOG("%s: enable ALS interrupt\n", __FUNCTION__);
+	  APS_LOG("%s: enable ALS interrupt\n", __func__);
 	}	
 
 	APS_LOG("%s: state_val=0x%x, psctrl_val=0x%x, alsctrl_val=0x%x, ledctrl_val=0x%x, wait_val=0x%x, int_val=0x%x\n", 
-		__FUNCTION__, atomic_read(&obj->state_val), atomic_read(&obj->psctrl_val), atomic_read(&obj->alsctrl_val), 
+		__func__, atomic_read(&obj->state_val), atomic_read(&obj->psctrl_val), atomic_read(&obj->alsctrl_val), 
 		obj->ledctrl_val, obj->wait_val, obj->int_val);
 	
 	APS_LOG("stk3x1x_i2c_probe() OK!\n");
@@ -3269,7 +3269,7 @@ static int stk3x1x_i2c_probe(struct i2c_client *client, const struct i2c_device_
 #endif
 
     stk3x1x_init_flag = 0;
-	APS_LOG("%s: OK\n", __FUNCTION__);
+	APS_LOG("%s: OK\n", __func__);
 	return 0;
 	
     exit_sensor_obj_attach_fail:
@@ -3282,7 +3282,7 @@ static int stk3x1x_i2c_probe(struct i2c_client *client, const struct i2c_device_
 	exit:
 	stk3x1x_i2c_client = NULL;
 	stk3x1x_init_flag = -1;
-	APS_ERR("%s: err = %d\n", __FUNCTION__, err);
+	APS_ERR("%s: err = %d\n", __func__, err);
 	return err;
 }
 
diff --git a/drivers/misc/mediatek/alsps/stk3x1x/stk3x1x.c b/drivers/misc/mediatek/alsps/stk3x1x/stk3x1x.c
index fd7b7cecd..a9923b327 100644
--- a/drivers/misc/mediatek/alsps/stk3x1x/stk3x1x.c
+++ b/drivers/misc/mediatek/alsps/stk3x1x/stk3x1x.c
@@ -65,8 +65,8 @@
 #define stk3x1x_DEV_NAME     "stk3x1x"
 /*----------------------------------------------------------------------------*/
 #define APS_TAG                  "[ALS/PS] "
-#define APS_FUN(f)               printk(APS_TAG"%s\n", __FUNCTION__)
-#define APS_ERR(fmt, args...)    printk(APS_TAG"%s %d : "fmt, __FUNCTION__, __LINE__, ##args)
+#define APS_FUN(f)               printk(APS_TAG"%s\n", __func__)
+#define APS_ERR(fmt, args...)    printk(APS_TAG"%s %d : "fmt, __func__, __LINE__, ##args)
 #define APS_LOG(fmt, args...)    printk(APS_TAG fmt, ##args)
 #define APS_DBG(fmt, args...)    printk(fmt, ##args)                 
 /******************************************************************************
@@ -1015,7 +1015,7 @@ static int stk3x1x_enable_ps(struct i2c_client *client, int enable)
 		}		
 	}
 
-	APS_LOG("%s: enable=%d\n", __FUNCTION__, enable);	
+	APS_LOG("%s: enable=%d\n", __func__, enable);	
 	cur &= (~(0x45)); 
 	if(enable)
 	{
@@ -1074,7 +1074,7 @@ static int stk3x1x_enable_ps(struct i2c_client *client, int enable)
 				sensor_data.values[0] = err;
 				sensor_data.value_divide = 1;
 				sensor_data.status = SENSOR_STATUS_ACCURACY_MEDIUM;
-				APS_LOG("%s:ps raw 0x%x -> value 0x%x \n",__FUNCTION__, obj->ps,sensor_data.values[0]);
+				APS_LOG("%s:ps raw 0x%x -> value 0x%x \n",__func__, obj->ps,sensor_data.values[0]);
 				if((err = hwmsen_get_interrupt_data(ID_PROXIMITY, &sensor_data)))
 				{	
 					APS_ERR("call hwmsen_get_interrupt_data fail = %d\n", err);
@@ -1220,7 +1220,7 @@ static void stk3x1x_eint_work(struct work_struct *work)
 		sensor_data.values[0] = stk3x1x_get_als_value(obj, obj->als);
 		sensor_data.value_divide = 1;
 		sensor_data.status = SENSOR_STATUS_ACCURACY_MEDIUM;
-		APS_LOG("%s:als raw 0x%x -> value 0x%x \n", __FUNCTION__, obj->als,sensor_data.values[0]);
+		APS_LOG("%s:als raw 0x%x -> value 0x%x \n", __func__, obj->als,sensor_data.values[0]);
 		//let up layer to know
 		if((err = hwmsen_get_interrupt_data(ID_LIGHT, &sensor_data)))
 		{
@@ -1241,7 +1241,7 @@ static void stk3x1x_eint_work(struct work_struct *work)
 		sensor_data.values[0] = (flag_reg & STK_FLG_NF_MASK)? 1 : 0;
 		sensor_data.value_divide = 1;
 		sensor_data.status = SENSOR_STATUS_ACCURACY_MEDIUM;
-		APS_LOG("%s:ps raw 0x%x -> value 0x%x \n",__FUNCTION__, obj->ps,sensor_data.values[0]);
+		APS_LOG("%s:ps raw 0x%x -> value 0x%x \n",__func__, obj->ps,sensor_data.values[0]);
 		//let up layer to know
 		if((err = hwmsen_get_interrupt_data(ID_PROXIMITY, &sensor_data)))
 		{	
@@ -2304,7 +2304,7 @@ static int stk3x1x_ioctl(struct inode *inode, struct file *file, unsigned int cm
 				goto err_out;
 			}
 #ifdef STK_PS_POLLING_LOG	
-			APS_LOG("%s:ps raw 0x%x -> value 0x%x \n",__FUNCTION__, obj->ps, dat);			
+			APS_LOG("%s:ps raw 0x%x -> value 0x%x \n",__func__, obj->ps, dat);			
 #endif			
 			if(copy_to_user(ptr, &dat, sizeof(dat)))
 			{
@@ -2493,7 +2493,7 @@ static int stk3x1x_ioctl(struct inode *inode, struct file *file, unsigned int cm
 			/*------------------------------------------------------------------------------------------*/
 		
 		default:
-			APS_ERR("%s not supported = 0x%04x", __FUNCTION__, cmd);
+			APS_ERR("%s not supported = 0x%04x", __func__, cmd);
 			err = -ENOIOCTLCMD;
 			break;
 	}
@@ -2719,7 +2719,7 @@ int stk3x1x_ps_operate(void* self, uint32_t command, void* buff_in, int size_in,
 						sensor_data->value_divide = 1;
 						sensor_data->status = SENSOR_STATUS_ACCURACY_MEDIUM;
 #ifdef STK_PS_POLLING_LOG						
-						APS_LOG("%s:ps raw 0x%x -> value 0x%x \n",__FUNCTION__, obj->ps, sensor_data->values[0]);					
+						APS_LOG("%s:ps raw 0x%x -> value 0x%x \n",__func__, obj->ps, sensor_data->values[0]);					
 #endif				
 					}	
 				}				
@@ -2841,7 +2841,7 @@ static int stk3x1x_i2c_probe(struct i2c_client *client, const struct i2c_device_
 	struct hwmsen_object obj_ps, obj_als;
 	int err = 0;
 
-	APS_LOG("%s: driver version: %s\n", __FUNCTION__, DRIVER_VERSION);
+	APS_LOG("%s: driver version: %s\n", __func__, DRIVER_VERSION);
 
 	if(!(obj = kzalloc(sizeof(*obj), GFP_KERNEL)))
 	{
@@ -2883,18 +2883,18 @@ static int stk3x1x_i2c_probe(struct i2c_client *client, const struct i2c_device_
 	
 	if(obj->hw->polling_mode_ps == 0)
 	{
-		APS_LOG("%s: enable PS interrupt\n", __FUNCTION__);
+		APS_LOG("%s: enable PS interrupt\n", __func__);
 	}
 	obj->int_val |= STK_INT_PS_MODE1;
 	
 	if(obj->hw->polling_mode_als == 0)
 	{
 	  obj->int_val |= STK_INT_ALS;		
-	  APS_LOG("%s: enable ALS interrupt\n", __FUNCTION__);
+	  APS_LOG("%s: enable ALS interrupt\n", __func__);
 	}	
 
 	APS_LOG("%s: state_val=0x%x, psctrl_val=0x%x, alsctrl_val=0x%x, ledctrl_val=0x%x, wait_val=0x%x, int_val=0x%x\n", 
-		__FUNCTION__, atomic_read(&obj->state_val), atomic_read(&obj->psctrl_val), atomic_read(&obj->alsctrl_val), 
+		__func__, atomic_read(&obj->state_val), atomic_read(&obj->psctrl_val), atomic_read(&obj->alsctrl_val), 
 		obj->ledctrl_val, obj->wait_val, obj->int_val);
 	
 	APS_LOG("stk3x1x_i2c_probe() OK!\n");
@@ -2977,7 +2977,7 @@ static int stk3x1x_i2c_probe(struct i2c_client *client, const struct i2c_device_
 	register_early_suspend(&obj->early_drv);
 #endif
 
-	APS_LOG("%s: OK\n", __FUNCTION__);
+	APS_LOG("%s: OK\n", __func__);
 
 	return 0;
 
@@ -2990,7 +2990,7 @@ static int stk3x1x_i2c_probe(struct i2c_client *client, const struct i2c_device_
 	kfree(obj);
 	exit:
 	stk3x1x_i2c_client = NULL;           
-	APS_ERR("%s: err = %d\n", __FUNCTION__, err);
+	APS_ERR("%s: err = %d\n", __func__, err);
 	return err;
 }
 /*----------------------------------------------------------------------------*/
diff --git a/drivers/misc/mediatek/alsps/tmd2771/tmd2771.c b/drivers/misc/mediatek/alsps/tmd2771/tmd2771.c
index 20d655aef..b4b3a7d89 100644
--- a/drivers/misc/mediatek/alsps/tmd2771/tmd2771.c
+++ b/drivers/misc/mediatek/alsps/tmd2771/tmd2771.c
@@ -50,8 +50,8 @@
 #define TMD2771_DEV_NAME     "TMD2771"
 /*----------------------------------------------------------------------------*/
 #define APS_TAG                  "[ALS/PS] "
-#define APS_FUN(f)               printk(KERN_INFO APS_TAG"%s\n", __FUNCTION__)
-#define APS_ERR(fmt, args...)    printk(KERN_ERR  APS_TAG"%s %d : "fmt, __FUNCTION__, __LINE__, ##args)
+#define APS_FUN(f)               printk(KERN_INFO APS_TAG"%s\n", __func__)
+#define APS_ERR(fmt, args...)    printk(KERN_ERR  APS_TAG"%s %d : "fmt, __func__, __LINE__, ##args)
 #define APS_LOG(fmt, args...)    printk(KERN_ERR APS_TAG fmt, ##args)
 #define APS_DBG(fmt, args...)    printk(KERN_INFO APS_TAG fmt, ##args) 
 
@@ -1436,7 +1436,7 @@ static long TMD2771_unlocked_ioctl(struct file *file, unsigned int cmd,
 				break;
 			/*------------------------------------------------------------------------------------------*/
 		default:
-			APS_ERR("%s not supported = 0x%04x", __FUNCTION__, cmd);
+			APS_ERR("%s not supported = 0x%04x", __func__, cmd);
 			err = -ENOIOCTLCMD;
 			break;
 	}
diff --git a/drivers/misc/mediatek/alsps/tmd2771_auto/tmd2771.c b/drivers/misc/mediatek/alsps/tmd2771_auto/tmd2771.c
index 97e6e369c..9f786b457 100644
--- a/drivers/misc/mediatek/alsps/tmd2771_auto/tmd2771.c
+++ b/drivers/misc/mediatek/alsps/tmd2771_auto/tmd2771.c
@@ -50,8 +50,8 @@
 #define TMD2771_DEV_NAME     "TMD2771"
 /*----------------------------------------------------------------------------*/
 #define APS_TAG                  "[ALS/PS] "
-#define APS_FUN(f)               printk(KERN_ERR APS_TAG"%s\n", __FUNCTION__)
-#define APS_ERR(fmt, args...)    printk(KERN_ERR  APS_TAG"%s %d : "fmt, __FUNCTION__, __LINE__, ##args)
+#define APS_FUN(f)               printk(KERN_ERR APS_TAG"%s\n", __func__)
+#define APS_ERR(fmt, args...)    printk(KERN_ERR  APS_TAG"%s %d : "fmt, __func__, __LINE__, ##args)
 #define APS_LOG(fmt, args...)    printk(KERN_ERR APS_TAG fmt, ##args)
 #define APS_DBG(fmt, args...)    printk(KERN_ERR APS_TAG fmt, ##args) 
 
@@ -1460,7 +1460,7 @@ static long TMD2771_unlocked_ioctl(struct file *file, unsigned int cmd,
 				break;
 			/*------------------------------------------------------------------------------------------*/
 		default:
-			APS_ERR("%s not supported = 0x%04x", __FUNCTION__, cmd);
+			APS_ERR("%s not supported = 0x%04x", __func__, cmd);
 			err = -ENOIOCTLCMD;
 			break;
 	}