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/input/touchscreen/mediatek/synaptics_3320 | |
| parent | fa4d1db09a4946ad8ba42514687c6b8a3603d623 (diff) | |
| download | android_kernel_m2note-b8d1e07edc8d57883bf4b6ca70228b5a9e6b98b2.tar.gz | |
misc: replace __FUNCTION__ by __function__
result of :
git grep -l '__FUNCTION__' | xargs sed -i 's/__FUNCTION__/__func__/g'
Diffstat (limited to 'drivers/input/touchscreen/mediatek/synaptics_3320')
5 files changed, 25 insertions, 25 deletions
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++) |
