diff options
| author | Moyster <oysterized@gmail.com> | 2017-09-23 03:10:48 +0200 |
|---|---|---|
| committer | Moyster <oysterized@gmail.com> | 2017-09-23 03:10:48 +0200 |
| commit | b8d1e07edc8d57883bf4b6ca70228b5a9e6b98b2 (patch) | |
| tree | b9c284cc99fc24d884b4dedc7100e5881a35011f /drivers/misc/mediatek/accelerometer | |
| parent | fa4d1db09a4946ad8ba42514687c6b8a3603d623 (diff) | |
misc: replace __FUNCTION__ by __function__
result of :
git grep -l '__FUNCTION__' | xargs sed -i 's/__FUNCTION__/__func__/g'
Diffstat (limited to 'drivers/misc/mediatek/accelerometer')
21 files changed, 128 insertions, 128 deletions
diff --git a/drivers/misc/mediatek/accelerometer/KXTJ2_1009-new/kxtj2_1009.c b/drivers/misc/mediatek/accelerometer/KXTJ2_1009-new/kxtj2_1009.c index c9284f786..2700aac05 100644 --- a/drivers/misc/mediatek/accelerometer/KXTJ2_1009-new/kxtj2_1009.c +++ b/drivers/misc/mediatek/accelerometer/KXTJ2_1009-new/kxtj2_1009.c @@ -183,8 +183,8 @@ static struct acc_init_info kxtj2_1009_init_info = { /*----------------------------------------------------------------------------*/ #define GSE_TAG "[Gsensor] " -#define GSE_FUN(f) printk( GSE_TAG"%s\n", __FUNCTION__) -#define GSE_ERR(fmt, args...) printk(KERN_ERR GSE_TAG"%s %d : "fmt, __FUNCTION__, __LINE__, ##args) +#define GSE_FUN(f) printk( GSE_TAG"%s\n", __func__) +#define GSE_ERR(fmt, args...) printk(KERN_ERR GSE_TAG"%s %d : "fmt, __func__, __LINE__, ##args) #define GSE_LOG(fmt, args...) printk( GSE_TAG fmt, ##args) /*----------------------------------------------------------------------------*/ static struct data_resolution kxtj2_1009_data_resolution[1] = { diff --git a/drivers/misc/mediatek/accelerometer/KXTJ2_1009/kxtj2_1009.c b/drivers/misc/mediatek/accelerometer/KXTJ2_1009/kxtj2_1009.c index 7b01d0ed4..30a4549b7 100644 --- a/drivers/misc/mediatek/accelerometer/KXTJ2_1009/kxtj2_1009.c +++ b/drivers/misc/mediatek/accelerometer/KXTJ2_1009/kxtj2_1009.c @@ -157,8 +157,8 @@ static bool enable_status = false; /*----------------------------------------------------------------------------*/ #define GSE_TAG "[Gsensor] " -#define GSE_FUN(f) printk( GSE_TAG"%s\n", __FUNCTION__) -#define GSE_ERR(fmt, args...) printk(KERN_ERR GSE_TAG"%s %d : "fmt, __FUNCTION__, __LINE__, ##args) +#define GSE_FUN(f) printk( GSE_TAG"%s\n", __func__) +#define GSE_ERR(fmt, args...) printk(KERN_ERR GSE_TAG"%s %d : "fmt, __func__, __LINE__, ##args) #define GSE_LOG(fmt, args...) printk( GSE_TAG fmt, ##args) /*----------------------------------------------------------------------------*/ static struct data_resolution kxtj2_1009_data_resolution[1] = { diff --git a/drivers/misc/mediatek/accelerometer/bma050-new/bma050.c b/drivers/misc/mediatek/accelerometer/bma050-new/bma050.c index 99f45048c..71ef070d4 100644 --- a/drivers/misc/mediatek/accelerometer/bma050-new/bma050.c +++ b/drivers/misc/mediatek/accelerometer/bma050-new/bma050.c @@ -231,8 +231,8 @@ static GSENSOR_VECTOR3D gsensor_gain; /*----------------------------------------------------------------------------*/ #define GSE_TAG "[Gsensor] " -#define GSE_FUN(f) printk(KERN_ERR GSE_TAG"%s\n", __FUNCTION__) -#define GSE_ERR(fmt, args...) printk(KERN_ERR GSE_TAG"%s %d : "fmt, __FUNCTION__, __LINE__, ##args) +#define GSE_FUN(f) printk(KERN_ERR GSE_TAG"%s\n", __func__) +#define GSE_ERR(fmt, args...) printk(KERN_ERR GSE_TAG"%s %d : "fmt, __func__, __LINE__, ##args) #define GSE_LOG(fmt, args...) printk(KERN_ERR GSE_TAG fmt, ##args) /*----------------------------------------------------------------------------*/ static struct data_resolution bma250_data_resolution[1] = { diff --git a/drivers/misc/mediatek/accelerometer/bma050/bma050.c b/drivers/misc/mediatek/accelerometer/bma050/bma050.c index 6c9c2f1c1..540348eac 100644 --- a/drivers/misc/mediatek/accelerometer/bma050/bma050.c +++ b/drivers/misc/mediatek/accelerometer/bma050/bma050.c @@ -218,8 +218,8 @@ static GSENSOR_VECTOR3D gsensor_gain; /*----------------------------------------------------------------------------*/ #define GSE_TAG "[Gsensor] " -#define GSE_FUN(f) printk(KERN_INFO GSE_TAG"%s\n", __FUNCTION__) -#define GSE_ERR(fmt, args...) printk(KERN_ERR GSE_TAG"%s %d : "fmt, __FUNCTION__, __LINE__, ##args) +#define GSE_FUN(f) printk(KERN_INFO GSE_TAG"%s\n", __func__) +#define GSE_ERR(fmt, args...) printk(KERN_ERR GSE_TAG"%s %d : "fmt, __func__, __LINE__, ##args) #define GSE_LOG(fmt, args...) printk(KERN_INFO GSE_TAG fmt, ##args) /*----------------------------------------------------------------------------*/ static struct data_resolution bma250_data_resolution[1] = { diff --git a/drivers/misc/mediatek/accelerometer/bma056/bma056.c b/drivers/misc/mediatek/accelerometer/bma056/bma056.c index d8cbaa4c7..37a98c27c 100644 --- a/drivers/misc/mediatek/accelerometer/bma056/bma056.c +++ b/drivers/misc/mediatek/accelerometer/bma056/bma056.c @@ -213,8 +213,8 @@ static GSENSOR_VECTOR3D gsensor_gain; /*----------------------------------------------------------------------------*/ #define GSE_TAG "[Gsensor] " -#define GSE_FUN(f) printk(KERN_ERR"%s\n", __FUNCTION__) -#define GSE_ERR(fmt, args...) printk(KERN_ERR GSE_TAG"%s %d : "fmt, __FUNCTION__, __LINE__, ##args) +#define GSE_FUN(f) printk(KERN_ERR"%s\n", __func__) +#define GSE_ERR(fmt, args...) printk(KERN_ERR GSE_TAG"%s %d : "fmt, __func__, __LINE__, ##args) #define GSE_LOG(fmt, args...) printk(KERN_ERR GSE_TAG fmt, ##args) /*----------------------------------------------------------------------------*/ static struct data_resolution bma255_data_resolution[1] = { diff --git a/drivers/misc/mediatek/accelerometer/bma222E-new/bma222E.c b/drivers/misc/mediatek/accelerometer/bma222E-new/bma222E.c index 216ef86bd..1bca4da1f 100644 --- a/drivers/misc/mediatek/accelerometer/bma222E-new/bma222E.c +++ b/drivers/misc/mediatek/accelerometer/bma222E-new/bma222E.c @@ -185,8 +185,8 @@ static struct acc_init_info bma222_init_info = { /*----------------------------------------------------------------------------*/ #ifdef GSE_DUBUG #define GSE_TAG "[Gsensor] " -#define GSE_FUN(f) printk(GSE_TAG"%s\n", __FUNCTION__) -#define GSE_ERR(fmt, args...) printk(GSE_TAG"%s %d : "fmt, __FUNCTION__, __LINE__, ##args) +#define GSE_FUN(f) printk(GSE_TAG"%s\n", __func__) +#define GSE_ERR(fmt, args...) printk(GSE_TAG"%s %d : "fmt, __func__, __LINE__, ##args) #define GSE_LOG(fmt, args...) printk(GSE_TAG fmt, ##args) #else #define GSE_TAG @@ -1353,7 +1353,7 @@ static ssize_t show_chip_orientation(struct device_driver *ddri, char *pbBuf) ssize_t _tLength = 0; struct acc_hw *_ptAccelHw = get_cust_acc_hw(); - GSE_LOG("[%s] default direction: %d\n", __FUNCTION__, _ptAccelHw->direction); + GSE_LOG("[%s] default direction: %d\n", __func__, _ptAccelHw->direction); _tLength = snprintf(pbBuf, PAGE_SIZE, "default direction = %d\n", _ptAccelHw->direction); @@ -1375,7 +1375,7 @@ static ssize_t store_chip_orientation(struct device_driver *ddri, const char *pb GSE_ERR("ERR: fail to set direction\n"); } - GSE_LOG("[%s] set direction: %d\n", __FUNCTION__, _nDirection); + GSE_LOG("[%s] set direction: %d\n", __func__, _nDirection); return (tCount); } diff --git a/drivers/misc/mediatek/accelerometer/bma222E/bma222E.c b/drivers/misc/mediatek/accelerometer/bma222E/bma222E.c index e0be0c2a1..1e9edcb90 100644 --- a/drivers/misc/mediatek/accelerometer/bma222E/bma222E.c +++ b/drivers/misc/mediatek/accelerometer/bma222E/bma222E.c @@ -160,8 +160,8 @@ static bool enable_status = false; /*----------------------------------------------------------------------------*/ #define GSE_TAG "[Gsensor] " -#define GSE_FUN(f) printk(KERN_INFO GSE_TAG"%s\n", __FUNCTION__) -#define GSE_ERR(fmt, args...) printk(KERN_ERR GSE_TAG"%s %d : "fmt, __FUNCTION__, __LINE__, ##args) +#define GSE_FUN(f) printk(KERN_INFO GSE_TAG"%s\n", __func__) +#define GSE_ERR(fmt, args...) printk(KERN_ERR GSE_TAG"%s %d : "fmt, __func__, __LINE__, ##args) #define GSE_LOG(fmt, args...) printk(KERN_INFO GSE_TAG fmt, ##args) /*----------------------------------------------------------------------------*/ static struct data_resolution bma222_data_resolution[1] = { diff --git a/drivers/misc/mediatek/accelerometer/bma250/bma250.c b/drivers/misc/mediatek/accelerometer/bma250/bma250.c index 4391ae50c..ebe3c7b0d 100644 --- a/drivers/misc/mediatek/accelerometer/bma250/bma250.c +++ b/drivers/misc/mediatek/accelerometer/bma250/bma250.c @@ -156,8 +156,8 @@ static GSENSOR_VECTOR3D gsensor_gain; /*----------------------------------------------------------------------------*/ #define GSE_TAG "[Gsensor] " -#define GSE_FUN(f) printk(KERN_INFO GSE_TAG"%s\n", __FUNCTION__) -#define GSE_ERR(fmt, args...) printk(KERN_ERR GSE_TAG"%s %d : "fmt, __FUNCTION__, __LINE__, ##args) +#define GSE_FUN(f) printk(KERN_INFO GSE_TAG"%s\n", __func__) +#define GSE_ERR(fmt, args...) printk(KERN_ERR GSE_TAG"%s %d : "fmt, __func__, __LINE__, ##args) #define GSE_LOG(fmt, args...) printk(KERN_INFO GSE_TAG fmt, ##args) /*----------------------------------------------------------------------------*/ static struct data_resolution bma250_data_resolution[1] = { diff --git a/drivers/misc/mediatek/accelerometer/bma250e/bma250.c b/drivers/misc/mediatek/accelerometer/bma250e/bma250.c index ae9dbde9f..959cfd3f6 100644 --- a/drivers/misc/mediatek/accelerometer/bma250e/bma250.c +++ b/drivers/misc/mediatek/accelerometer/bma250e/bma250.c @@ -192,8 +192,8 @@ static GSENSOR_VECTOR3D gsensor_gain; /*----------------------------------------------------------------------------*/ #define GSE_TAG "[Gsensor] " -#define GSE_FUN(f) printk(KERN_INFO GSE_TAG"%s\n", __FUNCTION__) -#define GSE_ERR(fmt, args...) printk(KERN_ERR GSE_TAG"%s %d : "fmt, __FUNCTION__, __LINE__, ##args) +#define GSE_FUN(f) printk(KERN_INFO GSE_TAG"%s\n", __func__) +#define GSE_ERR(fmt, args...) printk(KERN_ERR GSE_TAG"%s %d : "fmt, __func__, __LINE__, ##args) #define GSE_LOG(fmt, args...) printk(KERN_INFO GSE_TAG fmt, ##args) /*----------------------------------------------------------------------------*/ static struct data_resolution bma250_data_resolution[1] = { diff --git a/drivers/misc/mediatek/accelerometer/bma255-sdo0/bma255.c b/drivers/misc/mediatek/accelerometer/bma255-sdo0/bma255.c index 2991cd614..7a219e875 100644 --- a/drivers/misc/mediatek/accelerometer/bma255-sdo0/bma255.c +++ b/drivers/misc/mediatek/accelerometer/bma255-sdo0/bma255.c @@ -305,8 +305,8 @@ static int data_count = 0; /*----------------------------------------------------------------------------*/ #define GSE_TAG "[Gsensor] " -#define GSE_FUN(f) printk(KERN_ERR GSE_TAG"%s\n", __FUNCTION__) -#define GSE_ERR(fmt, args...) printk(KERN_ERR GSE_TAG"%s %d : "fmt, __FUNCTION__, __LINE__, ##args) +#define GSE_FUN(f) printk(KERN_ERR GSE_TAG"%s\n", __func__) +#define GSE_ERR(fmt, args...) printk(KERN_ERR GSE_TAG"%s %d : "fmt, __func__, __LINE__, ##args) #define GSE_LOG(fmt, args...) printk(KERN_ERR GSE_TAG fmt, ##args) /*----------------------------------------------------------------------------*/ static struct data_resolution bma255_data_resolution[1] = { diff --git a/drivers/misc/mediatek/accelerometer/bma255-sdo1/bma255.c b/drivers/misc/mediatek/accelerometer/bma255-sdo1/bma255.c index fbcb7e93a..2a8d51253 100644 --- a/drivers/misc/mediatek/accelerometer/bma255-sdo1/bma255.c +++ b/drivers/misc/mediatek/accelerometer/bma255-sdo1/bma255.c @@ -305,8 +305,8 @@ static int data_count = 0; /*----------------------------------------------------------------------------*/ #define GSE_TAG "[Gsensor] " -#define GSE_FUN(f) printk(KERN_ERR GSE_TAG"%s\n", __FUNCTION__) -#define GSE_ERR(fmt, args...) printk(KERN_ERR GSE_TAG"%s %d : "fmt, __FUNCTION__, __LINE__, ##args) +#define GSE_FUN(f) printk(KERN_ERR GSE_TAG"%s\n", __func__) +#define GSE_ERR(fmt, args...) printk(KERN_ERR GSE_TAG"%s %d : "fmt, __func__, __LINE__, ##args) #define GSE_LOG(fmt, args...) printk(KERN_ERR GSE_TAG fmt, ##args) /*----------------------------------------------------------------------------*/ static struct data_resolution bma255_data_resolution[1] = { diff --git a/drivers/misc/mediatek/accelerometer/k2dh/k2dh.c b/drivers/misc/mediatek/accelerometer/k2dh/k2dh.c index f732e0839..3e6fe6784 100644 --- a/drivers/misc/mediatek/accelerometer/k2dh/k2dh.c +++ b/drivers/misc/mediatek/accelerometer/k2dh/k2dh.c @@ -302,8 +302,8 @@ static GSENSOR_VECTOR3D gsensor_gain; /*----------------------------------------------------------------------------*/ #define GSE_TAG "[Gsensor] " -#define GSE_FUN(f) printk(KERN_ERR GSE_TAG"%s()\n", __FUNCTION__) -#define GSE_ERR(fmt, args...) printk(KERN_ERR GSE_TAG"[ERROR] %s() line=%d : "fmt, __FUNCTION__, __LINE__, ##args) +#define GSE_FUN(f) printk(KERN_ERR GSE_TAG"%s()\n", __func__) +#define GSE_ERR(fmt, args...) printk(KERN_ERR GSE_TAG"[ERROR] %s() line=%d : "fmt, __func__, __LINE__, ##args) #define GSE_LOG(fmt, args...) printk(KERN_ERR GSE_TAG fmt, ##args) /*----------------------------------------------------------------------------*/ static struct data_resolution K2DH_data_resolution[1] = { diff --git a/drivers/misc/mediatek/accelerometer/kxtik1004/kxtik1004.c b/drivers/misc/mediatek/accelerometer/kxtik1004/kxtik1004.c index f2cf76763..a43c15f3d 100644 --- a/drivers/misc/mediatek/accelerometer/kxtik1004/kxtik1004.c +++ b/drivers/misc/mediatek/accelerometer/kxtik1004/kxtik1004.c @@ -160,8 +160,8 @@ static bool enable_status = false; /*----------------------------------------------------------------------------*/ #define GSE_TAG "[Gsensor] " -#define GSE_FUN(f) printk(KERN_INFO GSE_TAG"%s\n", __FUNCTION__) -#define GSE_ERR(fmt, args...) printk(KERN_ERR GSE_TAG"%s %d : "fmt, __FUNCTION__, __LINE__, ##args) +#define GSE_FUN(f) printk(KERN_INFO GSE_TAG"%s\n", __func__) +#define GSE_ERR(fmt, args...) printk(KERN_ERR GSE_TAG"%s %d : "fmt, __func__, __LINE__, ##args) #define GSE_LOG(fmt, args...) printk(KERN_INFO GSE_TAG fmt, ##args) /*----------------------------------------------------------------------------*/ static struct data_resolution kxtik1004_data_resolution[1] = { diff --git a/drivers/misc/mediatek/accelerometer/lsm6ds3/lsm6ds3.c b/drivers/misc/mediatek/accelerometer/lsm6ds3/lsm6ds3.c index 6e651f76c..618f6005a 100644 --- a/drivers/misc/mediatek/accelerometer/lsm6ds3/lsm6ds3.c +++ b/drivers/misc/mediatek/accelerometer/lsm6ds3/lsm6ds3.c @@ -278,9 +278,9 @@ static bool tilt_enable_status = false; #define GSE_TAG "[accel] " -#define GSE_FUN(f) printk(KERN_INFO GSE_TAG"%s\n", __FUNCTION__) -#define GSE_ERR(fmt, args...) printk(KERN_ERR GSE_TAG "%s %d : " fmt, __FUNCTION__, __LINE__, ##args) -#define GSE_LOG(fmt, args...) printk(KERN_INFO GSE_TAG "%s %d : " fmt, __FUNCTION__, __LINE__, ##args) +#define GSE_FUN(f) printk(KERN_INFO GSE_TAG"%s\n", __func__) +#define GSE_ERR(fmt, args...) printk(KERN_ERR GSE_TAG "%s %d : " fmt, __func__, __LINE__, ##args) +#define GSE_LOG(fmt, args...) printk(KERN_INFO GSE_TAG "%s %d : " fmt, __func__, __LINE__, ##args) /*----------------------------------------------------------------------------*/ @@ -1736,7 +1736,7 @@ static int lsm6ds3_enable_nodata(int en) err = LSM6DS3_acc_SetPowerMode( priv->client, enable_status); } - GSE_LOG("%s OK!\n",__FUNCTION__); + GSE_LOG("%s OK!\n",__func__); return err; } @@ -1787,7 +1787,7 @@ static int lsm6ds3_set_delay(u64 ns) atomic_set(&priv->filter, 1); } - GSE_LOG("%s (%d), chip only use 1024HZ \n",__FUNCTION__, value); + GSE_LOG("%s (%d), chip only use 1024HZ \n",__func__, value); return 0; } @@ -1803,7 +1803,7 @@ static int lsm6ds3_get_data(int* x ,int* y,int* z, int* status) } if(atomic_read(&priv->trace) & ACCEL_TRC_DATA) { - GSE_LOG("%s (%d), \n",__FUNCTION__,__LINE__); + GSE_LOG("%s (%d), \n",__func__,__LINE__); } memset(buff, 0, sizeof(buff)); LSM6DS3_ReadAccData(priv->client, buff, LSM6DS3_BUFSIZE); @@ -2750,7 +2750,7 @@ static int lsm6ds3_local_init(void) if(lsm6ds3_acc_init_flag == -1) { mutex_unlock(&lsm6ds3_init_mutex); - GSE_ERR("%s init failed!\n", __FUNCTION__); + GSE_ERR("%s init failed!\n", __func__); return -1; } else @@ -2794,7 +2794,7 @@ static int lsm6ds3_local_init(void) mutex_unlock(&lsm6ds3_init_mutex); return 0; lsm6ds3_local_init_failed: - GSE_ERR("%s init failed\n", __FUNCTION__); + GSE_ERR("%s init failed\n", __func__); mutex_unlock(&lsm6ds3_init_mutex); return res; @@ -2863,7 +2863,7 @@ static int lsm6ds3_tilt_local_init(void) if(lsm6ds3_acc_init_flag == -1) { mutex_unlock(&lsm6ds3_init_mutex); - GSE_ERR("%s init failed!\n", __FUNCTION__); + GSE_ERR("%s init failed!\n", __func__); return -1; } else @@ -2880,7 +2880,7 @@ static int lsm6ds3_tilt_local_init(void) lsm6ds3_tilt_local_init_failed: mutex_unlock(&lsm6ds3_init_mutex); - GSE_ERR("%s init failed!\n", __FUNCTION__); + GSE_ERR("%s init failed!\n", __func__); return -1; } static int lsm6ds3_tilt_local_uninit(void) @@ -2916,7 +2916,7 @@ static int lsm6ds3_step_c_local_init(void) if(lsm6ds3_acc_init_flag == -1) { mutex_unlock(&lsm6ds3_init_mutex); - GSE_ERR("%s init failed!\n", __FUNCTION__); + GSE_ERR("%s init failed!\n", __func__); return -1; } else @@ -2955,7 +2955,7 @@ static int lsm6ds3_step_c_local_init(void) lsm6ds3_step_c_local_init_failed: mutex_unlock(&lsm6ds3_init_mutex); - GSE_ERR("%s init failed!\n", __FUNCTION__); + GSE_ERR("%s init failed!\n", __func__); return res; } diff --git a/drivers/misc/mediatek/accelerometer/mc3410-new/mc3410.c b/drivers/misc/mediatek/accelerometer/mc3410-new/mc3410.c index 02a1c3d7a..013ade768 100644 --- a/drivers/misc/mediatek/accelerometer/mc3410-new/mc3410.c +++ b/drivers/misc/mediatek/accelerometer/mc3410-new/mc3410.c @@ -115,8 +115,8 @@ *********************/ #if DEBUG_SWITCH #define GSE_TAG "[Gsensor] " - #define GSE_FUN(f) printk(KERN_INFO GSE_TAG"%s\n", __FUNCTION__) - #define GSE_ERR(fmt, args...) printk(KERN_ERR GSE_TAG"%s %d : "fmt, __FUNCTION__, __LINE__, ##args) + #define GSE_FUN(f) printk(KERN_INFO GSE_TAG"%s\n", __func__) + #define GSE_ERR(fmt, args...) printk(KERN_ERR GSE_TAG"%s %d : "fmt, __func__, __LINE__, ##args) #define GSE_LOG(fmt, args...) printk(KERN_NOTICE GSE_TAG fmt, ##args) #else #define GSE_TAG @@ -130,8 +130,8 @@ *********************/ #if 0 #define PS_TAG "[mCube/Psensor] " - #define PS_FUN(f) printk(KERN_INFO PS_TAG"%s\n", __FUNCTION__) - #define PS_ERR(fmt, args...) printk(KERN_ERR PS_TAG"%s %d : "fmt, __FUNCTION__, __LINE__, ##args) + #define PS_FUN(f) printk(KERN_INFO PS_TAG"%s\n", __func__) + #define PS_ERR(fmt, args...) printk(KERN_ERR PS_TAG"%s %d : "fmt, __func__, __LINE__, ##args) #define PS_LOG(fmt, args...) printk(KERN_ERR PS_TAG fmt, ##args) #else #define PS_TAG @@ -374,7 +374,7 @@ static signed char s_bAccuracyStatus = SENSOR_STATUS_ACCURACY_MEDIUM; _nTemp = nDataX; \ nDataX = nDataY; \ nDataY = -_nTemp; \ - GSE_LOG("[%s] 3250 read remap\n", __FUNCTION__); \ + GSE_LOG("[%s] 3250 read remap\n", __func__); \ } \ else \ { \ @@ -390,13 +390,13 @@ static signed char s_bAccuracyStatus = SENSOR_STATUS_ACCURACY_MEDIUM; _nTemp = nDataX; \ nDataX = -nDataY; \ nDataY = _nTemp; \ - GSE_LOG("[%s] 3250 write remap\n", __FUNCTION__); \ + GSE_LOG("[%s] 3250 write remap\n", __func__); \ } \ else \ { \ if (s_bMPOL & 0x01) nDataX = -nDataX; \ if (s_bMPOL & 0x02) nDataY = -nDataY; \ - GSE_LOG("[%s] 35X0 remap [s_bMPOL: %d]\n", __FUNCTION__, s_bMPOL); \ + GSE_LOG("[%s] 35X0 remap [s_bMPOL: %d]\n", __func__, s_bMPOL); \ } #define IS_MCFM12() ((0xC0 <= s_bHWID) && (s_bHWID <= 0xCF)) @@ -713,7 +713,7 @@ static void mcube_load_cali(struct i2c_client *pt_i2c_client) { if (false == s_nIsCaliLoaded) { - GSE_LOG("[%s] loading cali file...\n", __FUNCTION__); + GSE_LOG("[%s] loading cali file...\n", __func__); if (MC3XXX_RETCODE_SUCCESS == mcube_read_cali_file(pt_i2c_client)) s_nIsCaliLoaded = true; @@ -938,7 +938,7 @@ static void MC3XXX_rbm(struct i2c_client *client, int enable) MC3XXX_i2c_read_block(client, 0x04, _baDataBuf, 0x01); - //GSE_LOG("[%s] REG(0x04): 0x%X, enable: %d\n", __FUNCTION__, _baDataBuf[0], enable); + //GSE_LOG("[%s] REG(0x04): 0x%X, enable: %d\n", __func__, _baDataBuf[0], enable); if (0x00 == (_baDataBuf[0] & 0x40)) { @@ -1051,7 +1051,7 @@ static int MC3XXX_ReadData_RBM(struct i2c_client *client, int data[MC3XXX_AXES_N *****************************************/ static int MC3XXX_ValidateSensorIC(unsigned char *pbPCode, unsigned char *pbHwID) { - GSE_LOG("[%s] *pbPCode: 0x%02X, *pbHwID: 0x%02X\n", __FUNCTION__, *pbPCode, *pbHwID); + GSE_LOG("[%s] *pbPCode: 0x%02X, *pbHwID: 0x%02X\n", __func__, *pbPCode, *pbHwID); if ( (0x01 == *pbHwID) || (0x03 == *pbHwID) @@ -1354,7 +1354,7 @@ static int MC3XXX_ReadData(struct i2c_client *pt_i2c_client, s16 waData[MC3XX struct mc3xxx_i2c_data *_pt_i2c_obj = ((struct mc3xxx_i2c_data*) i2c_get_clientdata(pt_i2c_client)); if(atomic_read(&_pt_i2c_obj->trace) & MCUBE_TRC_INFO) { - GSE_LOG("[%s] s_nIsRBM_Enabled: %d\n", __FUNCTION__, s_nIsRBM_Enabled); + GSE_LOG("[%s] s_nIsRBM_Enabled: %d\n", __func__, s_nIsRBM_Enabled); } if (NULL == pt_i2c_client) { @@ -1378,7 +1378,7 @@ static int MC3XXX_ReadData(struct i2c_client *pt_i2c_client, s16 waData[MC3XX waData[MC3XXX_AXIS_Y] = ((s8) _baData[1]); waData[MC3XXX_AXIS_Z] = ((s8) _baData[2]); if(atomic_read(&_pt_i2c_obj->trace) & MCUBE_TRC_INFO) { - GSE_LOG("[%s][low] X: %d, Y: %d, Z: %d\n", __FUNCTION__, waData[MC3XXX_AXIS_X], waData[MC3XXX_AXIS_Y], waData[MC3XXX_AXIS_Z]); + GSE_LOG("[%s][low] X: %d, Y: %d, Z: %d\n", __func__, waData[MC3XXX_AXIS_X], waData[MC3XXX_AXIS_Y], waData[MC3XXX_AXIS_Z]); } #ifdef _MC3XXX_SUPPORT_LRF_ @@ -1400,7 +1400,7 @@ static int MC3XXX_ReadData(struct i2c_client *pt_i2c_client, s16 waData[MC3XX waData[MC3XXX_AXIS_Y] = ((signed short) ((_baData[2]) | (_baData[3]<<8))); waData[MC3XXX_AXIS_Z] = ((signed short) ((_baData[4]) | (_baData[5]<<8))); if(atomic_read(&_pt_i2c_obj->trace) & MCUBE_TRC_INFO) { - GSE_LOG("[%s][high] X: %d, Y: %d, Z: %d\n", __FUNCTION__, waData[MC3XXX_AXIS_X], waData[MC3XXX_AXIS_Y], waData[MC3XXX_AXIS_Z]); + GSE_LOG("[%s][high] X: %d, Y: %d, Z: %d\n", __func__, waData[MC3XXX_AXIS_X], waData[MC3XXX_AXIS_Y], waData[MC3XXX_AXIS_Z]); } } if(atomic_read(&_pt_i2c_obj->trace) & MCUBE_TRC_INFO) { @@ -1757,7 +1757,7 @@ static int MC3XXX_SetPowerMode(struct i2c_client *client, bool enable) *****************************************/ static void MC3XXX_SetResolution(void) { - GSE_LOG("[%s]\n", __FUNCTION__); + GSE_LOG("[%s]\n", __func__); switch (s_bPCODE) { @@ -1808,7 +1808,7 @@ static void MC3XXX_SetResolution(void) break; } - GSE_LOG("[%s] s_bResolution: %d\n", __FUNCTION__, s_bResolution); + GSE_LOG("[%s] s_bResolution: %d\n", __func__, s_bResolution); } /***************************************** @@ -1818,7 +1818,7 @@ static void MC3XXX_SetSampleRate(struct i2c_client *pt_i2c_client) { unsigned char _baDataBuf[2] = { 0 }; - GSE_LOG("[%s]\n", __FUNCTION__); + GSE_LOG("[%s]\n", __func__); _baDataBuf[0] = MC3XXX_REG_SAMPLE_RATE; _baDataBuf[1] = 0x00; @@ -1830,7 +1830,7 @@ static void MC3XXX_SetSampleRate(struct i2c_client *pt_i2c_client) _baData2Buf[0] = 0x2A; MC3XXX_i2c_read_block(pt_i2c_client, 0x2A, _baData2Buf, 1); - GSE_LOG("[%s] REG(0x2A) = 0x%02X\n", __FUNCTION__, _baData2Buf[0]); + GSE_LOG("[%s] REG(0x2A) = 0x%02X\n", __func__, _baData2Buf[0]); _baData2Buf[0] = (_baData2Buf[0] & 0xC0); @@ -1841,7 +1841,7 @@ static void MC3XXX_SetSampleRate(struct i2c_client *pt_i2c_client) case 0x80: _baDataBuf[0] = 0x09; break; case 0xC0: _baDataBuf[0] = 0x0A; break; - default: GSE_ERR("[%s] no chance to get here... check code!\n", __FUNCTION__); break; + default: GSE_ERR("[%s] no chance to get here... check code!\n", __func__); break; } } else @@ -1876,7 +1876,7 @@ static void MC3XXX_ConfigRegRange(struct i2c_client *pt_i2c_client) if (res < 0) GSE_ERR("MC3XXX_ConfigRegRange fail \n"); - GSE_LOG("[%s] set 0x%X\n", __FUNCTION__, _baDataBuf[1]); + GSE_LOG("[%s] set 0x%X\n", __func__, _baDataBuf[1]); } /***************************************** @@ -1896,7 +1896,7 @@ static void MC3XXX_SetGain(void) } } - GSE_LOG("[%s] gain: %d / %d / %d\n", __FUNCTION__, gsensor_gain.x, gsensor_gain.y, gsensor_gain.z); + GSE_LOG("[%s] gain: %d / %d / %d\n", __func__, gsensor_gain.x, gsensor_gain.y, gsensor_gain.z); } /***************************************** @@ -1906,7 +1906,7 @@ static int MC3XXX_Init(struct i2c_client *client, int reset_cali) { unsigned char _baDataBuf[2] = { 0 }; - GSE_LOG("[%s]\n", __FUNCTION__); + GSE_LOG("[%s]\n", __func__); #ifdef _MC3XXX_SUPPORT_POWER_SAVING_SHUTDOWN_POWER_ if (MC3XXX_RETCODE_SUCCESS != _mc3xxx_i2c_auto_probe(client)) @@ -1915,7 +1915,7 @@ static int MC3XXX_Init(struct i2c_client *client, int reset_cali) return (MC3XXX_RETCODE_ERROR_I2C); } - //GSE_LOG("[%s] confirmed i2c addr: 0x%X\n", __FUNCTION__, client->addr); + //GSE_LOG("[%s] confirmed i2c addr: 0x%X\n", __func__, client->addr); #endif _baDataBuf[0] = 0x43; @@ -1956,7 +1956,7 @@ static int MC3XXX_Init(struct i2c_client *client, int reset_cali) init_waitqueue_head(&wq_mc3xxx_open_status); #endif - GSE_LOG("[%s] init ok.\n", __FUNCTION__); + GSE_LOG("[%s] init ok.\n", __func__); return (MC3XXX_RETCODE_SUCCESS); } @@ -2025,21 +2025,21 @@ static int MC3XXX_ReadSensorData(struct i2c_client *pt_i2c_client, char *pbBuf, //output format: mg if(atomic_read(&_pt_i2c_obj->trace) & MCUBE_TRC_INFO) { - GSE_LOG("[%s] raw data: %d, %d, %d\n", __FUNCTION__, _pt_i2c_obj->data[MC3XXX_AXIS_X], _pt_i2c_obj->data[MC3XXX_AXIS_Y], _pt_i2c_obj->data[MC3XXX_AXIS_Z]); + GSE_LOG("[%s] raw data: %d, %d, %d\n", __func__, _pt_i2c_obj->data[MC3XXX_AXIS_X], _pt_i2c_obj->data[MC3XXX_AXIS_Y], _pt_i2c_obj->data[MC3XXX_AXIS_Z]); } _naAccelData[(_pt_i2c_obj->cvt.map[MC3XXX_AXIS_X])] = (_pt_i2c_obj->cvt.sign[MC3XXX_AXIS_X] * _pt_i2c_obj->data[MC3XXX_AXIS_X]); _naAccelData[(_pt_i2c_obj->cvt.map[MC3XXX_AXIS_Y])] = (_pt_i2c_obj->cvt.sign[MC3XXX_AXIS_Y] * _pt_i2c_obj->data[MC3XXX_AXIS_Y]); _naAccelData[(_pt_i2c_obj->cvt.map[MC3XXX_AXIS_Z])] = (_pt_i2c_obj->cvt.sign[MC3XXX_AXIS_Z] * _pt_i2c_obj->data[MC3XXX_AXIS_Z]); if(atomic_read(&_pt_i2c_obj->trace) & MCUBE_TRC_INFO) { - GSE_LOG("[%s] map data: %d, %d, %d!\n", __FUNCTION__, _naAccelData[MC3XXX_AXIS_X], _naAccelData[MC3XXX_AXIS_Y], _naAccelData[MC3XXX_AXIS_Z]); + GSE_LOG("[%s] map data: %d, %d, %d!\n", __func__, _naAccelData[MC3XXX_AXIS_X], _naAccelData[MC3XXX_AXIS_Y], _naAccelData[MC3XXX_AXIS_Z]); } _naAccelData[MC3XXX_AXIS_X] = (_naAccelData[MC3XXX_AXIS_X] * GRAVITY_EARTH_1000 / gsensor_gain.x); _naAccelData[MC3XXX_AXIS_Y] = (_naAccelData[MC3XXX_AXIS_Y] * GRAVITY_EARTH_1000 / gsensor_gain.y); _naAccelData[MC3XXX_AXIS_Z] = (_naAccelData[MC3XXX_AXIS_Z] * GRAVITY_EARTH_1000 / gsensor_gain.z); if(atomic_read(&_pt_i2c_obj->trace) & MCUBE_TRC_INFO) { - GSE_LOG("[%s] accel data: %d, %d, %d!\n", __FUNCTION__, _naAccelData[MC3XXX_AXIS_X], _naAccelData[MC3XXX_AXIS_Y], _naAccelData[MC3XXX_AXIS_Z]); + GSE_LOG("[%s] accel data: %d, %d, %d!\n", __func__, _naAccelData[MC3XXX_AXIS_X], _naAccelData[MC3XXX_AXIS_Y], _naAccelData[MC3XXX_AXIS_Z]); } sprintf(pbBuf, "%04x %04x %04x", _naAccelData[MC3XXX_AXIS_X], _naAccelData[MC3XXX_AXIS_Y], _naAccelData[MC3XXX_AXIS_Z]); @@ -2335,11 +2335,11 @@ static void MC3XXX_SelfCheck(struct i2c_client *client, u8 *pUserBuf) #ifdef _MC3XXX_SUPPORT_PERIODIC_DOC_ static int MC3XXX_GetOpenStatus(void) { - //GSE_LOG("[%s] %d\n", __FUNCTION__, atomic_read(&s_t_mc3xxx_open_status)); + //GSE_LOG("[%s] %d\n", __func__, atomic_read(&s_t_mc3xxx_open_status)); wait_event_interruptible(wq_mc3xxx_open_status, (atomic_read(&s_t_mc3xxx_open_status) != 0)); - //GSE_LOG("[%s] pass wait_event_interruptible: %d\n", __FUNCTION__, atomic_read(&s_t_mc3xxx_open_status)); + //GSE_LOG("[%s] pass wait_event_interruptible: %d\n", __func__, atomic_read(&s_t_mc3xxx_open_status)); return (atomic_read(&s_t_mc3xxx_open_status)); } @@ -2774,7 +2774,7 @@ static ssize_t show_regiter_map(struct device_driver *ddri, char *buf) static ssize_t store_regiter_map(struct device_driver *ddri, const char *buf, size_t count) { // reserved - //GSE_LOG("[%s] buf[0]: 0x%02X\n", __FUNCTION__, buf[0]); + //GSE_LOG("[%s] buf[0]: 0x%02X\n", __func__, buf[0]); return count; } @@ -2787,7 +2787,7 @@ static ssize_t show_chip_orientation(struct device_driver *ptDevDrv, char *pbBuf ssize_t _tLength = 0; struct acc_hw *_ptAccelHw = get_cust_acc(); - GSE_LOG("[%s] default direction: %d\n", __FUNCTION__, _ptAccelHw->direction); + GSE_LOG("[%s] default direction: %d\n", __func__, _ptAccelHw->direction); _tLength = snprintf(pbBuf, PAGE_SIZE, "default direction = %d\n", _ptAccelHw->direction); @@ -2811,7 +2811,7 @@ static ssize_t store_chip_orientation(struct device_driver *ptDevDrv, const char GSE_ERR("ERR: fail to set direction\n"); } - GSE_LOG("[%s] set direction: %d\n", __FUNCTION__, _nDirection); + GSE_LOG("[%s] set direction: %d\n", __func__, _nDirection); return (tCount); } @@ -2855,7 +2855,7 @@ static ssize_t show_selfcheck_value(struct device_driver *ptDevDriver, char *pbB { struct i2c_client *_pt_i2c_client = mc3xxx_i2c_client; - //GSE_LOG("[%s] 0x%02X\n", __FUNCTION__, pbBuf[0]); + //GSE_LOG("[%s] 0x%02X\n", __func__, pbBuf[0]); MC3XXX_MUTEX_LOCK(); MC3XXX_SelfCheck(_pt_i2c_client, pbBuf); @@ -2871,7 +2871,7 @@ static ssize_t show_selfcheck_value(struct device_driver *ptDevDriver, char *pbB static ssize_t store_selfcheck_value(struct device_driver *ddri, const char *buf, size_t count) { // reserved - //GSE_LOG("[%s] buf[0]: 0x%02X\n", __FUNCTION__, buf[0]); + //GSE_LOG("[%s] buf[0]: 0x%02X\n", __func__, buf[0]); return count; } @@ -3827,7 +3827,7 @@ _I2C_AUTO_PROBE_RECHECK_: { client->addr = mc3xxx_i2c_auto_probe_addr[_nCount]; - //GSE_LOG("[%s][%d] probing addr: 0x%X\n", __FUNCTION__, _nCount, client->addr); + //GSE_LOG("[%s][%d] probing addr: 0x%X\n", __func__, _nCount, client->addr); _baData1Buf[0] = 0; if (0 > MC3XXX_i2c_read_block(client, 0x3B, _baData1Buf, 1)) @@ -3837,7 +3837,7 @@ _I2C_AUTO_PROBE_RECHECK_: _naCheckCount[_nCount]++; - //GSE_LOG("[%s][%d] addr: 0x%X ok to read REG(0x3B): 0x%X\n", __FUNCTION__, _nCount, client->addr, _baData1Buf[0]); + //GSE_LOG("[%s][%d] addr: 0x%X ok to read REG(0x3B): 0x%X\n", __func__, _nCount, client->addr, _baData1Buf[0]); if (0x00 == _baData1Buf[0]) { @@ -3865,7 +3865,7 @@ _I2C_AUTO_PROBE_RECHECK_: MC3XXX_SaveDefaultOffset(client); - //GSE_LOG("[%s] addr: 0x%X confirmed ok to use. s_bPCODE: 0x%02X, s_bHWID: 0x%02X\n", __FUNCTION__, client->addr, s_bPCODE, s_bHWID); + //GSE_LOG("[%s] addr: 0x%X confirmed ok to use. s_bPCODE: 0x%02X, s_bHWID: 0x%02X\n", __func__, client->addr, s_bPCODE, s_bHWID); return (MC3XXX_RETCODE_SUCCESS); } @@ -4008,7 +4008,7 @@ static int mc3xxx_i2c_probe(struct i2c_client *client, const struct i2c_device_i goto exit_init_failed; } - //GSE_LOG("[%s] 2nd confirmed i2c addr: 0x%X\n", __FUNCTION__, client->addr); + //GSE_LOG("[%s] 2nd confirmed i2c addr: 0x%X\n", __func__, client->addr); MC3XXX_i2c_read_block(client, 0x21, offset_buf, 6); diff --git a/drivers/misc/mediatek/accelerometer/mc3xxx_auto/mc3xxx.c b/drivers/misc/mediatek/accelerometer/mc3xxx_auto/mc3xxx.c index a5fe14d53..0b2606d4e 100644 --- a/drivers/misc/mediatek/accelerometer/mc3xxx_auto/mc3xxx.c +++ b/drivers/misc/mediatek/accelerometer/mc3xxx_auto/mc3xxx.c @@ -128,8 +128,8 @@ *********************/ #if 0 #define GSE_TAG "[Gsensor] " - #define GSE_FUN(f) printk(KERN_INFO GSE_TAG"%s\n", __FUNCTION__) - #define GSE_ERR(fmt, args...) printk(KERN_ERR GSE_TAG"%s %d : "fmt, __FUNCTION__, __LINE__, ##args) + #define GSE_FUN(f) printk(KERN_INFO GSE_TAG"%s\n", __func__) + #define GSE_ERR(fmt, args...) printk(KERN_ERR GSE_TAG"%s %d : "fmt, __func__, __LINE__, ##args) #define GSE_LOG(fmt, args...) printk(KERN_INFO GSE_TAG fmt, ##args) #else #define GSE_TAG @@ -143,8 +143,8 @@ *********************/ #if 0 #define PS_TAG "[mCube/Psensor] " - #define PS_FUN(f) printk(KERN_INFO PS_TAG"%s\n", __FUNCTION__) - #define PS_ERR(fmt, args...) printk(KERN_ERR PS_TAG"%s %d : "fmt, __FUNCTION__, __LINE__, ##args) + #define PS_FUN(f) printk(KERN_INFO PS_TAG"%s\n", __func__) + #define PS_ERR(fmt, args...) printk(KERN_ERR PS_TAG"%s %d : "fmt, __func__, __LINE__, ##args) #define PS_LOG(fmt, args...) printk(KERN_ERR PS_TAG fmt, ##args) #else #define PS_TAG @@ -399,13 +399,13 @@ static signed char s_bAccuracyStatus = SENSOR_STATUS_ACCURACY_MEDIUM; _nTemp = nDataX; \ nDataX = nDataY; \ nDataY = -_nTemp; \ - GSE_LOG("[%s] 3250 read remap\n", __FUNCTION__); \ + GSE_LOG("[%s] 3250 read remap\n", __func__); \ } \ else \ { \ if (s_bMPOL & 0x01) nDataX = -nDataX; \ if (s_bMPOL & 0x02) nDataY = -nDataY; \ - GSE_LOG("[%s] 35X0 remap [s_bMPOL: %d]\n", __FUNCTION__, s_bMPOL); \ + GSE_LOG("[%s] 35X0 remap [s_bMPOL: %d]\n", __func__, s_bMPOL); \ } #define MCUBE_WREMAP(nDataX, nDataY) \ @@ -416,13 +416,13 @@ static signed char s_bAccuracyStatus = SENSOR_STATUS_ACCURACY_MEDIUM; _nTemp = nDataX; \ nDataX = -nDataY; \ nDataY = _nTemp; \ - GSE_LOG("[%s] 3250 write remap\n", __FUNCTION__); \ + GSE_LOG("[%s] 3250 write remap\n", __func__); \ } \ else \ { \ if (s_bMPOL & 0x01) nDataX = -nDataX; \ if (s_bMPOL & 0x02) nDataY = -nDataY; \ - GSE_LOG("[%s] 35X0 remap [s_bMPOL: %d]\n", __FUNCTION__, s_bMPOL); \ + GSE_LOG("[%s] 35X0 remap [s_bMPOL: %d]\n", __func__, s_bMPOL); \ } #define IS_MCFM12() ((0xC0 <= s_bHWID) && (s_bHWID <= 0xCF)) @@ -653,7 +653,7 @@ static void mcube_load_cali(struct i2c_client *pt_i2c_client) { if (false == s_nIsCaliLoaded) { - GSE_LOG("[%s] loading cali file...\n", __FUNCTION__); + GSE_LOG("[%s] loading cali file...\n", __func__); if (MC3XXX_RETCODE_SUCCESS == mcube_read_cali_file(pt_i2c_client)) s_nIsCaliLoaded = true; @@ -899,7 +899,7 @@ static void MC3XXX_rbm(struct i2c_client *client, int enable) hwmsen_read_block(client, 0x04, _baDataBuf, 0x01); - //GSE_LOG("[%s] REG(0x04): 0x%X, enable: %d\n", __FUNCTION__, _baDataBuf[0], enable); + //GSE_LOG("[%s] REG(0x04): 0x%X, enable: %d\n", __func__, _baDataBuf[0], enable); if (0x00 == (_baDataBuf[0] & 0x40)) { @@ -1012,7 +1012,7 @@ static int MC3XXX_ReadData_RBM(struct i2c_client *client, int data[MC3XXX_AXES_N *****************************************/ static int MC3XXX_ValidateSensorIC(unsigned char *pbPCode, unsigned char *pbHwID) { - GSE_LOG("[%s] *pbPCode: 0x%02X, *pbHwID: 0x%02X\n", __FUNCTION__, *pbPCode, *pbHwID); + GSE_LOG("[%s] *pbPCode: 0x%02X, *pbHwID: 0x%02X\n", __func__, *pbPCode, *pbHwID); if ( (0x01 == *pbHwID) || (0x03 == *pbHwID) @@ -1311,7 +1311,7 @@ static int MC3XXX_ReadData(struct i2c_client *pt_i2c_client, s16 waData[MC3XX { u8 _baData[MC3XXX_DATA_LEN] = { 0 }; - GSE_LOG("[%s] s_nIsRBM_Enabled: %d\n", __FUNCTION__, s_nIsRBM_Enabled); + GSE_LOG("[%s] s_nIsRBM_Enabled: %d\n", __func__, s_nIsRBM_Enabled); if (NULL == pt_i2c_client) { @@ -1335,7 +1335,7 @@ static int MC3XXX_ReadData(struct i2c_client *pt_i2c_client, s16 waData[MC3XX waData[MC3XXX_AXIS_Y] = ((s8) _baData[1]); waData[MC3XXX_AXIS_Z] = ((s8) _baData[2]); - GSE_LOG("[%s][low] X: %d, Y: %d, Z: %d\n", __FUNCTION__, waData[MC3XXX_AXIS_X], waData[MC3XXX_AXIS_Y], waData[MC3XXX_AXIS_Z]); + GSE_LOG("[%s][low] X: %d, Y: %d, Z: %d\n", __func__, waData[MC3XXX_AXIS_X], waData[MC3XXX_AXIS_Y], waData[MC3XXX_AXIS_Z]); #ifdef _MC3XXX_SUPPORT_LRF_ @@ -1357,7 +1357,7 @@ static int MC3XXX_ReadData(struct i2c_client *pt_i2c_client, s16 waData[MC3XX waData[MC3XXX_AXIS_Y] = ((signed short) ((_baData[2]) | (_baData[3]<<8))); waData[MC3XXX_AXIS_Z] = ((signed short) ((_baData[4]) | (_baData[5]<<8))); - GSE_LOG("[%s][high] X: %d, Y: %d, Z: %d\n", __FUNCTION__, waData[MC3XXX_AXIS_X], waData[MC3XXX_AXIS_Y], waData[MC3XXX_AXIS_Z]); + GSE_LOG("[%s][high] X: %d, Y: %d, Z: %d\n", __func__, waData[MC3XXX_AXIS_X], waData[MC3XXX_AXIS_Y], waData[MC3XXX_AXIS_Z]); } GSE_LOG("RAW<<<<<[%04d %04d %04d]\n", waData[MC3XXX_AXIS_X], waData[MC3XXX_AXIS_Y], waData[MC3XXX_AXIS_Z]); @@ -1711,7 +1711,7 @@ static int MC3XXX_SetPowerMode(struct i2c_client *client, bool enable) *****************************************/ static void MC3XXX_SetResolution(void) { - GSE_LOG("[%s]\n", __FUNCTION__); + GSE_LOG("[%s]\n", __func__); switch (s_bPCODE) { @@ -1762,7 +1762,7 @@ static void MC3XXX_SetResolution(void) break; } - GSE_LOG("[%s] s_bResolution: %d\n", __FUNCTION__, s_bResolution); + GSE_LOG("[%s] s_bResolution: %d\n", __func__, s_bResolution); } /***************************************** @@ -1772,7 +1772,7 @@ static void MC3XXX_SetSampleRate(struct i2c_client *pt_i2c_client) { unsigned char _baDataBuf[2] = { 0 }; - GSE_LOG("[%s]\n", __FUNCTION__); + GSE_LOG("[%s]\n", __func__); _baDataBuf[0] = MC3XXX_REG_SAMPLE_RATE; _baDataBuf[1] = 0x00; @@ -1785,7 +1785,7 @@ static void MC3XXX_SetSampleRate(struct i2c_client *pt_i2c_client) i2c_master_send(pt_i2c_client, &(_baData2Buf[0]), 1); i2c_master_recv(pt_i2c_client, &(_baData2Buf[0]), 1); - GSE_LOG("[%s] REG(0x2A) = 0x%02X\n", __FUNCTION__, _baData2Buf[0]); + GSE_LOG("[%s] REG(0x2A) = 0x%02X\n", __func__, _baData2Buf[0]); _baData2Buf[0] = (_baData2Buf[0] & 0xC0); @@ -1796,7 +1796,7 @@ static void MC3XXX_SetSampleRate(struct i2c_client *pt_i2c_client) case 0x80: _baDataBuf[1] = 0x09; break; case 0xC0: _baDataBuf[1] = 0x0A; break; - default: GSE_ERR("[%s] no chance to get here... check code!\n", __FUNCTION__); break; + default: GSE_ERR("[%s] no chance to get here... check code!\n", __func__); break; } } @@ -1826,7 +1826,7 @@ static void MC3XXX_ConfigRegRange(struct i2c_client *pt_i2c_client) i2c_master_send(pt_i2c_client, _baDataBuf, 0x2); - GSE_LOG("[%s] set 0x%X\n", __FUNCTION__, _baDataBuf[1]); + GSE_LOG("[%s] set 0x%X\n", __func__, _baDataBuf[1]); } /***************************************** @@ -1846,7 +1846,7 @@ static void MC3XXX_SetGain(void) } } - GSE_LOG("[%s] gain: %d / %d / %d\n", __FUNCTION__, gsensor_gain.x, gsensor_gain.y, gsensor_gain.z); + GSE_LOG("[%s] gain: %d / %d / %d\n", __func__, gsensor_gain.x, gsensor_gain.y, gsensor_gain.z); } /***************************************** @@ -1856,7 +1856,7 @@ static int MC3XXX_Init(struct i2c_client *client, int reset_cali) { unsigned char _baDataBuf[2] = { 0 }; - GSE_LOG("[%s]\n", __FUNCTION__); + GSE_LOG("[%s]\n", __func__); #ifdef _MC3XXX_SUPPORT_POWER_SAVING_SHUTDOWN_POWER_ if (MC3XXX_RETCODE_SUCCESS != _mc3xxx_i2c_auto_probe(client)) @@ -1865,7 +1865,7 @@ static int MC3XXX_Init(struct i2c_client *client, int reset_cali) return (MC3XXX_RETCODE_ERROR_I2C); } - //GSE_LOG("[%s] confirmed i2c addr: 0x%X\n", __FUNCTION__, client->addr); + //GSE_LOG("[%s] confirmed i2c addr: 0x%X\n", __func__, client->addr); #endif _baDataBuf[0] = MC3XXX_REG_MODE_FEATURE; @@ -1911,7 +1911,7 @@ static int MC3XXX_Init(struct i2c_client *client, int reset_cali) init_waitqueue_head(&wq_mc3xxx_open_status); #endif - GSE_LOG("[%s] init ok.\n", __FUNCTION__); + GSE_LOG("[%s] init ok.\n", __func__); return (MC3XXX_RETCODE_SUCCESS); } @@ -1944,7 +1944,7 @@ static int MC3XXX_ReadSensorData(struct i2c_client *pt_i2c_client, char *pbBuf, int _naAccelData[MC3XXX_AXES_NUM] = { 0 }; struct mc3xxx_i2c_data *_pt_i2c_obj = ((struct mc3xxx_i2c_data*) i2c_get_clientdata(pt_i2c_client)); - GSE_LOG("[%s]\n", __FUNCTION__); + GSE_LOG("[%s]\n", __func__); if ((NULL == pt_i2c_client) || (NULL == pbBuf)) { @@ -1981,17 +1981,17 @@ static int MC3XXX_ReadSensorData(struct i2c_client *pt_i2c_client, char *pbBuf, } //output format: mg - GSE_LOG("[%s] raw data: %d, %d, %d\n", __FUNCTION__, _pt_i2c_obj->data[MC3XXX_AXIS_X], _pt_i2c_obj->data[MC3XXX_AXIS_Y], _pt_i2c_obj->data[MC3XXX_AXIS_Z]); + GSE_LOG("[%s] raw data: %d, %d, %d\n", __func__, _pt_i2c_obj->data[MC3XXX_AXIS_X], _pt_i2c_obj->data[MC3XXX_AXIS_Y], _pt_i2c_obj->data[MC3XXX_AXIS_Z]); _naAccelData[(_pt_i2c_obj->cvt.map[MC3XXX_AXIS_X])] = (_pt_i2c_obj->cvt.sign[MC3XXX_AXIS_X] * _pt_i2c_obj->data[MC3XXX_AXIS_X]); _naAccelData[(_pt_i2c_obj->cvt.map[MC3XXX_AXIS_Y])] = (_pt_i2c_obj->cvt.sign[MC3XXX_AXIS_Y] * _pt_i2c_obj->data[MC3XXX_AXIS_Y]); _naAccelData[(_pt_i2c_obj->cvt.map[MC3XXX_AXIS_Z])] = (_pt_i2c_obj->cvt.sign[MC3XXX_AXIS_Z] * _pt_i2c_obj->data[MC3XXX_AXIS_Z]); - GSE_LOG("[%s] map data: %d, %d, %d!\n", __FUNCTION__, _naAccelData[MC3XXX_AXIS_X], _naAccelData[MC3XXX_AXIS_Y], _naAccelData[MC3XXX_AXIS_Z]); + GSE_LOG("[%s] map data: %d, %d, %d!\n", __func__, _naAccelData[MC3XXX_AXIS_X], _naAccelData[MC3XXX_AXIS_Y], _naAccelData[MC3XXX_AXIS_Z]); _naAccelData[MC3XXX_AXIS_X] = (_naAccelData[MC3XXX_AXIS_X] * GRAVITY_EARTH_1000 / gsensor_gain.x); _naAccelData[MC3XXX_AXIS_Y] = (_naAccelData[MC3XXX_AXIS_Y] * GRAVITY_EARTH_1000 / gsensor_gain.y); _naAccelData[MC3XXX_AXIS_Z] = (_naAccelData[MC3XXX_AXIS_Z] * GRAVITY_EARTH_1000 / gsensor_gain.z); - GSE_LOG("[%s] accel data: %d, %d, %d!\n", __FUNCTION__, _naAccelData[MC3XXX_AXIS_X], _naAccelData[MC3XXX_AXIS_Y], _naAccelData[MC3XXX_AXIS_Z]); + GSE_LOG("[%s] accel data: %d, %d, %d!\n", __func__, _naAccelData[MC3XXX_AXIS_X], _naAccelData[MC3XXX_AXIS_Y], _naAccelData[MC3XXX_AXIS_Z]); sprintf(pbBuf, "%04x %04x %04x", _naAccelData[MC3XXX_AXIS_X], _naAccelData[MC3XXX_AXIS_Y], _naAccelData[MC3XXX_AXIS_Z]); @@ -2287,11 +2287,11 @@ static void MC3XXX_SelfCheck(struct i2c_client *client, u8 *pUserBuf) #ifdef _MC3XXX_SUPPORT_PERIODIC_DOC_ static int MC3XXX_GetOpenStatus(void) { - //GSE_LOG("[%s] %d\n", __FUNCTION__, atomic_read(&s_t_mc3xxx_open_status)); + //GSE_LOG("[%s] %d\n", __func__, atomic_read(&s_t_mc3xxx_open_status)); wait_event_interruptible(wq_mc3xxx_open_status, (atomic_read(&s_t_mc3xxx_open_status) != 0)); - //GSE_LOG("[%s] pass wait_event_interruptible: %d\n", __FUNCTION__, atomic_read(&s_t_mc3xxx_open_status)); + //GSE_LOG("[%s] pass wait_event_interruptible: %d\n", __func__, atomic_read(&s_t_mc3xxx_open_status)); return (atomic_read(&s_t_mc3xxx_open_status)); } @@ -2726,7 +2726,7 @@ static ssize_t show_regiter_map(struct device_driver *ddri, char *buf) static ssize_t store_regiter_map(struct device_driver *ddri, const char *buf, size_t count) { // reserved - //GSE_LOG("[%s] buf[0]: 0x%02X\n", __FUNCTION__, buf[0]); + //GSE_LOG("[%s] buf[0]: 0x%02X\n", __func__, buf[0]); return count; } @@ -2739,7 +2739,7 @@ static ssize_t show_chip_orientation(struct device_driver *ptDevDrv, char *pbBuf ssize_t _tLength = 0; struct acc_hw *_ptAccelHw = mc3xxx_get_cust_acc_hw(); - GSE_LOG("[%s] default direction: %d\n", __FUNCTION__, _ptAccelHw->direction); + GSE_LOG("[%s] default direction: %d\n", __func__, _ptAccelHw->direction); _tLength = snprintf(pbBuf, PAGE_SIZE, "default direction = %d\n", _ptAccelHw->direction); @@ -2763,7 +2763,7 @@ static ssize_t store_chip_orientation(struct device_driver *ptDevDrv, const char GSE_ERR("ERR: fail to set direction\n"); } - GSE_LOG("[%s] set direction: %d\n", __FUNCTION__, _nDirection); + GSE_LOG("[%s] set direction: %d\n", __func__, _nDirection); return (tCount); } @@ -2807,7 +2807,7 @@ static ssize_t show_selfcheck_value(struct device_driver *ptDevDriver, char *pbB { struct i2c_client *_pt_i2c_client = mc3xxx_i2c_client; - //GSE_LOG("[%s] 0x%02X\n", __FUNCTION__, pbBuf[0]); + //GSE_LOG("[%s] 0x%02X\n", __func__, pbBuf[0]); MC3XXX_MUTEX_LOCK(); MC3XXX_SelfCheck(_pt_i2c_client, pbBuf); @@ -2823,7 +2823,7 @@ static ssize_t show_selfcheck_value(struct device_driver *ptDevDriver, char *pbB static ssize_t store_selfcheck_value(struct device_driver *ddri, const char *buf, size_t count) { // reserved - //GSE_LOG("[%s] buf[0]: 0x%02X\n", __FUNCTION__, buf[0]); + //GSE_LOG("[%s] buf[0]: 0x%02X\n", __func__, buf[0]); return count; } @@ -3767,7 +3767,7 @@ _I2C_AUTO_PROBE_RECHECK_: { client->addr = mc3xxx_i2c_auto_probe_addr[_nCount]; - //GSE_LOG("[%s][%d] probing addr: 0x%X\n", __FUNCTION__, _nCount, client->addr); + //GSE_LOG("[%s][%d] probing addr: 0x%X\n", __func__, _nCount, client->addr); _baData1Buf[0] = 0x3B; if (0 > i2c_master_send(client, &(_baData1Buf[0]), 1)) @@ -3784,7 +3784,7 @@ _I2C_AUTO_PROBE_RECHECK_: _naCheckCount[_nCount]++; - //GSE_LOG("[%s][%d] addr: 0x%X ok to read REG(0x3B): 0x%X\n", __FUNCTION__, _nCount, client->addr, _baData1Buf[0]); + //GSE_LOG("[%s][%d] addr: 0x%X ok to read REG(0x3B): 0x%X\n", __func__, _nCount, client->addr, _baData1Buf[0]); if (0x00 == _baData1Buf[0]) { @@ -3813,7 +3813,7 @@ _I2C_AUTO_PROBE_RECHECK_: MC3XXX_SaveDefaultOffset(client); - //GSE_LOG("[%s] addr: 0x%X confirmed ok to use. s_bPCODE: 0x%02X, s_bHWID: 0x%02X\n", __FUNCTION__, client->addr, s_bPCODE, s_bHWID); + //GSE_LOG("[%s] addr: 0x%X confirmed ok to use. s_bPCODE: 0x%02X, s_bHWID: 0x%02X\n", __func__, client->addr, s_bPCODE, s_bHWID); return (MC3XXX_RETCODE_SUCCESS); } @@ -3897,7 +3897,7 @@ static int mc3xxx_i2c_probe(struct i2c_client *client, const struct i2c_device_i goto exit_init_failed; } - GSE_LOG("[%s] 2nd confirmed i2c addr: 0x%X\n", __FUNCTION__, client->addr); + GSE_LOG("[%s] 2nd confirmed i2c addr: 0x%X\n", __func__, client->addr); hwmsen_read_block(client, 0x21, offset_buf, 6); diff --git a/drivers/misc/mediatek/accelerometer/mpu6050g-new/mpu6050.c b/drivers/misc/mediatek/accelerometer/mpu6050g-new/mpu6050.c index 59c8195d3..3b28b31b9 100644 --- a/drivers/misc/mediatek/accelerometer/mpu6050g-new/mpu6050.c +++ b/drivers/misc/mediatek/accelerometer/mpu6050g-new/mpu6050.c @@ -163,8 +163,8 @@ static char selftestRes[8]= {0}; /*----------------------------------------------------------------------------*/ #define GSE_TAG "[Gsensor] " -#define GSE_FUN(f) printk(KERN_ERR GSE_TAG"%s\n", __FUNCTION__) -#define GSE_ERR(fmt, args...) printk(KERN_ERR GSE_TAG"%s %d : "fmt, __FUNCTION__, __LINE__, ##args) +#define GSE_FUN(f) printk(KERN_ERR GSE_TAG"%s\n", __func__) +#define GSE_ERR(fmt, args...) printk(KERN_ERR GSE_TAG"%s %d : "fmt, __func__, __LINE__, ##args) #define GSE_LOG(fmt, args...) printk(KERN_ERR GSE_TAG fmt, ##args) /*----------------------------------------------------------------------------*/ static struct data_resolution mpu6050_data_resolution[] = { diff --git a/drivers/misc/mediatek/accelerometer/mpu6050g/mpu6050.c b/drivers/misc/mediatek/accelerometer/mpu6050g/mpu6050.c index df4e6cc8c..97378a599 100644 --- a/drivers/misc/mediatek/accelerometer/mpu6050g/mpu6050.c +++ b/drivers/misc/mediatek/accelerometer/mpu6050g/mpu6050.c @@ -153,8 +153,8 @@ static char selftestRes[8]= {0}; /*----------------------------------------------------------------------------*/ #define GSE_TAG "[Gsensor] " -#define GSE_FUN(f) printk(GSE_TAG"%s\n", __FUNCTION__) -#define GSE_ERR(fmt, args...) printk(GSE_TAG"%s %d : "fmt, __FUNCTION__, __LINE__, ##args) +#define GSE_FUN(f) printk(GSE_TAG"%s\n", __func__) +#define GSE_ERR(fmt, args...) printk(GSE_TAG"%s %d : "fmt, __func__, __LINE__, ##args) #define GSE_LOG(fmt, args...) printk(GSE_TAG fmt, ##args) /*----------------------------------------------------------------------------*/ static struct data_resolution mpu6050_data_resolution[] = { diff --git a/drivers/misc/mediatek/accelerometer/mpu60x0/mpu60x0.c b/drivers/misc/mediatek/accelerometer/mpu60x0/mpu60x0.c index d97fc0bc3..ebb0c358d 100644 --- a/drivers/misc/mediatek/accelerometer/mpu60x0/mpu60x0.c +++ b/drivers/misc/mediatek/accelerometer/mpu60x0/mpu60x0.c @@ -163,8 +163,8 @@ struct mpu6050c_acc_i2c_data *mpu6050c_obj_i2c_data = NULL; /*----------------------------------------------------------------------------*/ #define GSE_TAG "[Gsensor] " -#define GSE_FUN(f) printk(KERN_INFO GSE_TAG"%s\n", __FUNCTION__) -#define GSE_ERR(fmt, args...) printk(KERN_ERR GSE_TAG"%s %d : "fmt, __FUNCTION__, __LINE__, ##args) +#define GSE_FUN(f) printk(KERN_INFO GSE_TAG"%s\n", __func__) +#define GSE_ERR(fmt, args...) printk(KERN_ERR GSE_TAG"%s %d : "fmt, __func__, __LINE__, ##args) #define GSE_LOG(fmt, args...) printk(KERN_INFO GSE_TAG fmt, ##args) /*----------------------------------------------------------------------------*/ /* diff --git a/drivers/misc/mediatek/accelerometer/mpu6515/mpu6515.c b/drivers/misc/mediatek/accelerometer/mpu6515/mpu6515.c index ab5605376..b2fc78df6 100644 --- a/drivers/misc/mediatek/accelerometer/mpu6515/mpu6515.c +++ b/drivers/misc/mediatek/accelerometer/mpu6515/mpu6515.c @@ -182,8 +182,8 @@ static struct acc_init_info mpu6515_init_info = { /*----------------------------------------------------------------------------*/ #define GSE_TAG "[Gsensor] " -#define GSE_FUN(f) printk(GSE_TAG"%s\n", __FUNCTION__) -#define GSE_ERR(fmt, args...) printk(GSE_TAG"%s %d : "fmt, __FUNCTION__, __LINE__, ##args) +#define GSE_FUN(f) printk(GSE_TAG"%s\n", __func__) +#define GSE_ERR(fmt, args...) printk(GSE_TAG"%s %d : "fmt, __func__, __LINE__, ##args) #define GSE_LOG(fmt, args...) printk(GSE_TAG fmt, ##args) /*----------------------------------------------------------------------------*/ static struct data_resolution mpu6515_data_resolution[] = { diff --git a/drivers/misc/mediatek/accelerometer/mxc400x-new/mxc400x.c b/drivers/misc/mediatek/accelerometer/mxc400x-new/mxc400x.c index 0b8d31c7f..84038b5ba 100644 --- a/drivers/misc/mediatek/accelerometer/mxc400x-new/mxc400x.c +++ b/drivers/misc/mediatek/accelerometer/mxc400x-new/mxc400x.c @@ -179,8 +179,8 @@ extern struct acc_hw* get_cust_acc_hw(void); #ifdef DEBUG #define GSE_TAG "[Gsensor] " -#define GSE_FUN(f) printk(GSE_TAG"%s\n", __FUNCTION__) -#define GSE_ERR(fmt, args...) printk(KERN_ERR GSE_TAG"%s %d : "fmt, __FUNCTION__, __LINE__, ##args) +#define GSE_FUN(f) printk(GSE_TAG"%s\n", __func__) +#define GSE_ERR(fmt, args...) printk(KERN_ERR GSE_TAG"%s %d : "fmt, __func__, __LINE__, ##args) #define GSE_LOG(fmt, args...) printk(GSE_TAG fmt, ##args) #else #define GSE_TAG @@ -510,7 +510,7 @@ char cust_i2c_write_bytes(unsigned char addr, unsigned char regaddr, unsigned ch res = cust_i2c_get_ack(); if(0 != res) { - printk("MXC400X cust_i2c_write_bytes reg data error \n",__FUNCTION__,__LINE__); + printk("MXC400X cust_i2c_write_bytes reg data error \n",__func__,__LINE__); return -1; } } @@ -1946,7 +1946,7 @@ static long mxc400x_compat_ioctl(struct file *file, unsigned int cmd, } break; default: - printk(KERN_ERR "%s not supported = 0x%04x", __FUNCTION__, cmd); + printk(KERN_ERR "%s not supported = 0x%04x", __func__, cmd); return -ENOIOCTLCMD; break; } |