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/imgsensor/src | |
| 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/imgsensor/src')
52 files changed, 79 insertions, 79 deletions
diff --git a/drivers/misc/mediatek/imgsensor/src/mt6735/gc0310_yuv/gc0310_yuv_Sensor.c b/drivers/misc/mediatek/imgsensor/src/mt6735/gc0310_yuv/gc0310_yuv_Sensor.c index 57ce8596a..c0d29c19d 100644 --- a/drivers/misc/mediatek/imgsensor/src/mt6735/gc0310_yuv/gc0310_yuv_Sensor.c +++ b/drivers/misc/mediatek/imgsensor/src/mt6735/gc0310_yuv/gc0310_yuv_Sensor.c @@ -64,7 +64,7 @@ static DEFINE_SPINLOCK(GC0310_drv_lock); #define LOG_1 LOG_INF("GC0310,SERIAL CAM\n") /**************************** Modify end *******************************************/ -#define LOG_INF(format, args...) pr_debug(PFX "[%s] " format, __FUNCTION__, ##args) +#define LOG_INF(format, args...) pr_debug(PFX "[%s] " format, __func__, ##args) #define GC0310_TEST_PATTERN_CHECKSUM (0x9db2de6e) diff --git a/drivers/misc/mediatek/imgsensor/src/mt6735/gc2145_mipi_yuv/gc2145mipi_yuv_Sensor.c b/drivers/misc/mediatek/imgsensor/src/mt6735/gc2145_mipi_yuv/gc2145mipi_yuv_Sensor.c index 46359e3ff..60ec52e8c 100644 --- a/drivers/misc/mediatek/imgsensor/src/mt6735/gc2145_mipi_yuv/gc2145mipi_yuv_Sensor.c +++ b/drivers/misc/mediatek/imgsensor/src/mt6735/gc2145_mipi_yuv/gc2145mipi_yuv_Sensor.c @@ -181,7 +181,7 @@ static u32 strtol(const char *nptr, u8 base) u8 ret; if(!nptr || (base!=16 && base!=10 && base!=8)) { - printk("gc2145mipi %s(): NULL pointer input\n", __FUNCTION__); + printk("gc2145mipi %s(): NULL pointer input\n", __func__); return -1; } for(ret=0; *nptr; nptr++) diff --git a/drivers/misc/mediatek/imgsensor/src/mt6735/gc2355_mipi_raw/gc2355mipi_Sensor.c b/drivers/misc/mediatek/imgsensor/src/mt6735/gc2355_mipi_raw/gc2355mipi_Sensor.c index cbdcdc375..7131fca97 100644 --- a/drivers/misc/mediatek/imgsensor/src/mt6735/gc2355_mipi_raw/gc2355mipi_Sensor.c +++ b/drivers/misc/mediatek/imgsensor/src/mt6735/gc2355_mipi_raw/gc2355mipi_Sensor.c @@ -41,7 +41,7 @@ #define LOG_2 LOG_INF("preview 1280*960@30fps,864Mbps/lane; video 1280*960@30fps,864Mbps/lane; capture 5M@30fps,864Mbps/lane\n") /**************************** Modify end *******************************************/ -#define LOG_INF(format, args...) pr_debug(PFX "[%s] " format, __FUNCTION__, ##args) +#define LOG_INF(format, args...) pr_debug(PFX "[%s] " format, __func__, ##args) static DEFINE_SPINLOCK(imgsensor_drv_lock); diff --git a/drivers/misc/mediatek/imgsensor/src/mt6735/hi545_mipi_raw/hi545mipi_Sensor.c b/drivers/misc/mediatek/imgsensor/src/mt6735/hi545_mipi_raw/hi545mipi_Sensor.c index 083c42e9b..081ee9606 100644 --- a/drivers/misc/mediatek/imgsensor/src/mt6735/hi545_mipi_raw/hi545mipi_Sensor.c +++ b/drivers/misc/mediatek/imgsensor/src/mt6735/hi545_mipi_raw/hi545mipi_Sensor.c @@ -45,7 +45,7 @@ extern void kdSetI2CSpeed(u32 i2cSpeed); #define LOG_2 LOG_INF("preview 1296*972@30fps; video 1296*972@30fps; capture 5M@30fps\n") /**************************** Modify end *******************************************/ -#define LOG_INF(format, args...) pr_debug(PFX "[%s] " format, __FUNCTION__, ##args) +#define LOG_INF(format, args...) pr_debug(PFX "[%s] " format, __func__, ##args) #define USE_I2C_400K 1 diff --git a/drivers/misc/mediatek/imgsensor/src/mt6735/imx135_mipi_raw/imx135_otp.c b/drivers/misc/mediatek/imgsensor/src/mt6735/imx135_mipi_raw/imx135_otp.c index c598594ce..fd5e1940e 100644 --- a/drivers/misc/mediatek/imgsensor/src/mt6735/imx135_mipi_raw/imx135_otp.c +++ b/drivers/misc/mediatek/imgsensor/src/mt6735/imx135_mipi_raw/imx135_otp.c @@ -34,7 +34,7 @@ After finishing the OTP written, we will provide you the golden_rg and golden_bg #include <linux/xlog.h> #define PFX "imx135_otp" -#define LOG_INF(format, args...) pr_debug(PFX "[%s] " format, __FUNCTION__, ##args) +#define LOG_INF(format, args...) pr_debug(PFX "[%s] " format, __func__, ##args) //#include "imx135_otp.h" diff --git a/drivers/misc/mediatek/imgsensor/src/mt6735/imx135_mipi_raw/imx135mipiraw_Sensor.c b/drivers/misc/mediatek/imgsensor/src/mt6735/imx135_mipi_raw/imx135mipiraw_Sensor.c index 674c6ead8..bf2c21214 100644 --- a/drivers/misc/mediatek/imgsensor/src/mt6735/imx135_mipi_raw/imx135mipiraw_Sensor.c +++ b/drivers/misc/mediatek/imgsensor/src/mt6735/imx135_mipi_raw/imx135mipiraw_Sensor.c @@ -45,7 +45,7 @@ #define LOG_2 LOG_INF("preview 2096*1554@30fps,864Mbps/lane; video 4196*3108@30fps,864Mbps/lane; capture 13M@30fps,864Mbps/lane\n") /**************************** Modify end *******************************************/ -#define LOG_INF(format, args...) pr_debug(PFX "[%s] " format, __FUNCTION__, ##args) +#define LOG_INF(format, args...) pr_debug(PFX "[%s] " format, __func__, ##args) static DEFINE_SPINLOCK(imgsensor_drv_lock); diff --git a/drivers/misc/mediatek/imgsensor/src/mt6735/imx135_mipi_raw_5mp/imx135_otp.c b/drivers/misc/mediatek/imgsensor/src/mt6735/imx135_mipi_raw_5mp/imx135_otp.c index c598594ce..fd5e1940e 100644 --- a/drivers/misc/mediatek/imgsensor/src/mt6735/imx135_mipi_raw_5mp/imx135_otp.c +++ b/drivers/misc/mediatek/imgsensor/src/mt6735/imx135_mipi_raw_5mp/imx135_otp.c @@ -34,7 +34,7 @@ After finishing the OTP written, we will provide you the golden_rg and golden_bg #include <linux/xlog.h> #define PFX "imx135_otp" -#define LOG_INF(format, args...) pr_debug(PFX "[%s] " format, __FUNCTION__, ##args) +#define LOG_INF(format, args...) pr_debug(PFX "[%s] " format, __func__, ##args) //#include "imx135_otp.h" diff --git a/drivers/misc/mediatek/imgsensor/src/mt6735/imx135_mipi_raw_5mp/imx135mipiraw_Sensor.c b/drivers/misc/mediatek/imgsensor/src/mt6735/imx135_mipi_raw_5mp/imx135mipiraw_Sensor.c index ff7bf8f04..705da9bf3 100644 --- a/drivers/misc/mediatek/imgsensor/src/mt6735/imx135_mipi_raw_5mp/imx135mipiraw_Sensor.c +++ b/drivers/misc/mediatek/imgsensor/src/mt6735/imx135_mipi_raw_5mp/imx135mipiraw_Sensor.c @@ -45,7 +45,7 @@ #define LOG_2 LOG_INF("preview 1280*960@30fps; video 2560*1920@30fps; capture 5M@30fps\n") /**************************** Modify end *******************************************/ -#define LOG_INF(format, args...) pr_debug(PFX "[%s] " format, __FUNCTION__, ##args) +#define LOG_INF(format, args...) pr_debug(PFX "[%s] " format, __func__, ##args) static DEFINE_SPINLOCK(imgsensor_drv_lock); diff --git a/drivers/misc/mediatek/imgsensor/src/mt6735/imx214_mipi_raw/imx214mipiraw_Sensor.c b/drivers/misc/mediatek/imgsensor/src/mt6735/imx214_mipi_raw/imx214mipiraw_Sensor.c index b86507b18..45691610f 100644 --- a/drivers/misc/mediatek/imgsensor/src/mt6735/imx214_mipi_raw/imx214mipiraw_Sensor.c +++ b/drivers/misc/mediatek/imgsensor/src/mt6735/imx214_mipi_raw/imx214mipiraw_Sensor.c @@ -37,7 +37,7 @@ #include "imx214mipiraw_Sensor.h" #define PFX "IMX214_camera_sensor" -#define LOG_INF(format, args...) pr_debug(PFX "[%s] " format, __FUNCTION__, ##args) +#define LOG_INF(format, args...) pr_debug(PFX "[%s] " format, __func__, ##args) static DEFINE_SPINLOCK(imgsensor_drv_lock); diff --git a/drivers/misc/mediatek/imgsensor/src/mt6735/imx219_mipi_raw/imx219mipiraw_Sensor.c b/drivers/misc/mediatek/imgsensor/src/mt6735/imx219_mipi_raw/imx219mipiraw_Sensor.c index 4d9d3cb7d..3bf8ad61b 100644 --- a/drivers/misc/mediatek/imgsensor/src/mt6735/imx219_mipi_raw/imx219mipiraw_Sensor.c +++ b/drivers/misc/mediatek/imgsensor/src/mt6735/imx219_mipi_raw/imx219mipiraw_Sensor.c @@ -42,7 +42,7 @@ #define LOG_2 LOG_INF("preview 1280*960@30fps,864Mbps/lane; video 1280*960@30fps,864Mbps/lane; capture 5M@30fps,864Mbps/lane\n") /**************************** Modify end *******************************************/ -#define LOG_INF(format, args...) pr_debug(PFX "[%s] " format, __FUNCTION__, ##args) +#define LOG_INF(format, args...) pr_debug(PFX "[%s] " format, __func__, ##args) static DEFINE_SPINLOCK(imgsensor_drv_lock); diff --git a/drivers/misc/mediatek/imgsensor/src/mt6735/kd_sensorlist.c b/drivers/misc/mediatek/imgsensor/src/mt6735/kd_sensorlist.c index 05c41a56c..d69c282c1 100644 --- a/drivers/misc/mediatek/imgsensor/src/mt6735/kd_sensorlist.c +++ b/drivers/misc/mediatek/imgsensor/src/mt6735/kd_sensorlist.c @@ -79,7 +79,7 @@ static struct i2c_board_info i2c_devs2 __initdata = {I2C_BOARD_INFO(CAMERA_HW_DR #define PFX "[kd_sensorlist]" #define PK_DBG_NONE(fmt, arg...) do {} while (0) #define PK_DBG_FUNC(fmt, arg...) pr_debug(fmt, ##arg) -#define PK_INF(fmt, args...) pr_debug(PFX "[%s] " fmt, __FUNCTION__, ##args) +#define PK_INF(fmt, args...) pr_debug(PFX "[%s] " fmt, __func__, ##args) #undef DEBUG_CAMERA_HW_K /* #define DEBUG_CAMERA_HW_K */ @@ -670,8 +670,8 @@ int iWriteRegI2C(u8 *a_pSendData , u16 a_sizeSendData, u16 i2cId) /******************************************************************************* * sensor function adapter ********************************************************************************/ -#define KD_MULTI_FUNCTION_ENTRY() /* PK_XLOG_INFO("[%s]:E\n",__FUNCTION__) */ -#define KD_MULTI_FUNCTION_EXIT() /* PK_XLOG_INFO("[%s]:X\n",__FUNCTION__) */ +#define KD_MULTI_FUNCTION_ENTRY() /* PK_XLOG_INFO("[%s]:E\n",__func__) */ +#define KD_MULTI_FUNCTION_EXIT() /* PK_XLOG_INFO("[%s]:X\n",__func__) */ /* */ MUINT32 kdSetI2CSlaveID(MINT32 i, MUINT32 socketIdx, MUINT32 firstSet) { @@ -1033,7 +1033,7 @@ u32 i = 0; for (i = KDIMGSENSOR_INVOKE_DRIVER_0; i < KDIMGSENSOR_MAX_INVOKE_DRIVERS; i++) { if (g_bEnableDriver[i]) { - /* PK_XLOG_INFO("[%s][%d][%d][%s][%s]\r\n",__FUNCTION__,g_bEnableDriver[i],socketIdx[i],sensorNameStr[i],mode_name); */ + /* PK_XLOG_INFO("[%s][%d][%d][%s][%s]\r\n",__func__,g_bEnableDriver[i],socketIdx[i],sensorNameStr[i],mode_name); */ #ifndef CONFIG_FPGA_EARLY_PORTING ret = kdCISModulePowerOn(socketIdx[i], sensorNameStr[i], On, mode_name); #endif diff --git a/drivers/misc/mediatek/imgsensor/src/mt6735/ov2680_mipi_raw/ov2680mipi_Sensor.c b/drivers/misc/mediatek/imgsensor/src/mt6735/ov2680_mipi_raw/ov2680mipi_Sensor.c index 2fa3dc165..922f1ff65 100644 --- a/drivers/misc/mediatek/imgsensor/src/mt6735/ov2680_mipi_raw/ov2680mipi_Sensor.c +++ b/drivers/misc/mediatek/imgsensor/src/mt6735/ov2680_mipi_raw/ov2680mipi_Sensor.c @@ -41,7 +41,7 @@ #define LOG_1 LOG_INF("OV2680,MIPI 1LANE\n") #define LOG_2 LOG_INF("preview 1600*1200@30fps,600Mbps/lane; video 1600*1200@30fps,600Mbps/lane; 1600*1200@30fps,600Mbps/lane\n") /**************************** Modify end *******************************************/ -#define LOG_INF(format, args...) pr_debug(PFX "[%s] " format, __FUNCTION__, ##args) +#define LOG_INF(format, args...) pr_debug(PFX "[%s] " format, __func__, ##args) static DEFINE_SPINLOCK(imgsensor_drv_lock); diff --git a/drivers/misc/mediatek/imgsensor/src/mt6735/ov5648_mipi_raw/ov5648mipi_Sensor.c b/drivers/misc/mediatek/imgsensor/src/mt6735/ov5648_mipi_raw/ov5648mipi_Sensor.c index cd202af90..a6a4b2320 100644 --- a/drivers/misc/mediatek/imgsensor/src/mt6735/ov5648_mipi_raw/ov5648mipi_Sensor.c +++ b/drivers/misc/mediatek/imgsensor/src/mt6735/ov5648_mipi_raw/ov5648mipi_Sensor.c @@ -42,7 +42,7 @@ #define LOG_2 LOG_INF("preview 1280*960@30fps,420Mbps/lane; video 1280*960@30fps,420Mbps/lane; capture 5M@15fps,420Mbps/lane\n") /**************************** Modify end *******************************************/ -#define LOG_INF(format, args...) pr_debug(PFX "[%s] " format, __FUNCTION__, ##args) +#define LOG_INF(format, args...) pr_debug(PFX "[%s] " format, __func__, ##args) static DEFINE_SPINLOCK(imgsensor_drv_lock); diff --git a/drivers/misc/mediatek/imgsensor/src/mt6735/s5k2p8_mipi_raw/s5k2p8mipi_Sensor.c b/drivers/misc/mediatek/imgsensor/src/mt6735/s5k2p8_mipi_raw/s5k2p8mipi_Sensor.c index 7584bfebe..b7e27078b 100644 --- a/drivers/misc/mediatek/imgsensor/src/mt6735/s5k2p8_mipi_raw/s5k2p8mipi_Sensor.c +++ b/drivers/misc/mediatek/imgsensor/src/mt6735/s5k2p8_mipi_raw/s5k2p8mipi_Sensor.c @@ -39,8 +39,8 @@ #define PFX "S5K2P8_camera_sensor" #define LOG_1 LOG_INF("S5K2P8,MIPI 4LANE\n") #define LOG_2 LOG_INF("preview 2664*1500@30fps,888Mbps/lane; video 5328*3000@30fps,1390Mbps/lane; capture 16M@30fps,1390Mbps/lane\n") -#define LOG_INF(format, args...) pr_debug(PFX "[%s] " format, __FUNCTION__, ##args) -#define LOGE(format, args...) pr_err(PFX "[%s] " format, __FUNCTION__, ##args) +#define LOG_INF(format, args...) pr_debug(PFX "[%s] " format, __func__, ##args) +#define LOGE(format, args...) pr_err(PFX "[%s] " format, __func__, ##args) static DEFINE_SPINLOCK(imgsensor_drv_lock); diff --git a/drivers/misc/mediatek/imgsensor/src/mt6735m/gc0310_yuv/gc0310_yuv_Sensor.c b/drivers/misc/mediatek/imgsensor/src/mt6735m/gc0310_yuv/gc0310_yuv_Sensor.c index 57ce8596a..c0d29c19d 100644 --- a/drivers/misc/mediatek/imgsensor/src/mt6735m/gc0310_yuv/gc0310_yuv_Sensor.c +++ b/drivers/misc/mediatek/imgsensor/src/mt6735m/gc0310_yuv/gc0310_yuv_Sensor.c @@ -64,7 +64,7 @@ static DEFINE_SPINLOCK(GC0310_drv_lock); #define LOG_1 LOG_INF("GC0310,SERIAL CAM\n") /**************************** Modify end *******************************************/ -#define LOG_INF(format, args...) pr_debug(PFX "[%s] " format, __FUNCTION__, ##args) +#define LOG_INF(format, args...) pr_debug(PFX "[%s] " format, __func__, ##args) #define GC0310_TEST_PATTERN_CHECKSUM (0x9db2de6e) diff --git a/drivers/misc/mediatek/imgsensor/src/mt6735m/gc2145_mipi_yuv/gc2145mipi_yuv_Sensor.c b/drivers/misc/mediatek/imgsensor/src/mt6735m/gc2145_mipi_yuv/gc2145mipi_yuv_Sensor.c index 927a00aff..9e5049190 100644 --- a/drivers/misc/mediatek/imgsensor/src/mt6735m/gc2145_mipi_yuv/gc2145mipi_yuv_Sensor.c +++ b/drivers/misc/mediatek/imgsensor/src/mt6735m/gc2145_mipi_yuv/gc2145mipi_yuv_Sensor.c @@ -185,7 +185,7 @@ static u32 strtol(const char *nptr, u8 base) u8 ret; if(!nptr || (base!=16 && base!=10 && base!=8)) { - SENSORDB("GC2145MIPI %s(): NULL pointer input\n", __FUNCTION__); + SENSORDB("GC2145MIPI %s(): NULL pointer input\n", __func__); return -1; } for(ret=0; *nptr; nptr++) diff --git a/drivers/misc/mediatek/imgsensor/src/mt6735m/gc2355_mipi_raw/gc2355mipi_Sensor.c b/drivers/misc/mediatek/imgsensor/src/mt6735m/gc2355_mipi_raw/gc2355mipi_Sensor.c index 08ec2d1da..53166a75a 100644 --- a/drivers/misc/mediatek/imgsensor/src/mt6735m/gc2355_mipi_raw/gc2355mipi_Sensor.c +++ b/drivers/misc/mediatek/imgsensor/src/mt6735m/gc2355_mipi_raw/gc2355mipi_Sensor.c @@ -41,7 +41,7 @@ #define LOG_2 LOG_INF("preview 1280*960@30fps,864Mbps/lane; video 1280*960@30fps,864Mbps/lane; capture 5M@30fps,864Mbps/lane\n") /**************************** Modify end *******************************************/ -#define LOG_INF(format, args...) pr_debug(PFX "[%s] " format, __FUNCTION__, ##args) +#define LOG_INF(format, args...) pr_debug(PFX "[%s] " format, __func__, ##args) static DEFINE_SPINLOCK(imgsensor_drv_lock); diff --git a/drivers/misc/mediatek/imgsensor/src/mt6735m/imx135_mipi_raw/imx135_otp.c b/drivers/misc/mediatek/imgsensor/src/mt6735m/imx135_mipi_raw/imx135_otp.c index 77ffde5f3..6afa29d9d 100644 --- a/drivers/misc/mediatek/imgsensor/src/mt6735m/imx135_mipi_raw/imx135_otp.c +++ b/drivers/misc/mediatek/imgsensor/src/mt6735m/imx135_mipi_raw/imx135_otp.c @@ -34,7 +34,7 @@ After finishing the OTP written, we will provide you the golden_rg and golden_bg #include <linux/xlog.h> #define PFX "imx135_otp" -#define LOG_INF(format, args...) pr_debug(PFX "[%s] " format, __FUNCTION__, ##args) +#define LOG_INF(format, args...) pr_debug(PFX "[%s] " format, __func__, ##args) //#include "imx135_otp.h" diff --git a/drivers/misc/mediatek/imgsensor/src/mt6735m/imx135_mipi_raw/imx135mipiraw_Sensor.c b/drivers/misc/mediatek/imgsensor/src/mt6735m/imx135_mipi_raw/imx135mipiraw_Sensor.c index e0dce924f..b9e21c99a 100644 --- a/drivers/misc/mediatek/imgsensor/src/mt6735m/imx135_mipi_raw/imx135mipiraw_Sensor.c +++ b/drivers/misc/mediatek/imgsensor/src/mt6735m/imx135_mipi_raw/imx135mipiraw_Sensor.c @@ -45,7 +45,7 @@ #define LOG_2 LOG_INF("preview 2096*1554@30fps,864Mbps/lane; video 4196*3108@30fps,864Mbps/lane; capture 13M@30fps,864Mbps/lane\n") /**************************** Modify end *******************************************/ -#define LOG_INF(format, args...) pr_debug(PFX "[%s] " format, __FUNCTION__, ##args) +#define LOG_INF(format, args...) pr_debug(PFX "[%s] " format, __func__, ##args) static DEFINE_SPINLOCK(imgsensor_drv_lock); diff --git a/drivers/misc/mediatek/imgsensor/src/mt6735m/imx179_mipi_raw/imx179mipiraw_Sensor.c b/drivers/misc/mediatek/imgsensor/src/mt6735m/imx179_mipi_raw/imx179mipiraw_Sensor.c index 403d6e548..6acdcd6bb 100644 --- a/drivers/misc/mediatek/imgsensor/src/mt6735m/imx179_mipi_raw/imx179mipiraw_Sensor.c +++ b/drivers/misc/mediatek/imgsensor/src/mt6735m/imx179_mipi_raw/imx179mipiraw_Sensor.c @@ -41,7 +41,7 @@ #define LOG_1 LOG_INF("IMX179,MIPI 4LANE\n") #define LOG_2 LOG_INF("preview 1640*1232@30fps,256Mbps/lane; video 3280*2464@30fps,256Mbps/lane; capture 8M@30fps,256MbpsMbps/lane\n") /**************************** Modify end *******************************************/ -#define LOG_INF(format, args...) pr_debug(PFX "[%s] " format, __FUNCTION__, ##args) +#define LOG_INF(format, args...) pr_debug(PFX "[%s] " format, __func__, ##args) static DEFINE_SPINLOCK(imgsensor_drv_lock); static kal_uint8 test_pattern_flag=0; diff --git a/drivers/misc/mediatek/imgsensor/src/mt6735m/imx214_mipi_raw/imx214mipiraw_Sensor.c b/drivers/misc/mediatek/imgsensor/src/mt6735m/imx214_mipi_raw/imx214mipiraw_Sensor.c index 50b490947..2dcb9e5b1 100644 --- a/drivers/misc/mediatek/imgsensor/src/mt6735m/imx214_mipi_raw/imx214mipiraw_Sensor.c +++ b/drivers/misc/mediatek/imgsensor/src/mt6735m/imx214_mipi_raw/imx214mipiraw_Sensor.c @@ -37,7 +37,7 @@ #include "imx214mipiraw_Sensor.h" #define PFX "IMX214_camera_sensor" -#define LOG_INF(format, args...) pr_debug(PFX "[%s] " format, __FUNCTION__, ##args) +#define LOG_INF(format, args...) pr_debug(PFX "[%s] " format, __func__, ##args) static DEFINE_SPINLOCK(imgsensor_drv_lock); diff --git a/drivers/misc/mediatek/imgsensor/src/mt6735m/imx219_mipi_raw/imx219mipiraw_Sensor.c b/drivers/misc/mediatek/imgsensor/src/mt6735m/imx219_mipi_raw/imx219mipiraw_Sensor.c index 8027bda55..8c4e500c2 100644 --- a/drivers/misc/mediatek/imgsensor/src/mt6735m/imx219_mipi_raw/imx219mipiraw_Sensor.c +++ b/drivers/misc/mediatek/imgsensor/src/mt6735m/imx219_mipi_raw/imx219mipiraw_Sensor.c @@ -47,7 +47,7 @@ extern int read_imx219_eeprom_mtk_fmt(void); #define LOG_2 LOG_INF("preview 1280*960@30fps,864Mbps/lane; video 1280*960@30fps,864Mbps/lane; capture 5M@30fps,864Mbps/lane\n") /**************************** Modify end *******************************************/ -#define LOG_INF(format, args...) pr_debug(PFX "[%s] " format, __FUNCTION__, ##args) +#define LOG_INF(format, args...) pr_debug(PFX "[%s] " format, __func__, ##args) static DEFINE_SPINLOCK(imgsensor_drv_lock); diff --git a/drivers/misc/mediatek/imgsensor/src/mt6735m/kd_sensorlist.c b/drivers/misc/mediatek/imgsensor/src/mt6735m/kd_sensorlist.c index d9d51d8f0..cb9559fc6 100644 --- a/drivers/misc/mediatek/imgsensor/src/mt6735m/kd_sensorlist.c +++ b/drivers/misc/mediatek/imgsensor/src/mt6735m/kd_sensorlist.c @@ -78,21 +78,21 @@ static struct i2c_board_info i2c_devs2 __initdata = {I2C_BOARD_INFO(CAMERA_HW_DR ******************************************************************************/ #define PFX "[kd_sensorlist]" #define PK_DBG_NONE(fmt, arg...) do {} while (0) -#define PK_DBG_FUNC(fmt, arg...) pr_debug(PFX "[%s] " fmt,__FUNCTION__, ##arg) -#define PK_INFO(fmt, arg...) pr_debug(PFX " [%s] " fmt,__FUNCTION__, ##arg) +#define PK_DBG_FUNC(fmt, arg...) pr_debug(PFX "[%s] " fmt,__func__, ##arg) +#define PK_INFO(fmt, arg...) pr_debug(PFX " [%s] " fmt,__func__, ##arg) #undef DEBUG_CAMERA_HW_K //#define DEBUG_CAMERA_HW_K #ifdef DEBUG_CAMERA_HW_K #define PK_DBG PK_DBG_FUNC -#define PK_ERR(fmt, arg...) pr_err(PFX "[%s] " fmt,__FUNCTION__, ##arg) +#define PK_ERR(fmt, arg...) pr_err(PFX "[%s] " fmt,__func__, ##arg) #define PK_XLOG_INFO(fmt, args...) \ do { \ pr_debug(fmt, ##args); \ } while (0) #else #define PK_DBG(a, ...) -#define PK_ERR(fmt, arg...) pr_err(PFX "[%s] " fmt,__FUNCTION__, ##arg) +#define PK_ERR(fmt, arg...) pr_err(PFX "[%s] " fmt,__func__, ##arg) #define PK_XLOG_INFO(fmt, args...) #endif @@ -671,8 +671,8 @@ int iWriteRegI2C(u8 *a_pSendData , u16 a_sizeSendData, u16 i2cId) /******************************************************************************* * sensor function adapter ********************************************************************************/ -#define KD_MULTI_FUNCTION_ENTRY() /* PK_XLOG_INFO("[%s]:E\n",__FUNCTION__) */ -#define KD_MULTI_FUNCTION_EXIT() /* PK_XLOG_INFO("[%s]:X\n",__FUNCTION__) */ +#define KD_MULTI_FUNCTION_ENTRY() /* PK_XLOG_INFO("[%s]:E\n",__func__) */ +#define KD_MULTI_FUNCTION_EXIT() /* PK_XLOG_INFO("[%s]:X\n",__func__) */ /* */ MUINT32 kdSetI2CSlaveID(MINT32 i, MUINT32 socketIdx, MUINT32 firstSet) { @@ -1029,7 +1029,7 @@ u32 i = 0; for (i = KDIMGSENSOR_INVOKE_DRIVER_0; i < KDIMGSENSOR_MAX_INVOKE_DRIVERS; i++) { if (g_bEnableDriver[i]) { - /* PK_XLOG_INFO("[%s][%d][%d][%s][%s]\r\n",__FUNCTION__,g_bEnableDriver[i],socketIdx[i],sensorNameStr[i],mode_name); */ + /* PK_XLOG_INFO("[%s][%d][%d][%s][%s]\r\n",__func__,g_bEnableDriver[i],socketIdx[i],sensorNameStr[i],mode_name); */ #ifndef CONFIG_FPGA_EARLY_PORTING ret = kdCISModulePowerOn(socketIdx[i], sensorNameStr[i], On, mode_name); #endif diff --git a/drivers/misc/mediatek/imgsensor/src/mt6735m/ov13850_mipi_raw/ov13850mipiraw_Sensor.c b/drivers/misc/mediatek/imgsensor/src/mt6735m/ov13850_mipi_raw/ov13850mipiraw_Sensor.c index 7707836da..4a11d34e5 100644 --- a/drivers/misc/mediatek/imgsensor/src/mt6735m/ov13850_mipi_raw/ov13850mipiraw_Sensor.c +++ b/drivers/misc/mediatek/imgsensor/src/mt6735m/ov13850_mipi_raw/ov13850mipiraw_Sensor.c @@ -42,7 +42,7 @@ #define LOG_2 LOG_INF("preview 2096*1552@30fps,640Mbps/lane; video 4192*3104@30fps,1.2Gbps/lane; capture 13M@30fps,1.2Gbps/lane\n") /**************************** Modify end *******************************************/ -#define LOG_INF(format, args...) pr_debug(PFX "[%s] " format, __FUNCTION__, ##args) +#define LOG_INF(format, args...) pr_debug(PFX "[%s] " format, __func__, ##args) static DEFINE_SPINLOCK(imgsensor_drv_lock); diff --git a/drivers/misc/mediatek/imgsensor/src/mt6735m/ov2680_mipi_raw/ov2680mipi_Sensor.c b/drivers/misc/mediatek/imgsensor/src/mt6735m/ov2680_mipi_raw/ov2680mipi_Sensor.c index bc29d8b49..7f89c1284 100644 --- a/drivers/misc/mediatek/imgsensor/src/mt6735m/ov2680_mipi_raw/ov2680mipi_Sensor.c +++ b/drivers/misc/mediatek/imgsensor/src/mt6735m/ov2680_mipi_raw/ov2680mipi_Sensor.c @@ -41,7 +41,7 @@ #define LOG_1 LOG_INF("OV2680,MIPI 1LANE\n") #define LOG_2 LOG_INF("preview 1600*1200@30fps,600Mbps/lane; video 1600*1200@30fps,600Mbps/lane; 1600*1200@30fps,600Mbps/lane\n") /**************************** Modify end *******************************************/ -#define LOG_INF(format, args...) pr_debug(PFX "[%s] " format, __FUNCTION__, ##args) +#define LOG_INF(format, args...) pr_debug(PFX "[%s] " format, __func__, ##args) static DEFINE_SPINLOCK(imgsensor_drv_lock); diff --git a/drivers/misc/mediatek/imgsensor/src/mt6735m/ov5648_mipi_raw/ov5648mipi_Sensor.c b/drivers/misc/mediatek/imgsensor/src/mt6735m/ov5648_mipi_raw/ov5648mipi_Sensor.c index 470765a42..0ee44e64f 100644 --- a/drivers/misc/mediatek/imgsensor/src/mt6735m/ov5648_mipi_raw/ov5648mipi_Sensor.c +++ b/drivers/misc/mediatek/imgsensor/src/mt6735m/ov5648_mipi_raw/ov5648mipi_Sensor.c @@ -42,7 +42,7 @@ #define LOG_2 LOG_INF("preview 1280*960@30fps,420Mbps/lane; video 1280*960@30fps,420Mbps/lane; capture 5M@15fps,420Mbps/lane\n") /**************************** Modify end *******************************************/ -#define LOG_INF(format, args...) pr_debug(PFX "[%s] " format, __FUNCTION__, ##args) +#define LOG_INF(format, args...) pr_debug(PFX "[%s] " format, __func__, ##args) static DEFINE_SPINLOCK(imgsensor_drv_lock); diff --git a/drivers/misc/mediatek/imgsensor/src/mt6735m/ov5670_mipi_raw/ov5670mipi_Sensor.c b/drivers/misc/mediatek/imgsensor/src/mt6735m/ov5670_mipi_raw/ov5670mipi_Sensor.c index e93de0473..0a9fe7f85 100644 --- a/drivers/misc/mediatek/imgsensor/src/mt6735m/ov5670_mipi_raw/ov5670mipi_Sensor.c +++ b/drivers/misc/mediatek/imgsensor/src/mt6735m/ov5670_mipi_raw/ov5670mipi_Sensor.c @@ -40,7 +40,7 @@ #include <linux/compat.h> #endif #define PFX "ov5670_camera_sensor" -#define LOG_INF(format, args...) pr_debug(PFX "[%s] " format, __FUNCTION__, ##args) +#define LOG_INF(format, args...) pr_debug(PFX "[%s] " format, __func__, ##args) static DEFINE_SPINLOCK(imgsensor_drv_lock); diff --git a/drivers/misc/mediatek/imgsensor/src/mt6735m/ov8865_mipi_raw/ov8865mipiraw_Sensor.c b/drivers/misc/mediatek/imgsensor/src/mt6735m/ov8865_mipi_raw/ov8865mipiraw_Sensor.c index 74678ccc7..77212ab70 100644 --- a/drivers/misc/mediatek/imgsensor/src/mt6735m/ov8865_mipi_raw/ov8865mipiraw_Sensor.c +++ b/drivers/misc/mediatek/imgsensor/src/mt6735m/ov8865_mipi_raw/ov8865mipiraw_Sensor.c @@ -41,7 +41,7 @@ extern int iWriteReg(u16 a_u2Addr , u32 a_u4Data , u32 a_u4Bytes , u16 i2cId); #define PFX "OV8865_2lane_camera_sensor" -#define LOG_INF(format, args...) pr_debug(PFX "[%s] " format, __FUNCTION__, ##args) +#define LOG_INF(format, args...) pr_debug(PFX "[%s] " format, __func__, ##args) static DEFINE_SPINLOCK(imgsensor_drv_lock); diff --git a/drivers/misc/mediatek/imgsensor/src/mt6735m/s5k2p8_mipi_raw/s5k2p8mipi_Sensor.c b/drivers/misc/mediatek/imgsensor/src/mt6735m/s5k2p8_mipi_raw/s5k2p8mipi_Sensor.c index 5be28b66c..cc6430d57 100644 --- a/drivers/misc/mediatek/imgsensor/src/mt6735m/s5k2p8_mipi_raw/s5k2p8mipi_Sensor.c +++ b/drivers/misc/mediatek/imgsensor/src/mt6735m/s5k2p8_mipi_raw/s5k2p8mipi_Sensor.c @@ -39,8 +39,8 @@ #define PFX "S5K2P8_camera_sensor" #define LOG_1 LOG_INF("S5K2P8,MIPI 4LANE\n") #define LOG_2 LOG_INF("preview 2664*1500@30fps,888Mbps/lane; video 5328*3000@30fps,1390Mbps/lane; capture 16M@30fps,1390Mbps/lane\n") -#define LOG_INF(format, args...) pr_debug(PFX "[%s] " format, __FUNCTION__, ##args) -#define LOGE(format, args...) pr_err(PFX "[%s] " format, __FUNCTION__, ##args) +#define LOG_INF(format, args...) pr_debug(PFX "[%s] " format, __func__, ##args) +#define LOGE(format, args...) pr_err(PFX "[%s] " format, __func__, ##args) static DEFINE_SPINLOCK(imgsensor_drv_lock); diff --git a/drivers/misc/mediatek/imgsensor/src/mt6753/gc0310_yuv/gc0310_yuv_Sensor.c b/drivers/misc/mediatek/imgsensor/src/mt6753/gc0310_yuv/gc0310_yuv_Sensor.c index 57ce8596a..c0d29c19d 100644 --- a/drivers/misc/mediatek/imgsensor/src/mt6753/gc0310_yuv/gc0310_yuv_Sensor.c +++ b/drivers/misc/mediatek/imgsensor/src/mt6753/gc0310_yuv/gc0310_yuv_Sensor.c @@ -64,7 +64,7 @@ static DEFINE_SPINLOCK(GC0310_drv_lock); #define LOG_1 LOG_INF("GC0310,SERIAL CAM\n") /**************************** Modify end *******************************************/ -#define LOG_INF(format, args...) pr_debug(PFX "[%s] " format, __FUNCTION__, ##args) +#define LOG_INF(format, args...) pr_debug(PFX "[%s] " format, __func__, ##args) #define GC0310_TEST_PATTERN_CHECKSUM (0x9db2de6e) diff --git a/drivers/misc/mediatek/imgsensor/src/mt6753/gc2145_mipi_yuv/gc2145mipi_yuv_Sensor.c b/drivers/misc/mediatek/imgsensor/src/mt6753/gc2145_mipi_yuv/gc2145mipi_yuv_Sensor.c index 788dee016..5e10775e3 100644 --- a/drivers/misc/mediatek/imgsensor/src/mt6753/gc2145_mipi_yuv/gc2145mipi_yuv_Sensor.c +++ b/drivers/misc/mediatek/imgsensor/src/mt6753/gc2145_mipi_yuv/gc2145mipi_yuv_Sensor.c @@ -181,7 +181,7 @@ static u32 strtol(const char *nptr, u8 base) u8 ret; if(!nptr || (base!=16 && base!=10 && base!=8)) { - printk("gc2145mipi %s(): NULL pointer input\n", __FUNCTION__); + printk("gc2145mipi %s(): NULL pointer input\n", __func__); return -1; } for(ret=0; *nptr; nptr++) diff --git a/drivers/misc/mediatek/imgsensor/src/mt6753/gc2355_mipi_raw/gc2355mipi_Sensor.c b/drivers/misc/mediatek/imgsensor/src/mt6753/gc2355_mipi_raw/gc2355mipi_Sensor.c index c199516bc..91fcc47e1 100644 --- a/drivers/misc/mediatek/imgsensor/src/mt6753/gc2355_mipi_raw/gc2355mipi_Sensor.c +++ b/drivers/misc/mediatek/imgsensor/src/mt6753/gc2355_mipi_raw/gc2355mipi_Sensor.c @@ -41,7 +41,7 @@ #define LOG_2 LOG_INF("preview 1280*960@30fps,864Mbps/lane; video 1280*960@30fps,864Mbps/lane; capture 5M@30fps,864Mbps/lane\n") /**************************** Modify end *******************************************/ -#define LOG_INF(format, args...) pr_debug(PFX "[%s] " format, __FUNCTION__, ##args) +#define LOG_INF(format, args...) pr_debug(PFX "[%s] " format, __func__, ##args) static DEFINE_SPINLOCK(imgsensor_drv_lock); diff --git a/drivers/misc/mediatek/imgsensor/src/mt6753/hi545_mipi_raw/hi545mipi_Sensor.c b/drivers/misc/mediatek/imgsensor/src/mt6753/hi545_mipi_raw/hi545mipi_Sensor.c index 083c42e9b..081ee9606 100644 --- a/drivers/misc/mediatek/imgsensor/src/mt6753/hi545_mipi_raw/hi545mipi_Sensor.c +++ b/drivers/misc/mediatek/imgsensor/src/mt6753/hi545_mipi_raw/hi545mipi_Sensor.c @@ -45,7 +45,7 @@ extern void kdSetI2CSpeed(u32 i2cSpeed); #define LOG_2 LOG_INF("preview 1296*972@30fps; video 1296*972@30fps; capture 5M@30fps\n") /**************************** Modify end *******************************************/ -#define LOG_INF(format, args...) pr_debug(PFX "[%s] " format, __FUNCTION__, ##args) +#define LOG_INF(format, args...) pr_debug(PFX "[%s] " format, __func__, ##args) #define USE_I2C_400K 1 diff --git a/drivers/misc/mediatek/imgsensor/src/mt6753/imx135_mipi_raw/imx135_otp.c b/drivers/misc/mediatek/imgsensor/src/mt6753/imx135_mipi_raw/imx135_otp.c index c598594ce..fd5e1940e 100644 --- a/drivers/misc/mediatek/imgsensor/src/mt6753/imx135_mipi_raw/imx135_otp.c +++ b/drivers/misc/mediatek/imgsensor/src/mt6753/imx135_mipi_raw/imx135_otp.c @@ -34,7 +34,7 @@ After finishing the OTP written, we will provide you the golden_rg and golden_bg #include <linux/xlog.h> #define PFX "imx135_otp" -#define LOG_INF(format, args...) pr_debug(PFX "[%s] " format, __FUNCTION__, ##args) +#define LOG_INF(format, args...) pr_debug(PFX "[%s] " format, __func__, ##args) //#include "imx135_otp.h" diff --git a/drivers/misc/mediatek/imgsensor/src/mt6753/imx135_mipi_raw/imx135mipiraw_Sensor.c b/drivers/misc/mediatek/imgsensor/src/mt6753/imx135_mipi_raw/imx135mipiraw_Sensor.c index 90d67aad5..400e1bedc 100644 --- a/drivers/misc/mediatek/imgsensor/src/mt6753/imx135_mipi_raw/imx135mipiraw_Sensor.c +++ b/drivers/misc/mediatek/imgsensor/src/mt6753/imx135_mipi_raw/imx135mipiraw_Sensor.c @@ -47,7 +47,7 @@ //#define LOG_INF(format, args...) pr_debug(PFX format, ##args) //#define LOG_INF(format, args...) pr_debug(MyTag format, ##args) -#define LOG_INF(format, args...) pr_debug(PFX "[%s] " format, __FUNCTION__, ##args) +#define LOG_INF(format, args...) pr_debug(PFX "[%s] " format, __func__, ##args) static DEFINE_SPINLOCK(imgsensor_drv_lock); diff --git a/drivers/misc/mediatek/imgsensor/src/mt6753/imx135_mipi_raw_5mp/imx135_otp.c b/drivers/misc/mediatek/imgsensor/src/mt6753/imx135_mipi_raw_5mp/imx135_otp.c index c598594ce..fd5e1940e 100644 --- a/drivers/misc/mediatek/imgsensor/src/mt6753/imx135_mipi_raw_5mp/imx135_otp.c +++ b/drivers/misc/mediatek/imgsensor/src/mt6753/imx135_mipi_raw_5mp/imx135_otp.c @@ -34,7 +34,7 @@ After finishing the OTP written, we will provide you the golden_rg and golden_bg #include <linux/xlog.h> #define PFX "imx135_otp" -#define LOG_INF(format, args...) pr_debug(PFX "[%s] " format, __FUNCTION__, ##args) +#define LOG_INF(format, args...) pr_debug(PFX "[%s] " format, __func__, ##args) //#include "imx135_otp.h" diff --git a/drivers/misc/mediatek/imgsensor/src/mt6753/imx135_mipi_raw_5mp/imx135mipiraw_Sensor.c b/drivers/misc/mediatek/imgsensor/src/mt6753/imx135_mipi_raw_5mp/imx135mipiraw_Sensor.c index ff7bf8f04..705da9bf3 100644 --- a/drivers/misc/mediatek/imgsensor/src/mt6753/imx135_mipi_raw_5mp/imx135mipiraw_Sensor.c +++ b/drivers/misc/mediatek/imgsensor/src/mt6753/imx135_mipi_raw_5mp/imx135mipiraw_Sensor.c @@ -45,7 +45,7 @@ #define LOG_2 LOG_INF("preview 1280*960@30fps; video 2560*1920@30fps; capture 5M@30fps\n") /**************************** Modify end *******************************************/ -#define LOG_INF(format, args...) pr_debug(PFX "[%s] " format, __FUNCTION__, ##args) +#define LOG_INF(format, args...) pr_debug(PFX "[%s] " format, __func__, ##args) static DEFINE_SPINLOCK(imgsensor_drv_lock); diff --git a/drivers/misc/mediatek/imgsensor/src/mt6753/imx214_mipi_raw/imx214mipiraw_Sensor.c b/drivers/misc/mediatek/imgsensor/src/mt6753/imx214_mipi_raw/imx214mipiraw_Sensor.c index b86507b18..45691610f 100644 --- a/drivers/misc/mediatek/imgsensor/src/mt6753/imx214_mipi_raw/imx214mipiraw_Sensor.c +++ b/drivers/misc/mediatek/imgsensor/src/mt6753/imx214_mipi_raw/imx214mipiraw_Sensor.c @@ -37,7 +37,7 @@ #include "imx214mipiraw_Sensor.h" #define PFX "IMX214_camera_sensor" -#define LOG_INF(format, args...) pr_debug(PFX "[%s] " format, __FUNCTION__, ##args) +#define LOG_INF(format, args...) pr_debug(PFX "[%s] " format, __func__, ##args) static DEFINE_SPINLOCK(imgsensor_drv_lock); diff --git a/drivers/misc/mediatek/imgsensor/src/mt6753/imx219_mipi_raw/imx219mipiraw_Sensor.c b/drivers/misc/mediatek/imgsensor/src/mt6753/imx219_mipi_raw/imx219mipiraw_Sensor.c index d535f80f7..96bc18cc8 100644 --- a/drivers/misc/mediatek/imgsensor/src/mt6753/imx219_mipi_raw/imx219mipiraw_Sensor.c +++ b/drivers/misc/mediatek/imgsensor/src/mt6753/imx219_mipi_raw/imx219mipiraw_Sensor.c @@ -42,7 +42,7 @@ #define LOG_2 LOG_INF("preview 1280*960@30fps,864Mbps/lane; video 1280*960@30fps,864Mbps/lane; capture 5M@30fps,864Mbps/lane\n") /**************************** Modify end *******************************************/ -#define LOG_INF(format, args...) pr_debug(PFX "[%s] " format, __FUNCTION__, ##args) +#define LOG_INF(format, args...) pr_debug(PFX "[%s] " format, __func__, ##args) static DEFINE_SPINLOCK(imgsensor_drv_lock); diff --git a/drivers/misc/mediatek/imgsensor/src/mt6753/kd_sensorlist.c b/drivers/misc/mediatek/imgsensor/src/mt6753/kd_sensorlist.c index 84e3c22de..aa28e0586 100644 --- a/drivers/misc/mediatek/imgsensor/src/mt6753/kd_sensorlist.c +++ b/drivers/misc/mediatek/imgsensor/src/mt6753/kd_sensorlist.c @@ -79,7 +79,7 @@ static struct i2c_board_info i2c_devs2 __initdata = {I2C_BOARD_INFO(CAMERA_HW_DR #define PFX "[kd_sensorlist]" #define PK_DBG_NONE(fmt, arg...) do {} while (0) #define PK_DBG_FUNC(fmt, arg...) pr_debug(fmt, ##arg) -#define PK_INF(fmt, args...) pr_debug(PFX "[%s] " fmt, __FUNCTION__, ##args) +#define PK_INF(fmt, args...) pr_debug(PFX "[%s] " fmt, __func__, ##args) #undef DEBUG_CAMERA_HW_K /* #define DEBUG_CAMERA_HW_K */ @@ -685,8 +685,8 @@ int iWriteRegI2C(u8 *a_pSendData , u16 a_sizeSendData, u16 i2cId) /******************************************************************************* * sensor function adapter ********************************************************************************/ -#define KD_MULTI_FUNCTION_ENTRY() /* PK_XLOG_INFO("[%s]:E\n",__FUNCTION__) */ -#define KD_MULTI_FUNCTION_EXIT() /* PK_XLOG_INFO("[%s]:X\n",__FUNCTION__) */ +#define KD_MULTI_FUNCTION_ENTRY() /* PK_XLOG_INFO("[%s]:E\n",__func__) */ +#define KD_MULTI_FUNCTION_EXIT() /* PK_XLOG_INFO("[%s]:X\n",__func__) */ /* */ MUINT32 kdSetI2CSlaveID(MINT32 i, MUINT32 socketIdx, MUINT32 firstSet) { @@ -1048,7 +1048,7 @@ u32 i = 0; for (i = KDIMGSENSOR_INVOKE_DRIVER_0; i < KDIMGSENSOR_MAX_INVOKE_DRIVERS; i++) { if (g_bEnableDriver[i]) { - /* PK_XLOG_INFO("[%s][%d][%d][%s][%s]\r\n",__FUNCTION__,g_bEnableDriver[i],socketIdx[i],sensorNameStr[i],mode_name); */ + /* PK_XLOG_INFO("[%s][%d][%d][%s][%s]\r\n",__func__,g_bEnableDriver[i],socketIdx[i],sensorNameStr[i],mode_name); */ #ifndef CONFIG_FPGA_EARLY_PORTING ret = kdCISModulePowerOn(socketIdx[i], sensorNameStr[i], On, mode_name); #endif diff --git a/drivers/misc/mediatek/imgsensor/src/mt6753/ov2680_mipi_raw/ov2680mipi_Sensor.c b/drivers/misc/mediatek/imgsensor/src/mt6753/ov2680_mipi_raw/ov2680mipi_Sensor.c index 2734383ad..2afcfb66b 100644 --- a/drivers/misc/mediatek/imgsensor/src/mt6753/ov2680_mipi_raw/ov2680mipi_Sensor.c +++ b/drivers/misc/mediatek/imgsensor/src/mt6753/ov2680_mipi_raw/ov2680mipi_Sensor.c @@ -41,7 +41,7 @@ #define LOG_1 LOG_INF("OV2680,MIPI 1LANE\n") #define LOG_2 LOG_INF("preview 1600*1200@30fps,600Mbps/lane; video 1600*1200@30fps,600Mbps/lane; 1600*1200@30fps,600Mbps/lane\n") /**************************** Modify end *******************************************/ -#define LOG_INF(format, args...) pr_debug(PFX "[%s] " format, __FUNCTION__, ##args) +#define LOG_INF(format, args...) pr_debug(PFX "[%s] " format, __func__, ##args) static DEFINE_SPINLOCK(imgsensor_drv_lock); diff --git a/drivers/misc/mediatek/imgsensor/src/mt6753/ov5648_mipi_raw/ov5648mipi_Sensor.c b/drivers/misc/mediatek/imgsensor/src/mt6753/ov5648_mipi_raw/ov5648mipi_Sensor.c index cd202af90..a6a4b2320 100644 --- a/drivers/misc/mediatek/imgsensor/src/mt6753/ov5648_mipi_raw/ov5648mipi_Sensor.c +++ b/drivers/misc/mediatek/imgsensor/src/mt6753/ov5648_mipi_raw/ov5648mipi_Sensor.c @@ -42,7 +42,7 @@ #define LOG_2 LOG_INF("preview 1280*960@30fps,420Mbps/lane; video 1280*960@30fps,420Mbps/lane; capture 5M@15fps,420Mbps/lane\n") /**************************** Modify end *******************************************/ -#define LOG_INF(format, args...) pr_debug(PFX "[%s] " format, __FUNCTION__, ##args) +#define LOG_INF(format, args...) pr_debug(PFX "[%s] " format, __func__, ##args) static DEFINE_SPINLOCK(imgsensor_drv_lock); diff --git a/drivers/misc/mediatek/imgsensor/src/mt6753/ov5670_mipi_raw/ov5670mipi_Sensor.c b/drivers/misc/mediatek/imgsensor/src/mt6753/ov5670_mipi_raw/ov5670mipi_Sensor.c index dfa73952f..a59ecdc62 100644 --- a/drivers/misc/mediatek/imgsensor/src/mt6753/ov5670_mipi_raw/ov5670mipi_Sensor.c +++ b/drivers/misc/mediatek/imgsensor/src/mt6753/ov5670_mipi_raw/ov5670mipi_Sensor.c @@ -38,10 +38,10 @@ #include "meizu_otp.h" #define PFX "ov5670_camera_sensor" -//#define LOG_WRN(format, args...) xlog_printk(ANDROID_LOG_WARN ,PFX, "[%S] " format, __FUNCTION__, ##args) -//#defineLOG_INF(format, args...) xlog_printk(ANDROID_LOG_INFO ,PFX, "[%s] " format, __FUNCTION__, ##args) -//#define LOG_DBG(format, args...) xlog_printk(ANDROID_LOG_DEBUG ,PFX, "[%S] " format, __FUNCTION__, ##args) -#define LOG_INF(format, args...) xlog_printk(ANDROID_LOG_INFO , PFX, "[%s] " format, __FUNCTION__, ##args) +//#define LOG_WRN(format, args...) xlog_printk(ANDROID_LOG_WARN ,PFX, "[%S] " format, __func__, ##args) +//#defineLOG_INF(format, args...) xlog_printk(ANDROID_LOG_INFO ,PFX, "[%s] " format, __func__, ##args) +//#define LOG_DBG(format, args...) xlog_printk(ANDROID_LOG_DEBUG ,PFX, "[%S] " format, __func__, ##args) +#define LOG_INF(format, args...) xlog_printk(ANDROID_LOG_INFO , PFX, "[%s] " format, __func__, ##args) static DEFINE_SPINLOCK(imgsensor_drv_lock); #define org_setting 0 //define feature setting , 0: use new setting 1: use original setting diff --git a/drivers/misc/mediatek/imgsensor/src/mt6753/ov5670avc_mipi_raw/ov5670avcmipi_Sensor.c b/drivers/misc/mediatek/imgsensor/src/mt6753/ov5670avc_mipi_raw/ov5670avcmipi_Sensor.c index 03a6c5a94..64d25bccc 100644 --- a/drivers/misc/mediatek/imgsensor/src/mt6753/ov5670avc_mipi_raw/ov5670avcmipi_Sensor.c +++ b/drivers/misc/mediatek/imgsensor/src/mt6753/ov5670avc_mipi_raw/ov5670avcmipi_Sensor.c @@ -38,10 +38,10 @@ #include "meizu_otp.h" #define PFX "ov5670_AVC_camera_sensor" -//#define LOG_WRN(format, args...) xlog_printk(ANDROID_LOG_WARN ,PFX, "[%S] " format, __FUNCTION__, ##args) -//#defineLOG_INF(format, args...) xlog_printk(ANDROID_LOG_INFO ,PFX, "[%s] " format, __FUNCTION__, ##args) -//#define LOG_DBG(format, args...) xlog_printk(ANDROID_LOG_DEBUG ,PFX, "[%S] " format, __FUNCTION__, ##args) -#define LOG_INF(format, args...) xlog_printk(ANDROID_LOG_INFO , PFX, "[%s] " format, __FUNCTION__, ##args) +//#define LOG_WRN(format, args...) xlog_printk(ANDROID_LOG_WARN ,PFX, "[%S] " format, __func__, ##args) +//#defineLOG_INF(format, args...) xlog_printk(ANDROID_LOG_INFO ,PFX, "[%s] " format, __func__, ##args) +//#define LOG_DBG(format, args...) xlog_printk(ANDROID_LOG_DEBUG ,PFX, "[%S] " format, __func__, ##args) +#define LOG_INF(format, args...) xlog_printk(ANDROID_LOG_INFO , PFX, "[%s] " format, __func__, ##args) static DEFINE_SPINLOCK(imgsensor_drv_lock); #define org_setting 0 //define feature setting , 0: use new setting 1: use original setting diff --git a/drivers/misc/mediatek/imgsensor/src/mt6753/ov5670film_mipi_raw/ov5670filmmipi_Sensor.c b/drivers/misc/mediatek/imgsensor/src/mt6753/ov5670film_mipi_raw/ov5670filmmipi_Sensor.c index 250dd49b4..2d94d074e 100644 --- a/drivers/misc/mediatek/imgsensor/src/mt6753/ov5670film_mipi_raw/ov5670filmmipi_Sensor.c +++ b/drivers/misc/mediatek/imgsensor/src/mt6753/ov5670film_mipi_raw/ov5670filmmipi_Sensor.c @@ -38,10 +38,10 @@ #include "meizu_otp.h" #define PFX "ov5670_OFilm_camera_sensor" -//#define LOG_WRN(format, args...) xlog_printk(ANDROID_LOG_WARN ,PFX, "[%S] " format, __FUNCTION__, ##args) -//#defineLOG_INF(format, args...) xlog_printk(ANDROID_LOG_INFO ,PFX, "[%s] " format, __FUNCTION__, ##args) -//#define LOG_DBG(format, args...) xlog_printk(ANDROID_LOG_DEBUG ,PFX, "[%S] " format, __FUNCTION__, ##args) -#define LOG_INF(format, args...) xlog_printk(ANDROID_LOG_INFO , PFX, "[%s] " format, __FUNCTION__, ##args) +//#define LOG_WRN(format, args...) xlog_printk(ANDROID_LOG_WARN ,PFX, "[%S] " format, __func__, ##args) +//#defineLOG_INF(format, args...) xlog_printk(ANDROID_LOG_INFO ,PFX, "[%s] " format, __func__, ##args) +//#define LOG_DBG(format, args...) xlog_printk(ANDROID_LOG_DEBUG ,PFX, "[%S] " format, __func__, ##args) +#define LOG_INF(format, args...) xlog_printk(ANDROID_LOG_INFO , PFX, "[%s] " format, __func__, ##args) static DEFINE_SPINLOCK(imgsensor_drv_lock); #define org_setting 0 //define feature setting , 0: use new setting 1: use original setting diff --git a/drivers/misc/mediatek/imgsensor/src/mt6753/ov5670tech_mipi_raw/ov5670techmipi_Sensor.c b/drivers/misc/mediatek/imgsensor/src/mt6753/ov5670tech_mipi_raw/ov5670techmipi_Sensor.c index 9e293328f..012de9525 100755 --- a/drivers/misc/mediatek/imgsensor/src/mt6753/ov5670tech_mipi_raw/ov5670techmipi_Sensor.c +++ b/drivers/misc/mediatek/imgsensor/src/mt6753/ov5670tech_mipi_raw/ov5670techmipi_Sensor.c @@ -38,10 +38,10 @@ #include "meizu_otp.h" #define PFX "OV5670_TECH_camera_sensor" -//#define LOG_WRN(format, args...) xlog_printk(ANDROID_LOG_WARN ,PFX, "[%S] " format, __FUNCTION__, ##args) -//#defineLOG_INF(format, args...) xlog_printk(ANDROID_LOG_INFO ,PFX, "[%s] " format, __FUNCTION__, ##args) -//#define LOG_DBG(format, args...) xlog_printk(ANDROID_LOG_DEBUG ,PFX, "[%S] " format, __FUNCTION__, ##args) -#define LOG_INF(format, args...) xlog_printk(ANDROID_LOG_INFO , PFX, "[%s] " format, __FUNCTION__, ##args) +//#define LOG_WRN(format, args...) xlog_printk(ANDROID_LOG_WARN ,PFX, "[%S] " format, __func__, ##args) +//#defineLOG_INF(format, args...) xlog_printk(ANDROID_LOG_INFO ,PFX, "[%s] " format, __func__, ##args) +//#define LOG_DBG(format, args...) xlog_printk(ANDROID_LOG_DEBUG ,PFX, "[%S] " format, __func__, ##args) +#define LOG_INF(format, args...) xlog_printk(ANDROID_LOG_INFO , PFX, "[%s] " format, __func__, ##args) static DEFINE_SPINLOCK(imgsensor_drv_lock); #define org_setting 0 //define feature setting , 0: use new setting 1: use original setting diff --git a/drivers/misc/mediatek/imgsensor/src/mt6753/s5k2p8_mipi_raw/s5k2p8mipi_Sensor.c b/drivers/misc/mediatek/imgsensor/src/mt6753/s5k2p8_mipi_raw/s5k2p8mipi_Sensor.c index 1a8f59f41..37e9ac38c 100644 --- a/drivers/misc/mediatek/imgsensor/src/mt6753/s5k2p8_mipi_raw/s5k2p8mipi_Sensor.c +++ b/drivers/misc/mediatek/imgsensor/src/mt6753/s5k2p8_mipi_raw/s5k2p8mipi_Sensor.c @@ -39,8 +39,8 @@ #define PFX "S5K2P8_camera_sensor" #define LOG_1 LOG_INF("S5K2P8,MIPI 4LANE\n") #define LOG_2 LOG_INF("preview 2664*1500@30fps,888Mbps/lane; video 5328*3000@30fps,1390Mbps/lane; capture 16M@30fps,1390Mbps/lane\n") -#define LOG_INF(format, args...) pr_debug(PFX "[%s] " format, __FUNCTION__, ##args) -#define LOGE(format, args...) pr_err(PFX "[%s] " format, __FUNCTION__, ##args) +#define LOG_INF(format, args...) pr_debug(PFX "[%s] " format, __func__, ##args) +#define LOGE(format, args...) pr_err(PFX "[%s] " format, __func__, ##args) static DEFINE_SPINLOCK(imgsensor_drv_lock); diff --git a/drivers/misc/mediatek/imgsensor/src/mt6753/s5k3l2xx_mipi_raw/s5k3l2xxmipiraw_Sensor.c b/drivers/misc/mediatek/imgsensor/src/mt6753/s5k3l2xx_mipi_raw/s5k3l2xxmipiraw_Sensor.c index e64402046..b66e0d28c 100644 --- a/drivers/misc/mediatek/imgsensor/src/mt6753/s5k3l2xx_mipi_raw/s5k3l2xxmipiraw_Sensor.c +++ b/drivers/misc/mediatek/imgsensor/src/mt6753/s5k3l2xx_mipi_raw/s5k3l2xxmipiraw_Sensor.c @@ -42,7 +42,7 @@ #define LOG_2 LOG_INF("preview 2096*1554@30fps,864Mbps/lane; video 4196*3108@30fps,864Mbps/lane; capture 13M@30fps,864Mbps/lane\n") /**************************** Modify end *******************************************/ -#define LOG_INF(format, args...) xlog_printk(ANDROID_LOG_INFO , PFX, "[%s] " format, __FUNCTION__, ##args) +#define LOG_INF(format, args...) xlog_printk(ANDROID_LOG_INFO , PFX, "[%s] " format, __func__, ##args) static DEFINE_SPINLOCK(imgsensor_drv_lock); static int cap_setting_flag = 1; //0: discard capture setting when switch mode with flash,1:take capture setting diff --git a/drivers/misc/mediatek/imgsensor/src/mt6753/s5k3l2xxavc_mipi_raw/s5k3l2xxavcmipiraw_Sensor.c b/drivers/misc/mediatek/imgsensor/src/mt6753/s5k3l2xxavc_mipi_raw/s5k3l2xxavcmipiraw_Sensor.c index 2e73a404b..f6fd45383 100644 --- a/drivers/misc/mediatek/imgsensor/src/mt6753/s5k3l2xxavc_mipi_raw/s5k3l2xxavcmipiraw_Sensor.c +++ b/drivers/misc/mediatek/imgsensor/src/mt6753/s5k3l2xxavc_mipi_raw/s5k3l2xxavcmipiraw_Sensor.c @@ -42,7 +42,7 @@ #define LOG_2 LOG_INF("preview 2096*1554@30fps,864Mbps/lane; video 4196*3108@30fps,864Mbps/lane; capture 13M@30fps,864Mbps/lane\n") /**************************** Modify end *******************************************/ -#define LOG_INF(format, args...) xlog_printk(ANDROID_LOG_INFO , PFX, "[%s] " format, __FUNCTION__, ##args) +#define LOG_INF(format, args...) xlog_printk(ANDROID_LOG_INFO , PFX, "[%s] " format, __func__, ##args) static DEFINE_SPINLOCK(imgsensor_drv_lock); static int cap_setting_flag = 1; //0: discard capture setting when switch mode with flash,1:take capture setting diff --git a/drivers/misc/mediatek/imgsensor/src/mt6753/s5k3l2xxge_mipi_raw/s5k3l2xxgemipiraw_Sensor.c b/drivers/misc/mediatek/imgsensor/src/mt6753/s5k3l2xxge_mipi_raw/s5k3l2xxgemipiraw_Sensor.c index 31eec8d21..ef2fb49a5 100644 --- a/drivers/misc/mediatek/imgsensor/src/mt6753/s5k3l2xxge_mipi_raw/s5k3l2xxgemipiraw_Sensor.c +++ b/drivers/misc/mediatek/imgsensor/src/mt6753/s5k3l2xxge_mipi_raw/s5k3l2xxgemipiraw_Sensor.c @@ -42,7 +42,7 @@ #define LOG_2 LOG_INF("preview 2096*1554@30fps,864Mbps/lane; video 4196*3108@30fps,864Mbps/lane; capture 13M@30fps,864Mbps/lane\n") /**************************** Modify end *******************************************/ -#define LOG_INF(format, args...) xlog_printk(ANDROID_LOG_INFO , PFX, "[%s] " format, __FUNCTION__, ##args) +#define LOG_INF(format, args...) xlog_printk(ANDROID_LOG_INFO , PFX, "[%s] " format, __func__, ##args) static DEFINE_SPINLOCK(imgsensor_drv_lock); static int cap_setting_flag = 1; //0: discard capture setting when switch mode with flash,1:take capture setting diff --git a/drivers/misc/mediatek/imgsensor/src/mt6753/s5k3l2xxliteon_mipi_raw/s5k3l2xxliteonmipiraw_Sensor.c b/drivers/misc/mediatek/imgsensor/src/mt6753/s5k3l2xxliteon_mipi_raw/s5k3l2xxliteonmipiraw_Sensor.c index d3bc04353..67320c231 100644 --- a/drivers/misc/mediatek/imgsensor/src/mt6753/s5k3l2xxliteon_mipi_raw/s5k3l2xxliteonmipiraw_Sensor.c +++ b/drivers/misc/mediatek/imgsensor/src/mt6753/s5k3l2xxliteon_mipi_raw/s5k3l2xxliteonmipiraw_Sensor.c @@ -42,7 +42,7 @@ #define LOG_2 LOG_INF("preview 2096*1554@30fps,864Mbps/lane; video 4196*3108@30fps,864Mbps/lane; capture 13M@30fps,864Mbps/lane\n") /**************************** Modify end *******************************************/ -#define LOG_INF(format, args...) xlog_printk(ANDROID_LOG_INFO , PFX, "[%s] " format, __FUNCTION__, ##args) +#define LOG_INF(format, args...) xlog_printk(ANDROID_LOG_INFO , PFX, "[%s] " format, __func__, ##args) static DEFINE_SPINLOCK(imgsensor_drv_lock); static int cap_setting_flag = 1; //0: discard capture setting when switch mode with flash,1:take capture setting diff --git a/drivers/misc/mediatek/imgsensor/src/mt6753/s5k3l2xxliteonge_mipi_raw/s5k3l2xxliteongemipiraw_Sensor.c b/drivers/misc/mediatek/imgsensor/src/mt6753/s5k3l2xxliteonge_mipi_raw/s5k3l2xxliteongemipiraw_Sensor.c index 2e1565dd1..fcb970a9e 100644 --- a/drivers/misc/mediatek/imgsensor/src/mt6753/s5k3l2xxliteonge_mipi_raw/s5k3l2xxliteongemipiraw_Sensor.c +++ b/drivers/misc/mediatek/imgsensor/src/mt6753/s5k3l2xxliteonge_mipi_raw/s5k3l2xxliteongemipiraw_Sensor.c @@ -42,7 +42,7 @@ #define LOG_2 LOG_INF("preview 2096*1554@30fps,864Mbps/lane; video 4196*3108@30fps,864Mbps/lane; capture 13M@30fps,864Mbps/lane\n") /**************************** Modify end *******************************************/ -#define LOG_INF(format, args...) xlog_printk(ANDROID_LOG_INFO , PFX, "[%s] " format, __FUNCTION__, ##args) +#define LOG_INF(format, args...) xlog_printk(ANDROID_LOG_INFO , PFX, "[%s] " format, __func__, ##args) static DEFINE_SPINLOCK(imgsensor_drv_lock); static int cap_setting_flag = 1; //0: discard capture setting when switch mode with flash,1:take capture setting |