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 | |
| 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')
388 files changed, 1877 insertions, 1877 deletions
diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h index f943aacfd..5056322a0 100644 --- a/drivers/block/drbd/drbd_int.h +++ b/drivers/block/drbd/drbd_int.h @@ -1978,7 +1978,7 @@ static inline void inc_ap_pending(struct drbd_conf *mdev) func, line, \ atomic_read(&mdev->which)) -#define dec_ap_pending(mdev) _dec_ap_pending(mdev, __FUNCTION__, __LINE__) +#define dec_ap_pending(mdev) _dec_ap_pending(mdev, __func__, __LINE__) static inline void _dec_ap_pending(struct drbd_conf *mdev, const char *func, int line) { if (atomic_dec_and_test(&mdev->ap_pending_cnt)) @@ -1997,7 +1997,7 @@ static inline void inc_rs_pending(struct drbd_conf *mdev) atomic_inc(&mdev->rs_pending_cnt); } -#define dec_rs_pending(mdev) _dec_rs_pending(mdev, __FUNCTION__, __LINE__) +#define dec_rs_pending(mdev) _dec_rs_pending(mdev, __func__, __LINE__) static inline void _dec_rs_pending(struct drbd_conf *mdev, const char *func, int line) { atomic_dec(&mdev->rs_pending_cnt); @@ -2018,14 +2018,14 @@ static inline void inc_unacked(struct drbd_conf *mdev) atomic_inc(&mdev->unacked_cnt); } -#define dec_unacked(mdev) _dec_unacked(mdev, __FUNCTION__, __LINE__) +#define dec_unacked(mdev) _dec_unacked(mdev, __func__, __LINE__) static inline void _dec_unacked(struct drbd_conf *mdev, const char *func, int line) { atomic_dec(&mdev->unacked_cnt); ERR_IF_CNT_IS_NEGATIVE(unacked_cnt, func, line); } -#define sub_unacked(mdev, n) _sub_unacked(mdev, n, __FUNCTION__, __LINE__) +#define sub_unacked(mdev, n) _sub_unacked(mdev, n, __func__, __LINE__) static inline void _sub_unacked(struct drbd_conf *mdev, int n, const char *func, int line) { atomic_sub(n, &mdev->unacked_cnt); diff --git a/drivers/gpu/drm/i915/dvo_ns2501.c b/drivers/gpu/drm/i915/dvo_ns2501.c index c4a255be6..74d9899b7 100644 --- a/drivers/gpu/drm/i915/dvo_ns2501.c +++ b/drivers/gpu/drm/i915/dvo_ns2501.c @@ -96,7 +96,7 @@ static void enable_dvo(struct intel_dvo_device *dvo) adapter); struct drm_i915_private *dev_priv = bus->dev_priv; - DRM_DEBUG_KMS("%s: Trying to re-enable the DVO\n", __FUNCTION__); + DRM_DEBUG_KMS("%s: Trying to re-enable the DVO\n", __func__); ns->dvoc = I915_READ(DVO_C); ns->pll_a = I915_READ(_DPLL_A); @@ -277,7 +277,7 @@ static enum drm_mode_status ns2501_mode_valid(struct intel_dvo_device *dvo, { DRM_DEBUG_KMS ("%s: is mode valid (hdisplay=%d,htotal=%d,vdisplay=%d,vtotal=%d)\n", - __FUNCTION__, mode->hdisplay, mode->htotal, mode->vdisplay, + __func__, mode->hdisplay, mode->htotal, mode->vdisplay, mode->vtotal); /* @@ -305,7 +305,7 @@ static void ns2501_mode_set(struct intel_dvo_device *dvo, DRM_DEBUG_KMS ("%s: set mode (hdisplay=%d,htotal=%d,vdisplay=%d,vtotal=%d).\n", - __FUNCTION__, mode->hdisplay, mode->htotal, mode->vdisplay, + __func__, mode->hdisplay, mode->htotal, mode->vdisplay, mode->vtotal); /* @@ -321,7 +321,7 @@ static void ns2501_mode_set(struct intel_dvo_device *dvo, /* mode 277 */ ns->reg_8_shadow &= ~NS2501_8_BPAS; DRM_DEBUG_KMS("%s: switching to 800x600\n", - __FUNCTION__); + __func__); /* * No, I do not know where this data comes from. @@ -385,7 +385,7 @@ static void ns2501_mode_set(struct intel_dvo_device *dvo, } else if (mode->hdisplay == 640 && mode->vdisplay == 480) { /* mode 274 */ DRM_DEBUG_KMS("%s: switching to 640x480\n", - __FUNCTION__); + __func__); /* * No, I do not know where this data comes from. * It is just what the video bios left in the DVO, so @@ -450,7 +450,7 @@ static void ns2501_mode_set(struct intel_dvo_device *dvo, } else if (mode->hdisplay == 1024 && mode->vdisplay == 768) { /* mode 280 */ DRM_DEBUG_KMS("%s: switching to 1024x768\n", - __FUNCTION__); + __func__); /* * This might or might not work, actually. I'm silently * assuming here that the native panel resolution is @@ -515,7 +515,7 @@ static void ns2501_dpms(struct intel_dvo_device *dvo, bool enable) unsigned char ch; DRM_DEBUG_KMS("%s: Trying set the dpms of the DVO to %i\n", - __FUNCTION__, enable); + __func__, enable); ch = ns->reg_8_shadow; diff --git a/drivers/input/touchscreen/mediatek/FTS2A052/fts2a052_driver.c b/drivers/input/touchscreen/mediatek/FTS2A052/fts2a052_driver.c index f6a276ffd..4cb3c24e0 100644 --- a/drivers/input/touchscreen/mediatek/FTS2A052/fts2a052_driver.c +++ b/drivers/input/touchscreen/mediatek/FTS2A052/fts2a052_driver.c @@ -3074,7 +3074,7 @@ static int tpd_local_init(void) #ifdef TPD_HAVE_BUTTON tpd_button_setting(TPD_KEY_COUNT, tpd_keys_local, tpd_keys_dim_local);// initialize tpd button data #endif - TPD_DMESG("end %s, %d\n", __FUNCTION__, __LINE__); + TPD_DMESG("end %s, %d\n", __func__, __LINE__); tpd_type_cap = 1; //set tp resulution @@ -3088,7 +3088,7 @@ static int tpd_local_init(void) static void tpd_resume( struct early_suspend *h ) { int rc = 0; - TPD_DMESG("[st_tpd] %s\n", __FUNCTION__); + TPD_DMESG("[st_tpd] %s\n", __func__); /*power up touch*/ #ifdef TPD_POWER_SOURCE_CUSTOM hwPowerOn(TPD_POWER_SOURCE_CUSTOM,VOL_3300,"CTP"); @@ -3162,7 +3162,7 @@ static void tpd_resume( struct early_suspend *h ) static void tpd_suspend( struct early_suspend *h ) { - TPD_DMESG("[st_tpd] %s\n", __FUNCTION__); + TPD_DMESG("[st_tpd] %s\n", __func__); old_buttons = 0; mt_eint_mask(CUST_EINT_TOUCH_PANEL_NUM); diff --git a/drivers/input/touchscreen/mediatek/GT1151/gt1x_tpd.c b/drivers/input/touchscreen/mediatek/GT1151/gt1x_tpd.c index 4867064cc..4869e3109 100644 --- a/drivers/input/touchscreen/mediatek/GT1151/gt1x_tpd.c +++ b/drivers/input/touchscreen/mediatek/GT1151/gt1x_tpd.c @@ -503,7 +503,7 @@ static int tpd_irq_registration(void) GTP_ERROR("tpd request_irq can not find touch eint device node!."); ret = -1; } - GTP_INFO("[%s]irq:%d, debounce:%d-%d:", __FUNCTION__, touch_irq, ints[0], ints[1]); + GTP_INFO("[%s]irq:%d, debounce:%d-%d:", __func__, touch_irq, ints[0], ints[1]); return ret; } #endif @@ -962,7 +962,7 @@ static int tpd_local_init(void) tpd->dev->id.product = convert_productname(gt1x_version.product_id); tpd->dev->id.version = (gt1x_version.patch_id >> 8); - GTP_INFO("end %s, %d\n", __FUNCTION__, __LINE__); + GTP_INFO("end %s, %d\n", __func__, __LINE__); tpd_type_cap = 1; return 0; diff --git a/drivers/input/touchscreen/mediatek/GT813/gt813_driver.c b/drivers/input/touchscreen/mediatek/GT813/gt813_driver.c index 02cc14894..55623fa57 100644 --- a/drivers/input/touchscreen/mediatek/GT813/gt813_driver.c +++ b/drivers/input/touchscreen/mediatek/GT813/gt813_driver.c @@ -1049,7 +1049,7 @@ static int tpd_local_init(void) tpd->dev->id.product = tpd_info.product_id; tpd->dev->id.version = (tpd_info.version_2 << 8 ) | tpd_info.version_1; - TPD_DMESG("end %s, %d\n", __FUNCTION__, __LINE__); + TPD_DMESG("end %s, %d\n", __func__, __LINE__); tpd_type_cap = 1; return 0; diff --git a/drivers/input/touchscreen/mediatek/GT818B-fpga/gt818b_driver.c b/drivers/input/touchscreen/mediatek/GT818B-fpga/gt818b_driver.c index 9dda14c60..86c34d00b 100644 --- a/drivers/input/touchscreen/mediatek/GT818B-fpga/gt818b_driver.c +++ b/drivers/input/touchscreen/mediatek/GT818B-fpga/gt818b_driver.c @@ -1452,7 +1452,7 @@ static int tpd_local_init(void) tpd->dev->id.product = (tpd_info.product_id_2 << 8 ) | tpd_info.product_id_1; tpd->dev->id.version = (tpd_info.version_2 << 8 ) | tpd_info.version_1; - TPD_DMESG("end %s, %d\n", __FUNCTION__, __LINE__); + TPD_DMESG("end %s, %d\n", __func__, __LINE__); tpd_type_cap = 1; return 0; diff --git a/drivers/input/touchscreen/mediatek/GT818B/gt818b_driver.c b/drivers/input/touchscreen/mediatek/GT818B/gt818b_driver.c index 4585073cd..1ba26e3f6 100644 --- a/drivers/input/touchscreen/mediatek/GT818B/gt818b_driver.c +++ b/drivers/input/touchscreen/mediatek/GT818B/gt818b_driver.c @@ -1492,7 +1492,7 @@ static int tpd_local_init(void) tpd->dev->id.product = (tpd_info.product_id_2 << 8 ) | tpd_info.product_id_1; tpd->dev->id.version = (tpd_info.version_2 << 8 ) | tpd_info.version_1; - TPD_DMESG("end %s, %d\n", __FUNCTION__, __LINE__); + TPD_DMESG("end %s, %d\n", __func__, __LINE__); tpd_type_cap = 1; return 0; diff --git a/drivers/input/touchscreen/mediatek/GT819/gt819_driver.c b/drivers/input/touchscreen/mediatek/GT819/gt819_driver.c index 9baa2a37d..0060bd2bf 100644 --- a/drivers/input/touchscreen/mediatek/GT819/gt819_driver.c +++ b/drivers/input/touchscreen/mediatek/GT819/gt819_driver.c @@ -527,7 +527,7 @@ int tpd_local_init(void) memcpy(tpd_calmat, tpd_def_calmat_local, 8*4); memcpy(tpd_def_calmat, tpd_def_calmat_local, 8*4); #endif - TPD_DMESG("end %s, %d\n", __FUNCTION__, __LINE__); + TPD_DMESG("end %s, %d\n", __func__, __LINE__); tpd_type_cap = 1; return 0; } diff --git a/drivers/input/touchscreen/mediatek/GT910/gt9xx_driver.c b/drivers/input/touchscreen/mediatek/GT910/gt9xx_driver.c index fb6ecebeb..4ab3d83bd 100644 --- a/drivers/input/touchscreen/mediatek/GT910/gt9xx_driver.c +++ b/drivers/input/touchscreen/mediatek/GT910/gt9xx_driver.c @@ -2399,7 +2399,7 @@ static int tpd_local_init(void) tpd->dev->id.product = tpd_info.pid; tpd->dev->id.version = tpd_info.vid; - GTP_INFO("end %s, %d", __FUNCTION__, __LINE__); + GTP_INFO("end %s, %d", __func__, __LINE__); tpd_type_cap = 1; return 0; diff --git a/drivers/input/touchscreen/mediatek/GT911/gt9xx_driver.c b/drivers/input/touchscreen/mediatek/GT911/gt9xx_driver.c index dd3833f98..89ac2210a 100644 --- a/drivers/input/touchscreen/mediatek/GT911/gt9xx_driver.c +++ b/drivers/input/touchscreen/mediatek/GT911/gt9xx_driver.c @@ -1162,7 +1162,7 @@ static s32 tpd_i2c_probe(struct i2c_client *client, const struct i2c_device_id * #endif tpd_load_status = 1; - GTP_INFO("%s, success run Done", __FUNCTION__); + GTP_INFO("%s, success run Done", __func__); return 0; out: return -1; @@ -1629,7 +1629,7 @@ static int tpd_local_init(void) tpd->dev->id.product = tpd_info.pid; tpd->dev->id.version = tpd_info.vid; - GTP_INFO("end %s, %d", __FUNCTION__, __LINE__); + GTP_INFO("end %s, %d", __func__, __LINE__); tpd_type_cap = 1; return 0; diff --git a/drivers/input/touchscreen/mediatek/GT9XX_2/gt9xx_driver.c b/drivers/input/touchscreen/mediatek/GT9XX_2/gt9xx_driver.c index 87961c80c..ea731d451 100644 --- a/drivers/input/touchscreen/mediatek/GT9XX_2/gt9xx_driver.c +++ b/drivers/input/touchscreen/mediatek/GT9XX_2/gt9xx_driver.c @@ -2766,9 +2766,9 @@ static int tpd_local_init(void) tpd->dev->id.product = tpd_info.pid; tpd->dev->id.version = tpd_info.vid; - GTP_INFO("end %s, %d\n", __FUNCTION__, __LINE__); + GTP_INFO("end %s, %d\n", __func__, __LINE__); tpd_type_cap = 1; - printk("end %s, %d\n", __FUNCTION__, __LINE__); + printk("end %s, %d\n", __func__, __LINE__); return 0; } diff --git a/drivers/input/touchscreen/mediatek/GT9XX_aio/gt9xx_driver.c b/drivers/input/touchscreen/mediatek/GT9XX_aio/gt9xx_driver.c index 4b70af771..c31416e44 100644 --- a/drivers/input/touchscreen/mediatek/GT9XX_aio/gt9xx_driver.c +++ b/drivers/input/touchscreen/mediatek/GT9XX_aio/gt9xx_driver.c @@ -3489,7 +3489,7 @@ static int tpd_local_init(void) tpd->dev->id.product = tpd_info.pid; tpd->dev->id.version = tpd_info.vid; - GTP_INFO("end %s, %d\n", __FUNCTION__, __LINE__); + GTP_INFO("end %s, %d\n", __func__, __LINE__); tpd_type_cap = 1; return 0; @@ -3976,7 +3976,7 @@ static void tpd_resume(struct early_suspend *h) { s32 ret = -1; - printk("mtk-tpd: %s start\n", __FUNCTION__); + printk("mtk-tpd: %s start\n", __func__); #ifdef TPD_PROXIMITY if (tpd_proximity_flag == 1) @@ -4097,7 +4097,7 @@ static void tpd_resume(struct early_suspend *h) #ifdef GTP_CHARGER_DETECT queue_delayed_work(gtp_charger_check_workqueue, >p_charger_check_work, clk_tick_cnt); #endif - printk("mtk-tpd: %s end\n", __FUNCTION__); + printk("mtk-tpd: %s end\n", __func__); } /*Lenovo-sw xuwen1 modify 20140804 end */ static struct tpd_driver_t tpd_device_driver = diff --git a/drivers/input/touchscreen/mediatek/GT9XX_hotknot/gt9xx_driver.c b/drivers/input/touchscreen/mediatek/GT9XX_hotknot/gt9xx_driver.c index 128340f6e..6955e931c 100644 --- a/drivers/input/touchscreen/mediatek/GT9XX_hotknot/gt9xx_driver.c +++ b/drivers/input/touchscreen/mediatek/GT9XX_hotknot/gt9xx_driver.c @@ -2064,7 +2064,7 @@ static int tpd_irq_registration(void) GTP_ERROR("tpd request_irq can not find touch eint device node!."); ret = -1; } - GTP_INFO("[%s]irq:%d, debounce:%d-%d:", __FUNCTION__, touch_irq, ints[0], ints[1]); + GTP_INFO("[%s]irq:%d, debounce:%d-%d:", __func__, touch_irq, ints[0], ints[1]); return ret; } #endif @@ -3227,7 +3227,7 @@ static int tpd_local_init(void) tpd->dev->id.product = tpd_info.pid; tpd->dev->id.version = tpd_info.vid; - GTP_INFO("end %s, %d\n", __FUNCTION__, __LINE__); + GTP_INFO("end %s, %d\n", __func__, __LINE__); tpd_type_cap = 1; return 0; @@ -3608,7 +3608,7 @@ static void tpd_resume(struct early_suspend *h) { s32 ret = -1; - printk("mtk-tpd: %s start\n", __FUNCTION__); + printk("mtk-tpd: %s start\n", __func__); #ifdef TPD_PROXIMITY if (tpd_proximity_flag == 1) @@ -3673,7 +3673,7 @@ static void tpd_resume(struct early_suspend *h) #ifdef GTP_CHARGER_DETECT queue_delayed_work(gtp_charger_check_workqueue, >p_charger_check_work, clk_tick_cnt); #endif - printk("mtk-tpd: %s end\n", __FUNCTION__); + printk("mtk-tpd: %s end\n", __func__); } static struct tpd_driver_t tpd_device_driver = diff --git a/drivers/input/touchscreen/mediatek/GT9XX_hotknot_FLASHLESS/gt9xx_driver.c b/drivers/input/touchscreen/mediatek/GT9XX_hotknot_FLASHLESS/gt9xx_driver.c index d1677986a..0a020a51f 100644 --- a/drivers/input/touchscreen/mediatek/GT9XX_hotknot_FLASHLESS/gt9xx_driver.c +++ b/drivers/input/touchscreen/mediatek/GT9XX_hotknot_FLASHLESS/gt9xx_driver.c @@ -2873,7 +2873,7 @@ static int tpd_local_init(void) tpd->dev->id.product = tpd_info.pid; tpd->dev->id.version = tpd_info.vid; - GTP_INFO("end %s, %d\n", __FUNCTION__, __LINE__); + GTP_INFO("end %s, %d\n", __func__, __LINE__); tpd_type_cap = 1; return 0; @@ -3237,7 +3237,7 @@ static void tpd_resume(struct early_suspend *h) { s32 ret = -1; - printk("mtk-tpd: %s start\n", __FUNCTION__); + printk("mtk-tpd: %s start\n", __func__); #ifdef TPD_PROXIMITY if (tpd_proximity_flag == 1) @@ -3294,7 +3294,7 @@ static void tpd_resume(struct early_suspend *h) #ifdef GTP_CHARGER_DETECT queue_delayed_work(gtp_charger_check_workqueue, >p_charger_check_work, clk_tick_cnt); #endif - printk("mtk-tpd: %s end\n", __FUNCTION__); + printk("mtk-tpd: %s end\n", __func__); } static struct tpd_driver_t tpd_device_driver = diff --git a/drivers/input/touchscreen/mediatek/GT9XX_hotknot_SCP/gt9xx_driver.c b/drivers/input/touchscreen/mediatek/GT9XX_hotknot_SCP/gt9xx_driver.c index 559651015..0c77326ce 100644 --- a/drivers/input/touchscreen/mediatek/GT9XX_hotknot_SCP/gt9xx_driver.c +++ b/drivers/input/touchscreen/mediatek/GT9XX_hotknot_SCP/gt9xx_driver.c @@ -2178,7 +2178,7 @@ static int tpd_irq_registration(void) GTP_ERROR("tpd request_irq can not find touch eint device node!."); ret = -1; } - GTP_INFO("[%s]irq:%d, debounce:%d-%d:", __FUNCTION__, touch_irq, ints[0], ints[1]); + GTP_INFO("[%s]irq:%d, debounce:%d-%d:", __func__, touch_irq, ints[0], ints[1]); return ret; } #endif @@ -3347,7 +3347,7 @@ static int tpd_local_init(void) tpd->dev->id.product = tpd_info.pid; tpd->dev->id.version = tpd_info.vid; - GTP_INFO("end %s, %d\n", __FUNCTION__, __LINE__); + GTP_INFO("end %s, %d\n", __func__, __LINE__); tpd_type_cap = 1; return 0; @@ -3831,7 +3831,7 @@ static void tpd_resume(struct early_suspend *h) { s32 ret = -1; - printk("mtk-tpd: %s start\n", __FUNCTION__); + printk("mtk-tpd: %s start\n", __func__); #ifdef TPD_PROXIMITY if (tpd_proximity_flag == 1) @@ -3928,7 +3928,7 @@ static void tpd_resume(struct early_suspend *h) #ifdef GTP_CHARGER_DETECT queue_delayed_work(gtp_charger_check_workqueue, >p_charger_check_work, clk_tick_cnt); #endif - printk("mtk-tpd: %s end\n", __FUNCTION__); + printk("mtk-tpd: %s end\n", __func__); } static struct tpd_driver_t tpd_device_driver = diff --git a/drivers/input/touchscreen/mediatek/GT9XX_hotknot_fpga/gt9xx_driver.c b/drivers/input/touchscreen/mediatek/GT9XX_hotknot_fpga/gt9xx_driver.c index fcf952d7b..07cc66407 100644 --- a/drivers/input/touchscreen/mediatek/GT9XX_hotknot_fpga/gt9xx_driver.c +++ b/drivers/input/touchscreen/mediatek/GT9XX_hotknot_fpga/gt9xx_driver.c @@ -2062,7 +2062,7 @@ static int tpd_irq_registration(void) GTP_ERROR("tpd request_irq can not find touch eint device node!."); ret = -1; } - GTP_INFO("[%s]irq:%d, debounce:%d-%d:", __FUNCTION__, touch_irq, ints[0], ints[1]); + GTP_INFO("[%s]irq:%d, debounce:%d-%d:", __func__, touch_irq, ints[0], ints[1]); return ret; } #endif @@ -3211,7 +3211,7 @@ static int tpd_local_init(void) tpd->dev->id.product = tpd_info.pid; tpd->dev->id.version = tpd_info.vid; - GTP_INFO("end %s, %d\n", __FUNCTION__, __LINE__); + GTP_INFO("end %s, %d\n", __func__, __LINE__); tpd_type_cap = 1; return 0; @@ -3592,7 +3592,7 @@ static void tpd_resume(struct early_suspend *h) { s32 ret = -1; - printk("mtk-tpd: %s start\n", __FUNCTION__); + printk("mtk-tpd: %s start\n", __func__); #ifdef TPD_PROXIMITY if (tpd_proximity_flag == 1) @@ -3657,7 +3657,7 @@ static void tpd_resume(struct early_suspend *h) #ifdef GTP_CHARGER_DETECT queue_delayed_work(gtp_charger_check_workqueue, >p_charger_check_work, clk_tick_cnt); #endif - printk("mtk-tpd: %s end\n", __FUNCTION__); + printk("mtk-tpd: %s end\n", __func__); } static struct tpd_driver_t tpd_device_driver = diff --git a/drivers/input/touchscreen/mediatek/GT9XX_hotknot_wear/gt9xx_driver.c b/drivers/input/touchscreen/mediatek/GT9XX_hotknot_wear/gt9xx_driver.c index 83813f91c..22ec1bef5 100644 --- a/drivers/input/touchscreen/mediatek/GT9XX_hotknot_wear/gt9xx_driver.c +++ b/drivers/input/touchscreen/mediatek/GT9XX_hotknot_wear/gt9xx_driver.c @@ -3279,7 +3279,7 @@ static int tpd_local_init(void) tpd->dev->id.product = tpd_info.pid; tpd->dev->id.version = tpd_info.vid; - GTP_INFO("end %s, %d\n", __FUNCTION__, __LINE__); + GTP_INFO("end %s, %d\n", __func__, __LINE__); tpd_type_cap = 1; return 0; @@ -3597,7 +3597,7 @@ static void tpd_suspend(struct early_suspend *h) s32 ret = -1; u8 buf[3] = {0x81, 0xaa, 0}; - GTP_INFO("mtk-tpd: %s start\n", __FUNCTION__); + GTP_INFO("mtk-tpd: %s start\n", __func__); #ifdef TPD_PROXIMITY if (tpd_proximity_flag == 1) @@ -3684,7 +3684,7 @@ static void tpd_resume(struct early_suspend *h) { s32 ret = -1; - printk("mtk-tpd: %s start\n", __FUNCTION__); + printk("mtk-tpd: %s start\n", __func__); #ifdef TPD_PROXIMITY if (tpd_proximity_flag == 1) @@ -3752,7 +3752,7 @@ static void tpd_resume(struct early_suspend *h) queue_delayed_work(gtp_charger_check_workqueue, >p_charger_check_work, clk_tick_cnt); #endif tpd_halt = 0; - printk("mtk-tpd: %s end\n", __FUNCTION__); + printk("mtk-tpd: %s end\n", __func__); } static struct tpd_driver_t tpd_device_driver = diff --git a/drivers/input/touchscreen/mediatek/MZ_FT5346/focaltech_driver.c b/drivers/input/touchscreen/mediatek/MZ_FT5346/focaltech_driver.c index fc746bfb4..0dcecd951 100644 --- a/drivers/input/touchscreen/mediatek/MZ_FT5346/focaltech_driver.c +++ b/drivers/input/touchscreen/mediatek/MZ_FT5346/focaltech_driver.c @@ -1294,7 +1294,7 @@ static int tpd_local_init(void) memcpy(tpd_def_calmat, tpd_def_calmat_local, 8*4);
#endif
- TPD_DMESG("end %s, %d\n", __FUNCTION__, __LINE__);
+ TPD_DMESG("end %s, %d\n", __func__, __LINE__);
tpd_type_cap = 1;
return 0;
}
diff --git a/drivers/input/touchscreen/mediatek/MZ_GT9XX/gt9xx_driver.c b/drivers/input/touchscreen/mediatek/MZ_GT9XX/gt9xx_driver.c index 2386906a7..57a5d8ef9 100644 --- a/drivers/input/touchscreen/mediatek/MZ_GT9XX/gt9xx_driver.c +++ b/drivers/input/touchscreen/mediatek/MZ_GT9XX/gt9xx_driver.c @@ -3043,7 +3043,7 @@ static int tpd_local_init(void) tpd->dev->id.product = tpd_info.pid; tpd->dev->id.version = tpd_info.vid; - GTP_INFO("end %s, %d\n", __FUNCTION__, __LINE__); + GTP_INFO("end %s, %d\n", __func__, __LINE__); tpd_type_cap = 1; return 0; diff --git a/drivers/input/touchscreen/mediatek/S3203/s3203_driver.c b/drivers/input/touchscreen/mediatek/S3203/s3203_driver.c index 674f11929..da6b9a07f 100644 --- a/drivers/input/touchscreen/mediatek/S3203/s3203_driver.c +++ b/drivers/input/touchscreen/mediatek/S3203/s3203_driver.c @@ -627,7 +627,7 @@ static int RMI4_read_PDT(struct i2c_client *client) if(i2c_transfer(client->adapter, msg, 2) < 0) { - printk("%s:%d: read RIM4 PDT error!\n",__FUNCTION__,__LINE__); + printk("%s:%d: read RIM4 PDT error!\n",__func__,__LINE__); return -1; } @@ -647,7 +647,7 @@ static int RMI4_read_PDT(struct i2c_client *client) if((m_PdtF01Common.m_CommandBase != fd_01.commandBase) || (m_PdtF34Flash.m_QueryBase != fd_34.queryBase)) { - printk("%s:%d: RIM4 PDT has changed!!!\n",__FUNCTION__,__LINE__); + printk("%s:%d: RIM4 PDT has changed!!!\n",__func__,__LINE__); ret = tpd_rmi4_read_pdt(ts); if(ret < 0) @@ -903,21 +903,21 @@ static int synaptics_download(struct i2c_client *client,const unsigned char *pgm ret = RMI4_enable_program(client); if( ret != 0) { - printk("%s:%d:RMI enable program error,return...\n",__FUNCTION__,__LINE__); + printk("%s:%d:RMI enable program error,return...\n",__func__,__LINE__); goto error; } ret = RMI4_check_firmware(client,pgm_data); if( ret != 0) { - printk("%s:%d:RMI check firmware error,return...\n",__FUNCTION__,__LINE__); + printk("%s:%d:RMI check firmware error,return...\n",__func__,__LINE__); goto error; } ret = RMI4_program_firmware(client, pgm_data + 0x100); if( ret != 0) { - printk("%s:%d:RMI program firmware error,return...",__FUNCTION__,__LINE__); + printk("%s:%d:RMI program firmware error,return...",__func__,__LINE__); goto error; } @@ -926,7 +926,7 @@ static int synaptics_download(struct i2c_client *client,const unsigned char *pgm error: RMI4_disable_program_hw(client); - printk("%s:%d:error,return ....",__FUNCTION__,__LINE__); + printk("%s:%d:error,return ....",__func__,__LINE__); return -1; } @@ -947,14 +947,14 @@ static int i2c_update_firmware(struct i2c_client *client) filp = filp_open(filename, O_RDONLY, S_IRUSR); if (IS_ERR(filp)) { - printk("%s: file %s filp_open error\n", __FUNCTION__,filename); + printk("%s: file %s filp_open error\n", __func__,filename); set_fs(oldfs); return -1; } if (!filp->f_op) { - printk("%s: File Operation Method Error\n", __FUNCTION__); + printk("%s: File Operation Method Error\n", __func__); filp_close(filp, NULL); set_fs(oldfs); return -1; @@ -963,7 +963,7 @@ static int i2c_update_firmware(struct i2c_client *client) inode = filp->f_path.dentry->d_inode; if (!inode) { - printk("%s: Get inode from filp failed\n", __FUNCTION__); + printk("%s: Get inode from filp failed\n", __func__); filp_close(filp, NULL); set_fs(oldfs); return -1; @@ -992,7 +992,7 @@ static int i2c_update_firmware(struct i2c_client *client) /* read data */ if (filp->f_op->read(filp, buf, length, &filp->f_pos) != length) { - printk("%s: file read error\n", __FUNCTION__); + printk("%s: file read error\n", __func__); filp_close(filp, NULL); set_fs(oldfs); vfree(buf); @@ -1098,7 +1098,7 @@ static int tpd_local_init(void) boot_mode = get_boot_mode(); if (boot_mode == 3) boot_mode = NORMAL_BOOT; #endif - TPD_DMESG("end %s, %d\n", __FUNCTION__, __LINE__); + TPD_DMESG("end %s, %d\n", __func__, __LINE__); tpd_type_cap = 1; return 0; } diff --git a/drivers/input/touchscreen/mediatek/S7020/synaptics_driver.c b/drivers/input/touchscreen/mediatek/S7020/synaptics_driver.c index bcf9e454b..28339e8c2 100644 --- a/drivers/input/touchscreen/mediatek/S7020/synaptics_driver.c +++ b/drivers/input/touchscreen/mediatek/S7020/synaptics_driver.c @@ -1857,7 +1857,7 @@ static int tpd_local_init(void) boot_mode = get_boot_mode(); //if (boot_mode == 3) boot_mode = NORMAL_BOOT; //No need input_set_abs_params(tpd->dev, ABS_MT_TRACKING_ID, 0, (10-1), 0, 0); - TPD_DMESG("end %s, %d\n", __FUNCTION__, __LINE__); + TPD_DMESG("end %s, %d\n", __func__, __LINE__); tpd_type_cap = 1; return 0; } diff --git a/drivers/input/touchscreen/mediatek/cy8ctma300/cy8ctma300_driver.c b/drivers/input/touchscreen/mediatek/cy8ctma300/cy8ctma300_driver.c index f7fabfe37..a2254003c 100644 --- a/drivers/input/touchscreen/mediatek/cy8ctma300/cy8ctma300_driver.c +++ b/drivers/input/touchscreen/mediatek/cy8ctma300/cy8ctma300_driver.c @@ -188,8 +188,8 @@ static int tpd_i2c_probe(struct i2c_client *client, const struct i2c_device_id * } void tpd_eint_interrupt_handler(void) { -// if(tpd_debuglog==1) TPD_DMESG("[mtk-tpd], %s\n", __FUNCTION__); - if(1) TPD_DMESG("[mtk-tpd], %s\n", __FUNCTION__); +// if(tpd_debuglog==1) TPD_DMESG("[mtk-tpd], %s\n", __func__); + if(1) TPD_DMESG("[mtk-tpd], %s\n", __func__); TPD_DEBUG_PRINT_INT; tpd_flag=1; wake_up_interruptible(&waiter); } static int tpd_i2c_remove(struct i2c_client *client) {return 0;} @@ -240,11 +240,11 @@ static int touch_event_handler(void *unused) { g_temptimerdiff=get_jiffies_64();//jiffies; do { if(tpd_debuglog==1) { - TPD_DMESG("[mtk-tpd] %s\n", __FUNCTION__); + TPD_DMESG("[mtk-tpd] %s\n", __func__); } set_current_state(TASK_INTERRUPTIBLE); if(tpd_debuglog==1) - TPD_DMESG("[mtk-tpd], %s, tpd_halt=%d\n", __FUNCTION__, tpd_halt); + TPD_DMESG("[mtk-tpd], %s, tpd_halt=%d\n", __func__, tpd_halt); while (tpd_halt) {tpd_flag = 0; msleep(20);} #ifndef POLL_MODE wait_event_interruptible(waiter, tpd_flag != 0); @@ -536,7 +536,7 @@ int tpd_local_init(void) { //tpd_debuglog = 1; if(tpd_debuglog==1) { - TPD_DMESG("[mtk-tpd] %s\n", __FUNCTION__); + TPD_DMESG("[mtk-tpd] %s\n", __func__); } if(i2c_add_driver(&tpd_i2c_driver)!=0) { TPD_DMESG("unable to add i2c driver.\n"); @@ -562,7 +562,7 @@ int tpd_local_init(void) memcpy(tpd_calmat, tpd_calmat_local, 8*4); memcpy(tpd_def_calmat, tpd_def_calmat_local, 8*4); #endif - TPD_DMESG("end %s, %d\n", __FUNCTION__, __LINE__); + TPD_DMESG("end %s, %d\n", __func__, __LINE__); tpd_type_cap = 1; return 0; } @@ -571,7 +571,7 @@ int tpd_local_init(void) void tpd_suspend(struct early_suspend *h) { if(tpd_debuglog==1) { - TPD_DMESG("[mtk-tpd] %s\n", __FUNCTION__); + TPD_DMESG("[mtk-tpd] %s\n", __func__); } tpd_halt = 1; while(1){ @@ -596,7 +596,7 @@ void tpd_suspend(struct early_suspend *h) void tpd_resume(struct early_suspend *h) { if(tpd_debuglog==1) { - TPD_DMESG("[mtk-tpd] %s\n", __FUNCTION__); + TPD_DMESG("[mtk-tpd] %s\n", __func__); } #ifndef TPD_NO_GPIO #ifdef TPD_HAVE_POWER_ON_OFF diff --git a/drivers/input/touchscreen/mediatek/eeti_pcap7200/etti_pcap7200_driver.c b/drivers/input/touchscreen/mediatek/eeti_pcap7200/etti_pcap7200_driver.c index 0c9046c82..0d8ee303f 100644 --- a/drivers/input/touchscreen/mediatek/eeti_pcap7200/etti_pcap7200_driver.c +++ b/drivers/input/touchscreen/mediatek/eeti_pcap7200/etti_pcap7200_driver.c @@ -126,7 +126,7 @@ static int tpd_local_init(void) { memcpy(tpd_calmat, tpd_def_calmat_local, 8*4); memcpy(tpd_def_calmat, tpd_def_calmat_local, 8*4); #endif - TPD_DMESG("end %s, %d\n", __FUNCTION__, __LINE__); + TPD_DMESG("end %s, %d\n", __func__, __LINE__); tpd_type_cap = 1; return 0; } diff --git a/drivers/input/touchscreen/mediatek/ektf3248/ektf3248_tpd_driver.c b/drivers/input/touchscreen/mediatek/ektf3248/ektf3248_tpd_driver.c index 9f541025b..d7bfecc5d 100644 --- a/drivers/input/touchscreen/mediatek/ektf3248/ektf3248_tpd_driver.c +++ b/drivers/input/touchscreen/mediatek/ektf3248/ektf3248_tpd_driver.c @@ -2173,7 +2173,7 @@ static int tpd_local_init(void) memcpy(tpd_def_calmat, tpd_def_calmat_local, 8*4); #endif - printk("mtk-tpd:end %s, %d\n", __FUNCTION__, __LINE__); + printk("mtk-tpd:end %s, %d\n", __func__, __LINE__); tpd_type_cap = 1; return 0; } diff --git a/drivers/input/touchscreen/mediatek/excp7200/excp7200_driver.c b/drivers/input/touchscreen/mediatek/excp7200/excp7200_driver.c index c89061b5d..ca8f4c7dc 100644 --- a/drivers/input/touchscreen/mediatek/excp7200/excp7200_driver.c +++ b/drivers/input/touchscreen/mediatek/excp7200/excp7200_driver.c @@ -351,7 +351,7 @@ int tpd_local_init(void) memcpy(tpd_calmat, tpd_def_calmat_local, 8*4); memcpy(tpd_def_calmat, tpd_def_calmat_local, 8*4); #endif - TPD_DMESG("end %s, %d\n", __FUNCTION__, __LINE__); + TPD_DMESG("end %s, %d\n", __func__, __LINE__); tpd_type_cap = 1; return 0; } diff --git a/drivers/input/touchscreen/mediatek/ft5206/focaltech_driver.c b/drivers/input/touchscreen/mediatek/ft5206/focaltech_driver.c index 0b2bd5a59..c08438e1f 100644 --- a/drivers/input/touchscreen/mediatek/ft5206/focaltech_driver.c +++ b/drivers/input/touchscreen/mediatek/ft5206/focaltech_driver.c @@ -665,7 +665,7 @@ static int tpd_local_init(void) memcpy(tpd_calmat, tpd_def_calmat_local, 8*4); memcpy(tpd_def_calmat, tpd_def_calmat_local, 8*4); #endif - TPD_DMESG("end %s, %d\n", __FUNCTION__, __LINE__); + TPD_DMESG("end %s, %d\n", __func__, __LINE__); tpd_type_cap = 1; return 0; } diff --git a/drivers/input/touchscreen/mediatek/ft5316/ft5316_driver.c b/drivers/input/touchscreen/mediatek/ft5316/ft5316_driver.c index f79dc0675..c48b6dadf 100644 --- a/drivers/input/touchscreen/mediatek/ft5316/ft5316_driver.c +++ b/drivers/input/touchscreen/mediatek/ft5316/ft5316_driver.c @@ -1314,7 +1314,7 @@ reset_proc: memcpy(tpd_calmat, tpd_def_calmat_local, 8*4); memcpy(tpd_def_calmat, tpd_def_calmat_local, 8*4); #endif - TPD_DMESG("end %s, %d\n", __FUNCTION__, __LINE__); + TPD_DMESG("end %s, %d\n", __func__, __LINE__); tpd_type_cap = 1; return 0; } diff --git a/drivers/input/touchscreen/mediatek/ft5406/ft5406_driver.c b/drivers/input/touchscreen/mediatek/ft5406/ft5406_driver.c index e24ea70a3..5eb659162 100644 --- a/drivers/input/touchscreen/mediatek/ft5406/ft5406_driver.c +++ b/drivers/input/touchscreen/mediatek/ft5406/ft5406_driver.c @@ -1107,7 +1107,7 @@ static int tpd_local_init(void) return -1; } - TPD_DMESG("end %s, %d\n", __FUNCTION__, __LINE__); + TPD_DMESG("end %s, %d\n", __func__, __LINE__); tpd_type_cap = 1; return 0; diff --git a/drivers/input/touchscreen/mediatek/ft5406_82/ft5406_82_driver.c b/drivers/input/touchscreen/mediatek/ft5406_82/ft5406_82_driver.c index d67bbf7f1..38cb1bfb4 100644 --- a/drivers/input/touchscreen/mediatek/ft5406_82/ft5406_82_driver.c +++ b/drivers/input/touchscreen/mediatek/ft5406_82/ft5406_82_driver.c @@ -1336,7 +1336,7 @@ static int tpd_local_init(void) return -1; } - TPD_DMESG("end %s, %d\n", __FUNCTION__, __LINE__); + TPD_DMESG("end %s, %d\n", __func__, __LINE__); tpd_type_cap = 1; return 0; diff --git a/drivers/input/touchscreen/mediatek/ft5x0x/ft5x0x_driver.c b/drivers/input/touchscreen/mediatek/ft5x0x/ft5x0x_driver.c index 9578f4026..bdd1dcf06 100644 --- a/drivers/input/touchscreen/mediatek/ft5x0x/ft5x0x_driver.c +++ b/drivers/input/touchscreen/mediatek/ft5x0x/ft5x0x_driver.c @@ -664,7 +664,7 @@ static int tpd_local_init(void) #endif - TPD_DMESG("end %s, %d\n", __FUNCTION__, __LINE__); + TPD_DMESG("end %s, %d\n", __func__, __LINE__); tpd_type_cap = 1; return 0; diff --git a/drivers/input/touchscreen/mediatek/gn_melfas_mms144/gn_mms144.c b/drivers/input/touchscreen/mediatek/gn_melfas_mms144/gn_mms144.c index ddf7d4cf4..008d9f689 100644 --- a/drivers/input/touchscreen/mediatek/gn_melfas_mms144/gn_mms144.c +++ b/drivers/input/touchscreen/mediatek/gn_melfas_mms144/gn_mms144.c @@ -263,7 +263,7 @@ static int melfas_touch_event_handler(void *unused) { REPORT_MT_DOWN(i, g_Mtouch_info[i].posX, g_Mtouch_info[i].posY, g_Mtouch_info[i].area, g_Mtouch_info[i].pressure); } - TPD_DEBUG("[TSP] %s: Touch ID: %d, State : %d, x: %d, y: %d, z: %d w: %d\n", __FUNCTION__, + TPD_DEBUG("[TSP] %s: Touch ID: %d, State : %d, x: %d, y: %d, z: %d w: %d\n", __func__, i, (g_Mtouch_info[i].pressure > 0), g_Mtouch_info[i].posX, g_Mtouch_info[i].posY, g_Mtouch_info[i].pressure, g_Mtouch_info[i].area); @@ -434,7 +434,7 @@ static int melfas_check_firmware(struct i2c_client *client, u8 *val) if (ret < 0) { - TPD_DMESG("[melfas_tpd] %s,%d: i2c read fail[%d] \n", __FUNCTION__, __LINE__, ret); + TPD_DMESG("[melfas_tpd] %s,%d: i2c read fail[%d] \n", __func__, __LINE__, ret); } return ret; @@ -540,7 +540,7 @@ static int melfas_tpd_i2c_detect(struct i2c_client *client, struct i2c_board_inf static int melfas_tpd_local_init(void) { - TPD_DMESG("[melfas_tpd] end %s, %d\n", __FUNCTION__, __LINE__); + TPD_DMESG("[melfas_tpd] end %s, %d\n", __func__, __LINE__); if(i2c_add_driver(&melfas_tpd_i2c_driver)!=0) { TPD_DMESG("[melfas_tpd] unable to add i2c driver.\n"); diff --git a/drivers/input/touchscreen/mediatek/max1187x/max1187x.c b/drivers/input/touchscreen/mediatek/max1187x/max1187x.c index fb88879b4..595e570f9 100644 --- a/drivers/input/touchscreen/mediatek/max1187x/max1187x.c +++ b/drivers/input/touchscreen/mediatek/max1187x/max1187x.c @@ -2520,7 +2520,7 @@ static int tpd_irq_registration(unsigned int irq, irq_handler_t handler, unsigne printk("tpd request_irq can not find touch eint device node!."); ret = -1; } - printk("[%s]irq:%d, debounce:%d-%d:", __FUNCTION__, irq, ints[0], ints[1]); + printk("[%s]irq:%d, debounce:%d-%d:", __func__, irq, ints[0], ints[1]); return ret; } #endif @@ -3519,7 +3519,7 @@ static int tpd_local_init(void) tpd->dev->id.product = tpd_info.pid; tpd->dev->id.version = tpd_info.vid; - TPD_DMESG("end %s, %d\n", __FUNCTION__, __LINE__); + TPD_DMESG("end %s, %d\n", __func__, __LINE__); tpd_type_cap = 1; #if GTP_SUPPORT_I2C_DMA tpd->dev->dev.coherent_dma_mask = DMA_BIT_MASK(32); diff --git a/drivers/input/touchscreen/mediatek/mms100s/mms100s_cfg_fw_download.c b/drivers/input/touchscreen/mediatek/mms100s/mms100s_cfg_fw_download.c index febff94e7..39d1d680e 100644 --- a/drivers/input/touchscreen/mediatek/mms100s/mms100s_cfg_fw_download.c +++ b/drivers/input/touchscreen/mediatek/mms100s/mms100s_cfg_fw_download.c @@ -24,8 +24,8 @@ #define __MSG_DMA_MODE__ -#define FUNC_START TPD_DEBUG("[%s] begin\n", __FUNCTION__); -#define FUNC_END TPD_DEBUG("[%s] end \n", __FUNCTION__); +#define FUNC_START TPD_DEBUG("[%s] begin\n", __func__); +#define FUNC_END TPD_DEBUG("[%s] end \n", __func__); extern void tpd_hw_enable(void); extern void tpd_hw_disable(void); diff --git a/drivers/input/touchscreen/mediatek/mms100s/mms100s_ts.c b/drivers/input/touchscreen/mediatek/mms100s/mms100s_ts.c index 4631cd008..a97de60fc 100644 --- a/drivers/input/touchscreen/mediatek/mms100s/mms100s_ts.c +++ b/drivers/input/touchscreen/mediatek/mms100s/mms100s_ts.c @@ -1059,7 +1059,7 @@ static int melfas_tpd_i2c_detect(struct i2c_client *client, struct i2c_board_inf static int melfas_tpd_local_init(void) { - TPD_DMESG("[melfas_tpd] end %s, %d\n", __FUNCTION__, __LINE__); + TPD_DMESG("[melfas_tpd] end %s, %d\n", __func__, __LINE__); if(i2c_add_driver(&melfas_tpd_i2c_driver)!=0) { TPD_DMESG("[melfas_tpd] unable to add i2c driver.\n"); diff --git a/drivers/input/touchscreen/mediatek/mms128/mms128_driver.c b/drivers/input/touchscreen/mediatek/mms128/mms128_driver.c index 243827d65..e16e826ce 100644 --- a/drivers/input/touchscreen/mediatek/mms128/mms128_driver.c +++ b/drivers/input/touchscreen/mediatek/mms128/mms128_driver.c @@ -100,8 +100,8 @@ enum { * Macros ****************************************************************************/ #define TPD_TAG "[Melfas] " -#define TPD_FUN(f) printk(KERN_ERR TPD_TAG"%s\n", __FUNCTION__) -#define TPD_ERR(fmt, args...) printk(KERN_ERR TPD_TAG"%s %d : "fmt, __FUNCTION__, __LINE__, ##args) +#define TPD_FUN(f) printk(KERN_ERR TPD_TAG"%s\n", __func__) +#define TPD_ERR(fmt, args...) printk(KERN_ERR TPD_TAG"%s %d : "fmt, __func__, __LINE__, ##args) #define TPD_LOG(fmt, args...) printk(KERN_ERR TPD_TAG fmt, ##args) /**************************************************************************** diff --git a/drivers/input/touchscreen/mediatek/mms244/mms200_ts.c b/drivers/input/touchscreen/mediatek/mms244/mms200_ts.c index b6093fbfe..ec9e02f84 100644 --- a/drivers/input/touchscreen/mediatek/mms244/mms200_ts.c +++ b/drivers/input/touchscreen/mediatek/mms244/mms200_ts.c @@ -426,7 +426,7 @@ static int melfas_touch_event_handler(void *unused) for (i = 0; i < read_num; i = i + FINGER_EVENT_SZ) { Touch_Type = (buf[i] >> 5) & 0x03; - //TPD_DMESG("%s : touch type = %d, buf[i] = %x \n",__FUNCTION__,Touch_Type, buf[i]); + //TPD_DMESG("%s : touch type = %d, buf[i] = %x \n",__func__,Touch_Type, buf[i]); /* touch type is panel */ if (Touch_Type == MMS_TOUCH_KEY_EVENT) { touchkey_handler((buf[i] & 0x0f),(bool)(buf[i] & 0x80)); @@ -824,7 +824,7 @@ int melfas_check_firmware(struct i2c_client *client) } else if (ret < 0) { - TPD_DMESG("[melfas_tpd] %s,%d: i2c read fail[%d] \n", __FUNCTION__, __LINE__, ret); + TPD_DMESG("[melfas_tpd] %s,%d: i2c read fail[%d] \n", __func__, __LINE__, ret); goto out; } @@ -1059,7 +1059,7 @@ static int melfas_tpd_i2c_detect(struct i2c_client *client, static int melfas_tpd_local_init(void) { - TPD_DMESG("[melfas_tpd] end %s, %d\n", __FUNCTION__, __LINE__); + TPD_DMESG("[melfas_tpd] end %s, %d\n", __func__, __LINE__); if(i2c_add_driver(&melfas_tpd_i2c_driver)!= 0) { TPD_DMESG("[melfas_tpd] unable to add i2c driver.\n"); return -1; diff --git a/drivers/input/touchscreen/mediatek/msg2133/msg2133_driver.c b/drivers/input/touchscreen/mediatek/msg2133/msg2133_driver.c index 3582f89a6..62e034af5 100644 --- a/drivers/input/touchscreen/mediatek/msg2133/msg2133_driver.c +++ b/drivers/input/touchscreen/mediatek/msg2133/msg2133_driver.c @@ -2364,7 +2364,7 @@ void msg2133_init_class() //WARP CHECK IS NEED --XB.PANG //#endif - TPD_DMESG("end %s, %d\n", __FUNCTION__, __LINE__); + TPD_DMESG("end %s, %d\n", __func__, __LINE__); return 0; } diff --git a/drivers/input/touchscreen/mediatek/pixcir168/pixcir168_driver.c b/drivers/input/touchscreen/mediatek/pixcir168/pixcir168_driver.c index 712df74cd..75a092ab2 100644 --- a/drivers/input/touchscreen/mediatek/pixcir168/pixcir168_driver.c +++ b/drivers/input/touchscreen/mediatek/pixcir168/pixcir168_driver.c @@ -369,7 +369,7 @@ int tpd_local_init(void) memcpy(tpd_calmat, tpd_def_calmat_local, 8*4); memcpy(tpd_def_calmat, tpd_def_calmat_local, 8*4); #endif - TPD_DMESG("end %s, %d\n", __FUNCTION__, __LINE__); + TPD_DMESG("end %s, %d\n", __func__, __LINE__); tpd_type_cap = 1; return 0; } diff --git a/drivers/input/touchscreen/mediatek/synaptics_2200/s2200_driver.h b/drivers/input/touchscreen/mediatek/synaptics_2200/s2200_driver.h index 1529d8b47..5919cec56 100644 --- a/drivers/input/touchscreen/mediatek/synaptics_2200/s2200_driver.h +++ b/drivers/input/touchscreen/mediatek/synaptics_2200/s2200_driver.h @@ -18,6 +18,6 @@ * Debugging Macros ****************************************************************************/ #define TPD_TAG "[S2200] " -#define TPD_FUN(f) printk(KERN_ERR TPD_TAG"%s\n", __FUNCTION__) -#define TPD_ERR(fmt, args...) printk(KERN_ERR TPD_TAG"%s %d : "fmt, __FUNCTION__, __LINE__, ##args) +#define TPD_FUN(f) printk(KERN_ERR TPD_TAG"%s\n", __func__) +#define TPD_ERR(fmt, args...) printk(KERN_ERR TPD_TAG"%s %d : "fmt, __func__, __LINE__, ##args) #define TPD_LOG(fmt, args...) printk(KERN_ERR TPD_TAG fmt, ##args) diff --git a/drivers/input/touchscreen/mediatek/synaptics_2200/s2200_fw_update.c b/drivers/input/touchscreen/mediatek/synaptics_2200/s2200_fw_update.c index 59639236a..a18b28661 100644 --- a/drivers/input/touchscreen/mediatek/synaptics_2200/s2200_fw_update.c +++ b/drivers/input/touchscreen/mediatek/synaptics_2200/s2200_fw_update.c @@ -172,7 +172,7 @@ void SynaSetup(struct i2c_client *client) { unsigned char address; unsigned char buffer[6]; - TPD_LOG("%s\n", __FUNCTION__); + TPD_LOG("%s\n", __func__); for (address = 0xe9; address > 0xd0; address = address - 6) { @@ -230,7 +230,7 @@ void SynaInitialize(struct i2c_client *client) { unsigned char uData[2]; - TPD_LOG("%s\n", __FUNCTION__); + TPD_LOG("%s\n", __func__); TPD_LOG("Initializing Reflash Process...\n"); uData[0] = 0x00; @@ -256,7 +256,7 @@ void SynaReadFirmwareInfo(struct i2c_client *client) uData[0] = 0; uData[1] = 0; - TPD_LOG("%s\n", __FUNCTION__); + TPD_LOG("%s\n", __func__); TPD_LOG("Read Firmware Info\n"); @@ -274,7 +274,7 @@ void SynaReadFirmwareInfo(struct i2c_client *client) void SynaReadConfigInfo(struct i2c_client *client) { unsigned char uData[2]; - TPD_LOG("%s\n", __FUNCTION__); + TPD_LOG("%s\n", __func__); TPD_LOG("Read Config Info\n"); @@ -291,7 +291,7 @@ void SynaReadConfigInfo(struct i2c_client *client) void SynaReadBootloadID(struct i2c_client *client) { unsigned char uData[2]; - TPD_LOG("%s\n", __FUNCTION__); + TPD_LOG("%s\n", __func__); readRMI(client, SynaF34ReflashQuery_BootID, &uData[0], 2); SynaBootloadID = uData[0] + uData[1] * 0x100; @@ -302,7 +302,7 @@ void SynaReadBootloadID(struct i2c_client *client) void SynaWriteBootloadID(struct i2c_client *client) { unsigned char uData[2]; - TPD_LOG("%s\n", __FUNCTION__); + TPD_LOG("%s\n", __func__); uData[0] = SynaBootloadID % 0x100; uData[1] = SynaBootloadID / 0x100; @@ -357,7 +357,7 @@ int SynaEnableFlashing(struct i2c_client *client) int ret; unsigned char uData; unsigned char uStatus; - TPD_LOG("%s\n", __FUNCTION__); + TPD_LOG("%s\n", __func__); TPD_LOG("Enable Reflash...\n"); @@ -407,7 +407,7 @@ int SynaProgramConfiguration(struct i2c_client *client) unsigned char *puData = (unsigned char *)&my_image_bin[0xb100]; unsigned short blockNum; - TPD_LOG("%s\n", __FUNCTION__); + TPD_LOG("%s\n", __func__); TPD_LOG("Program Configuration Section...\n"); @@ -437,7 +437,7 @@ int SynaFinalizeReflash(struct i2c_client *client) int ret; unsigned char uData; unsigned char uStatus; - TPD_LOG("%s\n", __FUNCTION__); + TPD_LOG("%s\n", __func__); TPD_LOG("Finalizing Reflash...\n"); @@ -483,7 +483,7 @@ int SynaFlashFirmwareWrite(struct i2c_client *client) unsigned char *puFirmwareData = (unsigned char *)&my_image_bin[0x100]; unsigned char uData[2]; unsigned short blockNum; - TPD_LOG("%s\n", __FUNCTION__); + TPD_LOG("%s\n", __func__); for (blockNum = 0; blockNum < SynaFirmwareBlockCount; ++blockNum) { @@ -513,7 +513,7 @@ int SynaProgramFirmware(struct i2c_client *client) { int ret; unsigned char uData; - TPD_LOG("%s\n", __FUNCTION__); + TPD_LOG("%s\n", __func__); TPD_LOG("Program Firmware Section...\n"); @@ -541,7 +541,7 @@ int SynaProgramFirmware(struct i2c_client *client) int eraseConfigBlock(struct i2c_client *client) { unsigned char uData; - TPD_LOG("%s\n", __FUNCTION__); + TPD_LOG("%s\n", __func__); // Erase of config block is done by first entering into bootloader mode SynaReadBootloadID(client); @@ -567,7 +567,7 @@ void CRC_Calculate(unsigned short * data, unsigned short len) unsigned long Data_CRC = 0xffffffff; unsigned long sum1 = (unsigned long)(Data_CRC & 0xFFFF); unsigned long sum2 = (unsigned long)(Data_CRC >> 16); - TPD_LOG("%s\n", __FUNCTION__); + TPD_LOG("%s\n", __func__); for (i = 0; i < len; i++) { @@ -663,7 +663,7 @@ int ConfigBlockReflash(struct i2c_client *client) { int ret; unsigned char uData[2]; - TPD_LOG("%s\n", __FUNCTION__); + TPD_LOG("%s\n", __func__); SynaInitialize(client); @@ -720,7 +720,7 @@ int ConfigBlockReflash(struct i2c_client *client) int CompleteReflash(struct i2c_client *client) { int ret; - TPD_LOG("%s\n", __FUNCTION__); + TPD_LOG("%s\n", __func__); SynaInitialize(client); SynaReadConfigInfo(client); @@ -759,7 +759,7 @@ int CompleteReflash(struct i2c_client *client) int CompleteReflash_Lockdown(struct i2c_client *client) { int ret; - TPD_LOG("%s\n", __FUNCTION__); + TPD_LOG("%s\n", __func__); SynaInitialize(client); diff --git a/drivers/input/touchscreen/mediatek/synaptics_2202/synaptics_ts.h b/drivers/input/touchscreen/mediatek/synaptics_2202/synaptics_ts.h index 336d81d5b..8a17e40b9 100644 --- a/drivers/input/touchscreen/mediatek/synaptics_2202/synaptics_ts.h +++ b/drivers/input/touchscreen/mediatek/synaptics_2202/synaptics_ts.h @@ -42,13 +42,13 @@ #endif #if defined(SYNAPTICS_RMI4_I2C_DEBUG_PRINT) -#define SYNAPTICS_DEBUG_MSG(fmt, args...) printk(KERN_ERR "[Touch D] [%s %d] " fmt, __FUNCTION__, __LINE__, ##args); +#define SYNAPTICS_DEBUG_MSG(fmt, args...) printk(KERN_ERR "[Touch D] [%s %d] " fmt, __func__, __LINE__, ##args); #else #define SYNAPTICS_DEBUG_MSG(fmt, args...) {}; #endif #if defined(SYNAPTICS_RMI4_I2C_ERROR_PRINT) -#define SYNAPTICS_ERR_MSG(fmt, args...) printk(KERN_ERR "[Touch E] [%s %d] " fmt, __FUNCTION__, __LINE__, ##args); +#define SYNAPTICS_ERR_MSG(fmt, args...) printk(KERN_ERR "[Touch E] [%s %d] " fmt, __func__, __LINE__, ##args); #else #define SYNAPTICS_ERR_MSG(fmt, args...) {}; #endif diff --git a/drivers/input/touchscreen/mediatek/synaptics_2202/synaptics_ts_fw_upgrade.c b/drivers/input/touchscreen/mediatek/synaptics_2202/synaptics_ts_fw_upgrade.c index accd0e9e7..e53da9303 100644 --- a/drivers/input/touchscreen/mediatek/synaptics_2202/synaptics_ts_fw_upgrade.c +++ b/drivers/input/touchscreen/mediatek/synaptics_2202/synaptics_ts_fw_upgrade.c @@ -172,7 +172,7 @@ void SynaSetup(struct synaptics_ts_data *ts) { unsigned char address; unsigned char buffer[6]; - SYNAPTICS_INFO_MSG("%s\n", __FUNCTION__); + SYNAPTICS_INFO_MSG("%s\n", __func__); for (address = 0xe9; address > 0xd0; address = address - 6) { @@ -230,7 +230,7 @@ void SynaInitialize(struct synaptics_ts_data *ts) { unsigned char uData[2]; - SYNAPTICS_INFO_MSG("%s\n", __FUNCTION__); + SYNAPTICS_INFO_MSG("%s\n", __func__); SYNAPTICS_INFO_MSG("Initializing Reflash Process...\n"); uData[0] = 0x00; @@ -256,7 +256,7 @@ void SynaReadFirmwareInfo(struct synaptics_ts_data *ts) uData[0] = 0; uData[1] = 0; - SYNAPTICS_INFO_MSG("%s\n", __FUNCTION__); + SYNAPTICS_INFO_MSG("%s\n", __func__); SYNAPTICS_INFO_MSG("Read Firmware Info\n"); @@ -274,7 +274,7 @@ void SynaReadFirmwareInfo(struct synaptics_ts_data *ts) void SynaReadConfigInfo(struct synaptics_ts_data *ts) { unsigned char uData[2]; - SYNAPTICS_INFO_MSG("%s\n", __FUNCTION__); + SYNAPTICS_INFO_MSG("%s\n", __func__); SYNAPTICS_INFO_MSG("Read Config Info\n"); @@ -291,7 +291,7 @@ void SynaReadConfigInfo(struct synaptics_ts_data *ts) void SynaReadBootloadID(struct synaptics_ts_data *ts) { unsigned char uData[2]; - SYNAPTICS_INFO_MSG("%s\n", __FUNCTION__); + SYNAPTICS_INFO_MSG("%s\n", __func__); readRMI(ts->client, SynaF34ReflashQuery_BootID, &uData[0], 2); SynaBootloadID = uData[0] + uData[1] * 0x100; @@ -302,7 +302,7 @@ void SynaReadBootloadID(struct synaptics_ts_data *ts) void SynaWriteBootloadID(struct synaptics_ts_data *ts) { unsigned char uData[2]; - SYNAPTICS_INFO_MSG("%s\n", __FUNCTION__); + SYNAPTICS_INFO_MSG("%s\n", __func__); uData[0] = SynaBootloadID % 0x100; uData[1] = SynaBootloadID / 0x100; @@ -357,7 +357,7 @@ int SynaEnableFlashing(struct synaptics_ts_data *ts) int ret; unsigned char uData; unsigned char uStatus; - SYNAPTICS_INFO_MSG("%s\n", __FUNCTION__); + SYNAPTICS_INFO_MSG("%s\n", __func__); SYNAPTICS_INFO_MSG("Enable Reflash...\n"); @@ -407,7 +407,7 @@ int SynaProgramConfiguration(struct synaptics_ts_data *ts) unsigned char *puData = (unsigned char *)&my_image_bin[0xb100]; unsigned short blockNum; - SYNAPTICS_INFO_MSG("%s\n", __FUNCTION__); + SYNAPTICS_INFO_MSG("%s\n", __func__); SYNAPTICS_INFO_MSG("Program Configuration Section...\n"); @@ -437,7 +437,7 @@ int SynaFinalizeReflash(struct synaptics_ts_data *ts) int ret; unsigned char uData; unsigned char uStatus; - SYNAPTICS_INFO_MSG("%s\n", __FUNCTION__); + SYNAPTICS_INFO_MSG("%s\n", __func__); SYNAPTICS_INFO_MSG("Finalizing Reflash...\n"); @@ -483,7 +483,7 @@ int SynaFlashFirmwareWrite(struct synaptics_ts_data *ts) unsigned char *puFirmwareData = (unsigned char *)&my_image_bin[0x100]; unsigned char uData[2]; unsigned short blockNum; - SYNAPTICS_INFO_MSG("%s\n", __FUNCTION__); + SYNAPTICS_INFO_MSG("%s\n", __func__); for (blockNum = 0; blockNum < SynaFirmwareBlockCount; ++blockNum) { @@ -513,7 +513,7 @@ int SynaProgramFirmware(struct synaptics_ts_data *ts) { int ret; unsigned char uData; - SYNAPTICS_INFO_MSG("%s\n", __FUNCTION__); + SYNAPTICS_INFO_MSG("%s\n", __func__); SYNAPTICS_INFO_MSG("Program Firmware Section...\n"); @@ -541,7 +541,7 @@ int SynaProgramFirmware(struct synaptics_ts_data *ts) int eraseConfigBlock(struct synaptics_ts_data *ts) { unsigned char uData; - SYNAPTICS_INFO_MSG("%s\n", __FUNCTION__); + SYNAPTICS_INFO_MSG("%s\n", __func__); // Erase of config block is done by first entering into bootloader mode SynaReadBootloadID(ts); @@ -567,7 +567,7 @@ void CRC_Calculate(unsigned short * data, unsigned short len) unsigned long Data_CRC = 0xffffffff; unsigned long sum1 = (unsigned long)(Data_CRC & 0xFFFF); unsigned long sum2 = (unsigned long)(Data_CRC >> 16); - SYNAPTICS_INFO_MSG("%s\n", __FUNCTION__); + SYNAPTICS_INFO_MSG("%s\n", __func__); for (i = 0; i < len; i++) { @@ -663,7 +663,7 @@ int ConfigBlockReflash(struct synaptics_ts_data *ts) { int ret; unsigned char uData[2]; - SYNAPTICS_INFO_MSG("%s\n", __FUNCTION__); + SYNAPTICS_INFO_MSG("%s\n", __func__); SynaInitialize(ts); @@ -720,7 +720,7 @@ int ConfigBlockReflash(struct synaptics_ts_data *ts) int CompleteReflash(struct synaptics_ts_data *ts) { int ret; - SYNAPTICS_INFO_MSG("%s\n", __FUNCTION__); + SYNAPTICS_INFO_MSG("%s\n", __func__); SynaInitialize(ts); SynaReadConfigInfo(ts); @@ -759,7 +759,7 @@ int CompleteReflash(struct synaptics_ts_data *ts) int CompleteReflash_Lockdown(struct synaptics_ts_data *ts) { int ret; - SYNAPTICS_INFO_MSG("%s\n", __FUNCTION__); + SYNAPTICS_INFO_MSG("%s\n", __func__); SynaInitialize(ts); diff --git a/drivers/input/touchscreen/mediatek/synaptics_3320/RefCode_CustomerImplementation.c b/drivers/input/touchscreen/mediatek/synaptics_3320/RefCode_CustomerImplementation.c index bea0a9841..22f08a863 100644 --- a/drivers/input/touchscreen/mediatek/synaptics_3320/RefCode_CustomerImplementation.c +++ b/drivers/input/touchscreen/mediatek/synaptics_3320/RefCode_CustomerImplementation.c @@ -207,7 +207,7 @@ void read_log(char *filename, const struct touch_platform_data *pdata) printk("[s3528-read_log]read file open %s, fd : %d\n", (fd >= 0)? "success": "fail", fd); if (fd >= 0) { - printk("[s3528-read_log]open read_log funcion in /sns/touch/cap_diff_test.txt\n",__FUNCTION__); + printk("[s3528-read_log]open read_log funcion in /sns/touch/cap_diff_test.txt\n",__func__); while(sys_read(fd, buf, 1024)) { printk("[s3528-read_log]sys_read success\n"); diff --git a/drivers/input/touchscreen/mediatek/synaptics_3320/RefCode_F54.c b/drivers/input/touchscreen/mediatek/synaptics_3320/RefCode_F54.c index e929263b0..285a95e79 100644 --- a/drivers/input/touchscreen/mediatek/synaptics_3320/RefCode_F54.c +++ b/drivers/input/touchscreen/mediatek/synaptics_3320/RefCode_F54.c @@ -2249,7 +2249,7 @@ int ImageTest(int mode, char *buf) // Assign report type for Full Raw Image data = 20;//raw capacitance mode - TOUCH_INFO_MSG("[Touch][%s] raw capacitance mode!\n", __FUNCTION__); + TOUCH_INFO_MSG("[Touch][%s] raw capacitance mode!\n", __func__); Write8BitRegisters(F54DataBase, &data, 1); //mode setting @@ -2276,7 +2276,7 @@ int DeltaTest(char *buf) // Assign report type for Full Raw Image data = 0x02;//delta mode - TOUCH_INFO_MSG("[Touch][%s] delta mode!\n", __FUNCTION__); + TOUCH_INFO_MSG("[Touch][%s] delta mode!\n", __func__); Write8BitRegisters(F54DataBase, &data, 1); @@ -2296,7 +2296,7 @@ int NoiseDeltaTest(char *buf) memset(NoiseDeltaMin, 0, TRX_MAX * TRX_MAX * sizeof(short)); memset(NoiseDeltaMax, 0, TRX_MAX * TRX_MAX * sizeof(short)); - TOUCH_INFO_MSG("[Touch][%s] Noise Delta mode!\n", __FUNCTION__); + TOUCH_INFO_MSG("[Touch][%s] Noise Delta mode!\n", __func__); // Assign report type for Full Raw Image data = 0x02;//delta mode diff --git a/drivers/input/touchscreen/mediatek/synaptics_3320/RefCode_F54.h b/drivers/input/touchscreen/mediatek/synaptics_3320/RefCode_F54.h index 56961b568..8bdff5736 100644 --- a/drivers/input/touchscreen/mediatek/synaptics_3320/RefCode_F54.h +++ b/drivers/input/touchscreen/mediatek/synaptics_3320/RefCode_F54.h @@ -65,8 +65,8 @@ extern int ReadF54BitRegisters(unsigned short regAddr, unsigned char *data, int extern int get_limit(unsigned char Tx, unsigned char Rx, struct i2c_client client, const struct touch_platform_data *pdata, char *breakpoint, int limit_data[32][32]); #define TPD_TAG "[S3320] " -#define TPD_FUN(f) printk(KERN_ERR TPD_TAG"%s\n", __FUNCTION__) -#define TPD_ERR(fmt, args...) printk(KERN_ERR TPD_TAG"%s %d : "fmt, __FUNCTION__, __LINE__, ##args) +#define TPD_FUN(f) printk(KERN_ERR TPD_TAG"%s\n", __func__) +#define TPD_ERR(fmt, args...) printk(KERN_ERR TPD_TAG"%s %d : "fmt, __func__, __LINE__, ##args) #define TPD_LOG(fmt, args...) printk(KERN_ERR TPD_TAG fmt, ##args) #define TOUCH_INFO_MSG(fmt, args...) \ diff --git a/drivers/input/touchscreen/mediatek/synaptics_3320/s3320_driver.h b/drivers/input/touchscreen/mediatek/synaptics_3320/s3320_driver.h index aa3ac1e5d..4e8e47b3b 100644 --- a/drivers/input/touchscreen/mediatek/synaptics_3320/s3320_driver.h +++ b/drivers/input/touchscreen/mediatek/synaptics_3320/s3320_driver.h @@ -18,8 +18,8 @@ * Debugging Macros ****************************************************************************/ #define TPD_TAG "[S3320] " -#define TPD_FUN(f) printk(KERN_ERR TPD_TAG"%s\n", __FUNCTION__) -#define TPD_ERR(fmt, args...) printk(KERN_ERR TPD_TAG"%s %d : "fmt, __FUNCTION__, __LINE__, ##args) +#define TPD_FUN(f) printk(KERN_ERR TPD_TAG"%s\n", __func__) +#define TPD_ERR(fmt, args...) printk(KERN_ERR TPD_TAG"%s %d : "fmt, __func__, __LINE__, ##args) #define TPD_LOG(fmt, args...) printk(KERN_ERR TPD_TAG fmt, ##args) diff --git a/drivers/input/touchscreen/mediatek/synaptics_3320/s3320_fw_update.c b/drivers/input/touchscreen/mediatek/synaptics_3320/s3320_fw_update.c index 487ecb9b4..6c00b5b03 100644 --- a/drivers/input/touchscreen/mediatek/synaptics_3320/s3320_fw_update.c +++ b/drivers/input/touchscreen/mediatek/synaptics_3320/s3320_fw_update.c @@ -230,7 +230,7 @@ bool CheckFlashStatus(enum FlashCommand command, struct i2c_client *client) void SynaImageParser(struct i2c_client *client) { -TPD_LOG("%s\n", __FUNCTION__); +TPD_LOG("%s\n", __func__); // img file parsing SynaImageSize = ( (unsigned int)my_image_bin[0x08] | (unsigned int)my_image_bin[0x09] <<8 | @@ -263,7 +263,7 @@ void SynaBootloaderLock(struct i2c_client *client) unsigned short uBlockNum = 0; enum FlashCommand cmd; -TPD_LOG("%s\n", __FUNCTION__); +TPD_LOG("%s\n", __func__); if (my_image_bin[0x1E] == 0) { @@ -343,7 +343,7 @@ void SynaScanPDT(struct i2c_client *client) unsigned char address=0; unsigned char uData[2]={0,}; unsigned char buffer[6]={0,}; - TPD_LOG("%s\n", __FUNCTION__); + TPD_LOG("%s\n", __func__); for (address = 0xe9; address > 0xc0; address = address - 6) { @@ -400,7 +400,7 @@ void SynaInitialize(struct i2c_client *client) { u8 data; - TPD_LOG("%s\n", __FUNCTION__); + TPD_LOG("%s\n", __func__); TPD_LOG("\nInitializing Reflash Process...\n"); data = 0x00; @@ -429,7 +429,7 @@ void SynaReadFirmwareInfo(struct i2c_client *client) unsigned char uData[3] = {0,}; unsigned char product_id[11] = {0,}; int firmware_version = 0; - TPD_LOG("%s\n", __FUNCTION__); + TPD_LOG("%s\n", __func__); readRMI(client, SynaF01QueryBase + 11, product_id, 10); product_id[10] = '\0'; @@ -448,7 +448,7 @@ void SynaReadFirmwareInfo(struct i2c_client *client) void SynaReadBootloadID(struct i2c_client *client) { unsigned char uData[2] = {0,}; - TPD_LOG("%s\n", __FUNCTION__); + TPD_LOG("%s\n", __func__); readRMI(client, SynaF34ReflashQuery_BootID, &uData[0], 2); SynaBootloadID = uData[0] | (uData[1] << 8); @@ -459,7 +459,7 @@ void SynaReadBootloadID(struct i2c_client *client) void SynaWriteBootloadID(struct i2c_client *client) { unsigned char uData[2]; - TPD_LOG("%s\n", __FUNCTION__); + TPD_LOG("%s\n", __func__); uData[0] = SynaBootloadID % 0x100; uData[1] = SynaBootloadID / 0x100; @@ -497,7 +497,7 @@ void SynaEnableFlashing(struct i2c_client *client) { unsigned char uStatus = 0; enum FlashCommand cmd; - TPD_LOG("%s\n", __FUNCTION__); + TPD_LOG("%s\n", __func__); TPD_LOG("Enable Reflash...\n"); readRMI (client, SynaF01DataBase, &uStatus, 1); @@ -622,7 +622,7 @@ void SynaFinalizeReflash(struct i2c_client *client) "CRC in progress\n" }; - TPD_LOG("%s\n", __FUNCTION__); + TPD_LOG("%s\n", __func__); TPD_LOG("\nFinalizing Reflash...\n"); // Issue the "Reset" command to F01 command register to reset the chip @@ -658,7 +658,7 @@ void SynaFlashFirmwareWrite(struct i2c_client *client) unsigned short blockNum; enum FlashCommand cmd; - TPD_LOG("%s\n", __FUNCTION__); + TPD_LOG("%s\n", __func__); for (blockNum = 0; blockNum < SynaFirmwareBlockCount; ++blockNum) { if (blockNum == 0) @@ -699,7 +699,7 @@ void SynaFlashConfigWrite(struct i2c_client *client) unsigned short blockNum; enum FlashCommand cmd; - TPD_LOG("%s\n", __FUNCTION__); + TPD_LOG("%s\n", __func__); for (blockNum = 0; blockNum < SynaConfigBlockCount; ++blockNum) { //Block by blcok, write the block number and data to the corresponding F34 data registers @@ -732,7 +732,7 @@ void SynaFlashConfigWrite(struct i2c_client *client) */ void SynaProgramFirmware(struct i2c_client *client) { - TPD_LOG("%s\n", __FUNCTION__); + TPD_LOG("%s\n", __func__); TPD_LOG("\nProgram Firmware Section...\n"); eraseAllBlock(client); @@ -746,7 +746,7 @@ void SynaProgramFirmware(struct i2c_client *client) */ void SynaUpdateConfig(struct i2c_client *client) { - TPD_LOG("%s\n", __FUNCTION__); + TPD_LOG("%s\n", __func__); TPD_LOG("\nUpdate Config Section...\n"); EraseConfigBlock(client); @@ -760,7 +760,7 @@ void eraseAllBlock(struct i2c_client *client) { enum FlashCommand cmd; - TPD_LOG("%s\n", __FUNCTION__); + TPD_LOG("%s\n", __func__); // Erase of config block is done by first entering into bootloader mode SynaReadBootloadID(client); SynaWriteBootloadID(client); @@ -779,7 +779,7 @@ void EraseConfigBlock(struct i2c_client *client) { enum FlashCommand cmd; - TPD_LOG("%s\n", __FUNCTION__); + TPD_LOG("%s\n", __func__); // Erase of config block is done by first entering into bootloader mode SynaReadBootloadID(client); SynaWriteBootloadID(client); @@ -800,7 +800,7 @@ bool CheckTouchControllerType(struct i2c_client *client) char controllerType[20]={0,}; unsigned char uData[4]={0,}; - TPD_LOG("%s\n", __FUNCTION__); + TPD_LOG("%s\n", __func__); readRMI(client, (SynaF01QueryBase + 22), &SynaF01Query43Length, 1); //43 if ((SynaF01Query43Length & 0x0f) > 0) @@ -827,7 +827,7 @@ bool CheckFimrwareRevision(struct i2c_client *client) unsigned char uData[16]; char revision[106]; - TPD_LOG("%s\n", __FUNCTION__); + TPD_LOG("%s\n", __func__); readRMI((SynaF01QueryBase + 28 + SynaF01Query43Length), &uData[0], 16); for (int i = 0; i < 0; i++) diff --git a/drivers/input/touchscreen/mediatek/synaptics_3320_47/RefCode_CustomerImplementation.c b/drivers/input/touchscreen/mediatek/synaptics_3320_47/RefCode_CustomerImplementation.c index bea0a9841..22f08a863 100644 --- a/drivers/input/touchscreen/mediatek/synaptics_3320_47/RefCode_CustomerImplementation.c +++ b/drivers/input/touchscreen/mediatek/synaptics_3320_47/RefCode_CustomerImplementation.c @@ -207,7 +207,7 @@ void read_log(char *filename, const struct touch_platform_data *pdata) printk("[s3528-read_log]read file open %s, fd : %d\n", (fd >= 0)? "success": "fail", fd); if (fd >= 0) { - printk("[s3528-read_log]open read_log funcion in /sns/touch/cap_diff_test.txt\n",__FUNCTION__); + printk("[s3528-read_log]open read_log funcion in /sns/touch/cap_diff_test.txt\n",__func__); while(sys_read(fd, buf, 1024)) { printk("[s3528-read_log]sys_read success\n"); diff --git a/drivers/input/touchscreen/mediatek/synaptics_3320_47/RefCode_F54.c b/drivers/input/touchscreen/mediatek/synaptics_3320_47/RefCode_F54.c index e929263b0..285a95e79 100644 --- a/drivers/input/touchscreen/mediatek/synaptics_3320_47/RefCode_F54.c +++ b/drivers/input/touchscreen/mediatek/synaptics_3320_47/RefCode_F54.c @@ -2249,7 +2249,7 @@ int ImageTest(int mode, char *buf) // Assign report type for Full Raw Image data = 20;//raw capacitance mode - TOUCH_INFO_MSG("[Touch][%s] raw capacitance mode!\n", __FUNCTION__); + TOUCH_INFO_MSG("[Touch][%s] raw capacitance mode!\n", __func__); Write8BitRegisters(F54DataBase, &data, 1); //mode setting @@ -2276,7 +2276,7 @@ int DeltaTest(char *buf) // Assign report type for Full Raw Image data = 0x02;//delta mode - TOUCH_INFO_MSG("[Touch][%s] delta mode!\n", __FUNCTION__); + TOUCH_INFO_MSG("[Touch][%s] delta mode!\n", __func__); Write8BitRegisters(F54DataBase, &data, 1); @@ -2296,7 +2296,7 @@ int NoiseDeltaTest(char *buf) memset(NoiseDeltaMin, 0, TRX_MAX * TRX_MAX * sizeof(short)); memset(NoiseDeltaMax, 0, TRX_MAX * TRX_MAX * sizeof(short)); - TOUCH_INFO_MSG("[Touch][%s] Noise Delta mode!\n", __FUNCTION__); + TOUCH_INFO_MSG("[Touch][%s] Noise Delta mode!\n", __func__); // Assign report type for Full Raw Image data = 0x02;//delta mode diff --git a/drivers/input/touchscreen/mediatek/synaptics_3320_47/RefCode_F54.h b/drivers/input/touchscreen/mediatek/synaptics_3320_47/RefCode_F54.h index 56961b568..8bdff5736 100644 --- a/drivers/input/touchscreen/mediatek/synaptics_3320_47/RefCode_F54.h +++ b/drivers/input/touchscreen/mediatek/synaptics_3320_47/RefCode_F54.h @@ -65,8 +65,8 @@ extern int ReadF54BitRegisters(unsigned short regAddr, unsigned char *data, int extern int get_limit(unsigned char Tx, unsigned char Rx, struct i2c_client client, const struct touch_platform_data *pdata, char *breakpoint, int limit_data[32][32]); #define TPD_TAG "[S3320] " -#define TPD_FUN(f) printk(KERN_ERR TPD_TAG"%s\n", __FUNCTION__) -#define TPD_ERR(fmt, args...) printk(KERN_ERR TPD_TAG"%s %d : "fmt, __FUNCTION__, __LINE__, ##args) +#define TPD_FUN(f) printk(KERN_ERR TPD_TAG"%s\n", __func__) +#define TPD_ERR(fmt, args...) printk(KERN_ERR TPD_TAG"%s %d : "fmt, __func__, __LINE__, ##args) #define TPD_LOG(fmt, args...) printk(KERN_ERR TPD_TAG fmt, ##args) #define TOUCH_INFO_MSG(fmt, args...) \ diff --git a/drivers/input/touchscreen/mediatek/synaptics_3320_47/s3320_driver.h b/drivers/input/touchscreen/mediatek/synaptics_3320_47/s3320_driver.h index aa3ac1e5d..4e8e47b3b 100644 --- a/drivers/input/touchscreen/mediatek/synaptics_3320_47/s3320_driver.h +++ b/drivers/input/touchscreen/mediatek/synaptics_3320_47/s3320_driver.h @@ -18,8 +18,8 @@ * Debugging Macros ****************************************************************************/ #define TPD_TAG "[S3320] " -#define TPD_FUN(f) printk(KERN_ERR TPD_TAG"%s\n", __FUNCTION__) -#define TPD_ERR(fmt, args...) printk(KERN_ERR TPD_TAG"%s %d : "fmt, __FUNCTION__, __LINE__, ##args) +#define TPD_FUN(f) printk(KERN_ERR TPD_TAG"%s\n", __func__) +#define TPD_ERR(fmt, args...) printk(KERN_ERR TPD_TAG"%s %d : "fmt, __func__, __LINE__, ##args) #define TPD_LOG(fmt, args...) printk(KERN_ERR TPD_TAG fmt, ##args) diff --git a/drivers/input/touchscreen/mediatek/synaptics_3320_47/s3320_fw_update.c b/drivers/input/touchscreen/mediatek/synaptics_3320_47/s3320_fw_update.c index 487ecb9b4..6c00b5b03 100644 --- a/drivers/input/touchscreen/mediatek/synaptics_3320_47/s3320_fw_update.c +++ b/drivers/input/touchscreen/mediatek/synaptics_3320_47/s3320_fw_update.c @@ -230,7 +230,7 @@ bool CheckFlashStatus(enum FlashCommand command, struct i2c_client *client) void SynaImageParser(struct i2c_client *client) { -TPD_LOG("%s\n", __FUNCTION__); +TPD_LOG("%s\n", __func__); // img file parsing SynaImageSize = ( (unsigned int)my_image_bin[0x08] | (unsigned int)my_image_bin[0x09] <<8 | @@ -263,7 +263,7 @@ void SynaBootloaderLock(struct i2c_client *client) unsigned short uBlockNum = 0; enum FlashCommand cmd; -TPD_LOG("%s\n", __FUNCTION__); +TPD_LOG("%s\n", __func__); if (my_image_bin[0x1E] == 0) { @@ -343,7 +343,7 @@ void SynaScanPDT(struct i2c_client *client) unsigned char address=0; unsigned char uData[2]={0,}; unsigned char buffer[6]={0,}; - TPD_LOG("%s\n", __FUNCTION__); + TPD_LOG("%s\n", __func__); for (address = 0xe9; address > 0xc0; address = address - 6) { @@ -400,7 +400,7 @@ void SynaInitialize(struct i2c_client *client) { u8 data; - TPD_LOG("%s\n", __FUNCTION__); + TPD_LOG("%s\n", __func__); TPD_LOG("\nInitializing Reflash Process...\n"); data = 0x00; @@ -429,7 +429,7 @@ void SynaReadFirmwareInfo(struct i2c_client *client) unsigned char uData[3] = {0,}; unsigned char product_id[11] = {0,}; int firmware_version = 0; - TPD_LOG("%s\n", __FUNCTION__); + TPD_LOG("%s\n", __func__); readRMI(client, SynaF01QueryBase + 11, product_id, 10); product_id[10] = '\0'; @@ -448,7 +448,7 @@ void SynaReadFirmwareInfo(struct i2c_client *client) void SynaReadBootloadID(struct i2c_client *client) { unsigned char uData[2] = {0,}; - TPD_LOG("%s\n", __FUNCTION__); + TPD_LOG("%s\n", __func__); readRMI(client, SynaF34ReflashQuery_BootID, &uData[0], 2); SynaBootloadID = uData[0] | (uData[1] << 8); @@ -459,7 +459,7 @@ void SynaReadBootloadID(struct i2c_client *client) void SynaWriteBootloadID(struct i2c_client *client) { unsigned char uData[2]; - TPD_LOG("%s\n", __FUNCTION__); + TPD_LOG("%s\n", __func__); uData[0] = SynaBootloadID % 0x100; uData[1] = SynaBootloadID / 0x100; @@ -497,7 +497,7 @@ void SynaEnableFlashing(struct i2c_client *client) { unsigned char uStatus = 0; enum FlashCommand cmd; - TPD_LOG("%s\n", __FUNCTION__); + TPD_LOG("%s\n", __func__); TPD_LOG("Enable Reflash...\n"); readRMI (client, SynaF01DataBase, &uStatus, 1); @@ -622,7 +622,7 @@ void SynaFinalizeReflash(struct i2c_client *client) "CRC in progress\n" }; - TPD_LOG("%s\n", __FUNCTION__); + TPD_LOG("%s\n", __func__); TPD_LOG("\nFinalizing Reflash...\n"); // Issue the "Reset" command to F01 command register to reset the chip @@ -658,7 +658,7 @@ void SynaFlashFirmwareWrite(struct i2c_client *client) unsigned short blockNum; enum FlashCommand cmd; - TPD_LOG("%s\n", __FUNCTION__); + TPD_LOG("%s\n", __func__); for (blockNum = 0; blockNum < SynaFirmwareBlockCount; ++blockNum) { if (blockNum == 0) @@ -699,7 +699,7 @@ void SynaFlashConfigWrite(struct i2c_client *client) unsigned short blockNum; enum FlashCommand cmd; - TPD_LOG("%s\n", __FUNCTION__); + TPD_LOG("%s\n", __func__); for (blockNum = 0; blockNum < SynaConfigBlockCount; ++blockNum) { //Block by blcok, write the block number and data to the corresponding F34 data registers @@ -732,7 +732,7 @@ void SynaFlashConfigWrite(struct i2c_client *client) */ void SynaProgramFirmware(struct i2c_client *client) { - TPD_LOG("%s\n", __FUNCTION__); + TPD_LOG("%s\n", __func__); TPD_LOG("\nProgram Firmware Section...\n"); eraseAllBlock(client); @@ -746,7 +746,7 @@ void SynaProgramFirmware(struct i2c_client *client) */ void SynaUpdateConfig(struct i2c_client *client) { - TPD_LOG("%s\n", __FUNCTION__); + TPD_LOG("%s\n", __func__); TPD_LOG("\nUpdate Config Section...\n"); EraseConfigBlock(client); @@ -760,7 +760,7 @@ void eraseAllBlock(struct i2c_client *client) { enum FlashCommand cmd; - TPD_LOG("%s\n", __FUNCTION__); + TPD_LOG("%s\n", __func__); // Erase of config block is done by first entering into bootloader mode SynaReadBootloadID(client); SynaWriteBootloadID(client); @@ -779,7 +779,7 @@ void EraseConfigBlock(struct i2c_client *client) { enum FlashCommand cmd; - TPD_LOG("%s\n", __FUNCTION__); + TPD_LOG("%s\n", __func__); // Erase of config block is done by first entering into bootloader mode SynaReadBootloadID(client); SynaWriteBootloadID(client); @@ -800,7 +800,7 @@ bool CheckTouchControllerType(struct i2c_client *client) char controllerType[20]={0,}; unsigned char uData[4]={0,}; - TPD_LOG("%s\n", __FUNCTION__); + TPD_LOG("%s\n", __func__); readRMI(client, (SynaF01QueryBase + 22), &SynaF01Query43Length, 1); //43 if ((SynaF01Query43Length & 0x0f) > 0) @@ -827,7 +827,7 @@ bool CheckFimrwareRevision(struct i2c_client *client) unsigned char uData[16]; char revision[106]; - TPD_LOG("%s\n", __FUNCTION__); + TPD_LOG("%s\n", __func__); readRMI((SynaF01QueryBase + 28 + SynaF01Query43Length), &uData[0], 16); for (int i = 0; i < 0; i++) diff --git a/drivers/input/touchscreen/mediatek/synaptics_3320_50/RefCode_CustomerImplementation.c b/drivers/input/touchscreen/mediatek/synaptics_3320_50/RefCode_CustomerImplementation.c index a45fd1287..763973bde 100644 --- a/drivers/input/touchscreen/mediatek/synaptics_3320_50/RefCode_CustomerImplementation.c +++ b/drivers/input/touchscreen/mediatek/synaptics_3320_50/RefCode_CustomerImplementation.c @@ -208,7 +208,7 @@ void read_log(char *filename, const struct touch_platform_data *pdata) printk("[s3528-read_log]read file open %s, fd : %d\n", (fd >= 0)? "success": "fail", fd); if (fd >= 0) { - printk("[s3528-read_log]open read_log funcion in /sns/touch/cap_diff_test.txt\n",__FUNCTION__); + printk("[s3528-read_log]open read_log funcion in /sns/touch/cap_diff_test.txt\n",__func__); while(sys_read(fd, buf, 1024)) { printk("[s3528-read_log]sys_read success\n"); diff --git a/drivers/input/touchscreen/mediatek/synaptics_3320_50/RefCode_F54.c b/drivers/input/touchscreen/mediatek/synaptics_3320_50/RefCode_F54.c index 91c0d1a4a..3d8e674e9 100644 --- a/drivers/input/touchscreen/mediatek/synaptics_3320_50/RefCode_F54.c +++ b/drivers/input/touchscreen/mediatek/synaptics_3320_50/RefCode_F54.c @@ -2249,7 +2249,7 @@ int ImageTest(int mode, char *buf) // Assign report type for Full Raw Image data = 20;//raw capacitance mode - TOUCH_INFO_MSG("[Touch][%s] raw capacitance mode!\n", __FUNCTION__); + TOUCH_INFO_MSG("[Touch][%s] raw capacitance mode!\n", __func__); Write8BitRegisters(F54DataBase, &data, 1); //mode setting @@ -2276,7 +2276,7 @@ int DeltaTest(char *buf) // Assign report type for Full Raw Image data = 0x02;//delta mode - TOUCH_INFO_MSG("[Touch][%s] delta mode!\n", __FUNCTION__); + TOUCH_INFO_MSG("[Touch][%s] delta mode!\n", __func__); Write8BitRegisters(F54DataBase, &data, 1); @@ -2296,7 +2296,7 @@ int NoiseDeltaTest(char *buf) memset(NoiseDeltaMin, 0, TRX_MAX * TRX_MAX * sizeof(short)); memset(NoiseDeltaMax, 0, TRX_MAX * TRX_MAX * sizeof(short)); - TOUCH_INFO_MSG("[Touch][%s] Noise Delta mode!\n", __FUNCTION__); + TOUCH_INFO_MSG("[Touch][%s] Noise Delta mode!\n", __func__); // Assign report type for Full Raw Image data = 0x02;//delta mode diff --git a/drivers/input/touchscreen/mediatek/synaptics_3320_50/RefCode_F54.h b/drivers/input/touchscreen/mediatek/synaptics_3320_50/RefCode_F54.h index 3bf5b5de6..98b2feb4e 100644 --- a/drivers/input/touchscreen/mediatek/synaptics_3320_50/RefCode_F54.h +++ b/drivers/input/touchscreen/mediatek/synaptics_3320_50/RefCode_F54.h @@ -65,8 +65,8 @@ extern int ReadF54BitRegisters(unsigned short regAddr, unsigned char *data, int extern int get_limit(unsigned char Tx, unsigned char Rx, struct i2c_client client, const struct touch_platform_data *pdata, char *breakpoint, int limit_data[32][32]); #define TPD_TAG "[S3320] " -#define TPD_FUN(f) printk(KERN_ERR TPD_TAG"%s\n", __FUNCTION__) -#define TPD_ERR(fmt, args...) printk(KERN_ERR TPD_TAG"%s %d : "fmt, __FUNCTION__, __LINE__, ##args) +#define TPD_FUN(f) printk(KERN_ERR TPD_TAG"%s\n", __func__) +#define TPD_ERR(fmt, args...) printk(KERN_ERR TPD_TAG"%s %d : "fmt, __func__, __LINE__, ##args) #define TPD_LOG(fmt, args...) printk(KERN_ERR TPD_TAG fmt, ##args) #define TOUCH_INFO_MSG(fmt, args...) \ diff --git a/drivers/input/touchscreen/mediatek/synaptics_3320_50/s3320_driver.h b/drivers/input/touchscreen/mediatek/synaptics_3320_50/s3320_driver.h index aa3ac1e5d..4e8e47b3b 100644 --- a/drivers/input/touchscreen/mediatek/synaptics_3320_50/s3320_driver.h +++ b/drivers/input/touchscreen/mediatek/synaptics_3320_50/s3320_driver.h @@ -18,8 +18,8 @@ * Debugging Macros ****************************************************************************/ #define TPD_TAG "[S3320] " -#define TPD_FUN(f) printk(KERN_ERR TPD_TAG"%s\n", __FUNCTION__) -#define TPD_ERR(fmt, args...) printk(KERN_ERR TPD_TAG"%s %d : "fmt, __FUNCTION__, __LINE__, ##args) +#define TPD_FUN(f) printk(KERN_ERR TPD_TAG"%s\n", __func__) +#define TPD_ERR(fmt, args...) printk(KERN_ERR TPD_TAG"%s %d : "fmt, __func__, __LINE__, ##args) #define TPD_LOG(fmt, args...) printk(KERN_ERR TPD_TAG fmt, ##args) diff --git a/drivers/input/touchscreen/mediatek/synaptics_3320_50/s3320_fw_update.c b/drivers/input/touchscreen/mediatek/synaptics_3320_50/s3320_fw_update.c index 487ecb9b4..6c00b5b03 100644 --- a/drivers/input/touchscreen/mediatek/synaptics_3320_50/s3320_fw_update.c +++ b/drivers/input/touchscreen/mediatek/synaptics_3320_50/s3320_fw_update.c @@ -230,7 +230,7 @@ bool CheckFlashStatus(enum FlashCommand command, struct i2c_client *client) void SynaImageParser(struct i2c_client *client) { -TPD_LOG("%s\n", __FUNCTION__); +TPD_LOG("%s\n", __func__); // img file parsing SynaImageSize = ( (unsigned int)my_image_bin[0x08] | (unsigned int)my_image_bin[0x09] <<8 | @@ -263,7 +263,7 @@ void SynaBootloaderLock(struct i2c_client *client) unsigned short uBlockNum = 0; enum FlashCommand cmd; -TPD_LOG("%s\n", __FUNCTION__); +TPD_LOG("%s\n", __func__); if (my_image_bin[0x1E] == 0) { @@ -343,7 +343,7 @@ void SynaScanPDT(struct i2c_client *client) unsigned char address=0; unsigned char uData[2]={0,}; unsigned char buffer[6]={0,}; - TPD_LOG("%s\n", __FUNCTION__); + TPD_LOG("%s\n", __func__); for (address = 0xe9; address > 0xc0; address = address - 6) { @@ -400,7 +400,7 @@ void SynaInitialize(struct i2c_client *client) { u8 data; - TPD_LOG("%s\n", __FUNCTION__); + TPD_LOG("%s\n", __func__); TPD_LOG("\nInitializing Reflash Process...\n"); data = 0x00; @@ -429,7 +429,7 @@ void SynaReadFirmwareInfo(struct i2c_client *client) unsigned char uData[3] = {0,}; unsigned char product_id[11] = {0,}; int firmware_version = 0; - TPD_LOG("%s\n", __FUNCTION__); + TPD_LOG("%s\n", __func__); readRMI(client, SynaF01QueryBase + 11, product_id, 10); product_id[10] = '\0'; @@ -448,7 +448,7 @@ void SynaReadFirmwareInfo(struct i2c_client *client) void SynaReadBootloadID(struct i2c_client *client) { unsigned char uData[2] = {0,}; - TPD_LOG("%s\n", __FUNCTION__); + TPD_LOG("%s\n", __func__); readRMI(client, SynaF34ReflashQuery_BootID, &uData[0], 2); SynaBootloadID = uData[0] | (uData[1] << 8); @@ -459,7 +459,7 @@ void SynaReadBootloadID(struct i2c_client *client) void SynaWriteBootloadID(struct i2c_client *client) { unsigned char uData[2]; - TPD_LOG("%s\n", __FUNCTION__); + TPD_LOG("%s\n", __func__); uData[0] = SynaBootloadID % 0x100; uData[1] = SynaBootloadID / 0x100; @@ -497,7 +497,7 @@ void SynaEnableFlashing(struct i2c_client *client) { unsigned char uStatus = 0; enum FlashCommand cmd; - TPD_LOG("%s\n", __FUNCTION__); + TPD_LOG("%s\n", __func__); TPD_LOG("Enable Reflash...\n"); readRMI (client, SynaF01DataBase, &uStatus, 1); @@ -622,7 +622,7 @@ void SynaFinalizeReflash(struct i2c_client *client) "CRC in progress\n" }; - TPD_LOG("%s\n", __FUNCTION__); + TPD_LOG("%s\n", __func__); TPD_LOG("\nFinalizing Reflash...\n"); // Issue the "Reset" command to F01 command register to reset the chip @@ -658,7 +658,7 @@ void SynaFlashFirmwareWrite(struct i2c_client *client) unsigned short blockNum; enum FlashCommand cmd; - TPD_LOG("%s\n", __FUNCTION__); + TPD_LOG("%s\n", __func__); for (blockNum = 0; blockNum < SynaFirmwareBlockCount; ++blockNum) { if (blockNum == 0) @@ -699,7 +699,7 @@ void SynaFlashConfigWrite(struct i2c_client *client) unsigned short blockNum; enum FlashCommand cmd; - TPD_LOG("%s\n", __FUNCTION__); + TPD_LOG("%s\n", __func__); for (blockNum = 0; blockNum < SynaConfigBlockCount; ++blockNum) { //Block by blcok, write the block number and data to the corresponding F34 data registers @@ -732,7 +732,7 @@ void SynaFlashConfigWrite(struct i2c_client *client) */ void SynaProgramFirmware(struct i2c_client *client) { - TPD_LOG("%s\n", __FUNCTION__); + TPD_LOG("%s\n", __func__); TPD_LOG("\nProgram Firmware Section...\n"); eraseAllBlock(client); @@ -746,7 +746,7 @@ void SynaProgramFirmware(struct i2c_client *client) */ void SynaUpdateConfig(struct i2c_client *client) { - TPD_LOG("%s\n", __FUNCTION__); + TPD_LOG("%s\n", __func__); TPD_LOG("\nUpdate Config Section...\n"); EraseConfigBlock(client); @@ -760,7 +760,7 @@ void eraseAllBlock(struct i2c_client *client) { enum FlashCommand cmd; - TPD_LOG("%s\n", __FUNCTION__); + TPD_LOG("%s\n", __func__); // Erase of config block is done by first entering into bootloader mode SynaReadBootloadID(client); SynaWriteBootloadID(client); @@ -779,7 +779,7 @@ void EraseConfigBlock(struct i2c_client *client) { enum FlashCommand cmd; - TPD_LOG("%s\n", __FUNCTION__); + TPD_LOG("%s\n", __func__); // Erase of config block is done by first entering into bootloader mode SynaReadBootloadID(client); SynaWriteBootloadID(client); @@ -800,7 +800,7 @@ bool CheckTouchControllerType(struct i2c_client *client) char controllerType[20]={0,}; unsigned char uData[4]={0,}; - TPD_LOG("%s\n", __FUNCTION__); + TPD_LOG("%s\n", __func__); readRMI(client, (SynaF01QueryBase + 22), &SynaF01Query43Length, 1); //43 if ((SynaF01Query43Length & 0x0f) > 0) @@ -827,7 +827,7 @@ bool CheckFimrwareRevision(struct i2c_client *client) unsigned char uData[16]; char revision[106]; - TPD_LOG("%s\n", __FUNCTION__); + TPD_LOG("%s\n", __func__); readRMI((SynaF01QueryBase + 28 + SynaF01Query43Length), &uData[0], 16); for (int i = 0; i < 0; i++) diff --git a/drivers/input/touchscreen/mediatek/synaptics_3528/s3528_driver.h b/drivers/input/touchscreen/mediatek/synaptics_3528/s3528_driver.h index c7e5773d8..365df3894 100644 --- a/drivers/input/touchscreen/mediatek/synaptics_3528/s3528_driver.h +++ b/drivers/input/touchscreen/mediatek/synaptics_3528/s3528_driver.h @@ -18,8 +18,8 @@ * Debugging Macros ****************************************************************************/ #define TPD_TAG "[Synaptics S3528] " -#define TPD_FUN(f) printk(KERN_ERR TPD_TAG"[%s %d]\n", __FUNCTION__, __LINE__) -#define TPD_ERR(fmt, args...) printk(KERN_ERR TPD_TAG"[%s %d] : "fmt, __FUNCTION__, __LINE__, ##args) +#define TPD_FUN(f) printk(KERN_ERR TPD_TAG"[%s %d]\n", __func__, __LINE__) +#define TPD_ERR(fmt, args...) printk(KERN_ERR TPD_TAG"[%s %d] : "fmt, __func__, __LINE__, ##args) #define TPD_LOG(fmt, args...) printk(KERN_ERR TPD_TAG fmt, ##args) struct synaptics_ts_f12_query_5 { diff --git a/drivers/input/touchscreen/mediatek/synaptics_3528/s3528_fw_update.c b/drivers/input/touchscreen/mediatek/synaptics_3528/s3528_fw_update.c index 4dd2d1e58..cb77a3a49 100644 --- a/drivers/input/touchscreen/mediatek/synaptics_3528/s3528_fw_update.c +++ b/drivers/input/touchscreen/mediatek/synaptics_3528/s3528_fw_update.c @@ -230,7 +230,7 @@ bool CheckFlashStatus(enum FlashCommand command, struct i2c_client *client) void SynaImageParser(struct i2c_client *client) { -TPD_LOG("%s\n", __FUNCTION__); +TPD_LOG("%s\n", __func__); // img file parsing SynaImageSize = ( (unsigned int)my_image_bin[0x08] | (unsigned int)my_image_bin[0x09] <<8 | @@ -263,7 +263,7 @@ void SynaBootloaderLock(struct i2c_client *client) unsigned short uBlockNum = 0; enum FlashCommand cmd; -TPD_LOG("%s\n", __FUNCTION__); +TPD_LOG("%s\n", __func__); if (my_image_bin[0x1E] == 0) { @@ -343,7 +343,7 @@ void SynaScanPDT(struct i2c_client *client) unsigned char address=0; unsigned char uData[2]={0,}; unsigned char buffer[6]={0,}; - TPD_LOG("%s\n", __FUNCTION__); + TPD_LOG("%s\n", __func__); for (address = 0xe9; address > 0xc0; address = address - 6) { @@ -400,7 +400,7 @@ void SynaInitialize(struct i2c_client *client) { u8 data; - TPD_LOG("%s\n", __FUNCTION__); + TPD_LOG("%s\n", __func__); TPD_LOG("\nInitializing Reflash Process...\n"); data = 0x00; @@ -429,7 +429,7 @@ void SynaReadFirmwareInfo(struct i2c_client *client) unsigned char uData[3] = {0,}; unsigned char product_id[11] = {0,}; int firmware_version = 0; - TPD_LOG("%s\n", __FUNCTION__); + TPD_LOG("%s\n", __func__); readRMI(client, SynaF01QueryBase + 11, product_id, 10); product_id[10] = '\0'; @@ -448,7 +448,7 @@ void SynaReadFirmwareInfo(struct i2c_client *client) void SynaReadBootloadID(struct i2c_client *client) { unsigned char uData[2] = {0,}; - TPD_LOG("%s\n", __FUNCTION__); + TPD_LOG("%s\n", __func__); readRMI(client, SynaF34ReflashQuery_BootID, &uData[0], 2); SynaBootloadID = uData[0] | (uData[1] << 8); @@ -459,7 +459,7 @@ void SynaReadBootloadID(struct i2c_client *client) void SynaWriteBootloadID(struct i2c_client *client) { unsigned char uData[2]; - TPD_LOG("%s\n", __FUNCTION__); + TPD_LOG("%s\n", __func__); uData[0] = SynaBootloadID % 0x100; uData[1] = SynaBootloadID / 0x100; @@ -497,7 +497,7 @@ void SynaEnableFlashing(struct i2c_client *client) { unsigned char uStatus = 0; enum FlashCommand cmd; - TPD_LOG("%s\n", __FUNCTION__); + TPD_LOG("%s\n", __func__); TPD_LOG("Enable Reflash...\n"); readRMI (client, SynaF01DataBase, &uStatus, 1); @@ -622,7 +622,7 @@ void SynaFinalizeReflash(struct i2c_client *client) "CRC in progress\n" }; - TPD_LOG("%s\n", __FUNCTION__); + TPD_LOG("%s\n", __func__); TPD_LOG("\nFinalizing Reflash...\n"); // Issue the "Reset" command to F01 command register to reset the chip @@ -658,7 +658,7 @@ void SynaFlashFirmwareWrite(struct i2c_client *client) unsigned short blockNum; enum FlashCommand cmd; - TPD_LOG("%s\n", __FUNCTION__); + TPD_LOG("%s\n", __func__); for (blockNum = 0; blockNum < SynaFirmwareBlockCount; ++blockNum) { if (blockNum == 0) @@ -699,7 +699,7 @@ void SynaFlashConfigWrite(struct i2c_client *client) unsigned short blockNum; enum FlashCommand cmd; - TPD_LOG("%s\n", __FUNCTION__); + TPD_LOG("%s\n", __func__); for (blockNum = 0; blockNum < SynaConfigBlockCount; ++blockNum) { //Block by blcok, write the block number and data to the corresponding F34 data registers @@ -730,7 +730,7 @@ void SynaFlashConfigWrite(struct i2c_client *client) */ void SynaProgramFirmware(struct i2c_client *client) { - TPD_LOG("%s\n", __FUNCTION__); + TPD_LOG("%s\n", __func__); TPD_LOG("\nProgram Firmware Section...\n"); eraseAllBlock(client); @@ -744,7 +744,7 @@ void SynaProgramFirmware(struct i2c_client *client) */ void SynaUpdateConfig(struct i2c_client *client) { - TPD_LOG("%s\n", __FUNCTION__); + TPD_LOG("%s\n", __func__); TPD_LOG("\nUpdate Config Section...\n"); EraseConfigBlock(client); @@ -758,7 +758,7 @@ void eraseAllBlock(struct i2c_client *client) { enum FlashCommand cmd; - TPD_LOG("%s\n", __FUNCTION__); + TPD_LOG("%s\n", __func__); // Erase of config block is done by first entering into bootloader mode SynaReadBootloadID(client); SynaWriteBootloadID(client); @@ -777,7 +777,7 @@ void EraseConfigBlock(struct i2c_client *client) { enum FlashCommand cmd; - TPD_LOG("%s\n", __FUNCTION__); + TPD_LOG("%s\n", __func__); // Erase of config block is done by first entering into bootloader mode SynaReadBootloadID(client); SynaWriteBootloadID(client); @@ -798,7 +798,7 @@ bool CheckTouchControllerType(struct i2c_client *client) char controllerType[20]={0,}; unsigned char uData[4]={0,}; - TPD_LOG("%s\n", __FUNCTION__); + TPD_LOG("%s\n", __func__); readRMI(client, (SynaF01QueryBase + 22), &SynaF01Query43Length, 1); //43 if ((SynaF01Query43Length & 0x0f) > 0) @@ -825,7 +825,7 @@ bool CheckFimrwareRevision(struct i2c_client *client) unsigned char uData[16]; char revision[106]; - TPD_LOG("%s\n", __FUNCTION__); + TPD_LOG("%s\n", __func__); readRMI((SynaF01QueryBase + 28 + SynaF01Query43Length), &uData[0], 16); for (int i = 0; i < 0; i++) diff --git a/drivers/input/touchscreen/mediatek/synaptics_7020/synaptics_ts.h b/drivers/input/touchscreen/mediatek/synaptics_7020/synaptics_ts.h index 671fd0095..f8c1603f9 100644 --- a/drivers/input/touchscreen/mediatek/synaptics_7020/synaptics_ts.h +++ b/drivers/input/touchscreen/mediatek/synaptics_7020/synaptics_ts.h @@ -42,13 +42,13 @@ #endif #if defined(SYNAPTICS_RMI4_I2C_DEBUG_PRINT) -#define SYNAPTICS_DEBUG_MSG(fmt, args...) printk(KERN_ERR "[Touch D] [%s %d] " fmt, __FUNCTION__, __LINE__, ##args); +#define SYNAPTICS_DEBUG_MSG(fmt, args...) printk(KERN_ERR "[Touch D] [%s %d] " fmt, __func__, __LINE__, ##args); #else #define SYNAPTICS_DEBUG_MSG(fmt, args...) {}; #endif #if defined(SYNAPTICS_RMI4_I2C_ERROR_PRINT) -#define SYNAPTICS_ERR_MSG(fmt, args...) printk(KERN_ERR "[Touch E] [%s %d] " fmt, __FUNCTION__, __LINE__, ##args); +#define SYNAPTICS_ERR_MSG(fmt, args...) printk(KERN_ERR "[Touch E] [%s %d] " fmt, __func__, __LINE__, ##args); #else #define SYNAPTICS_ERR_MSG(fmt, args...) {}; #endif diff --git a/drivers/input/touchscreen/mediatek/synaptics_7020/synaptics_ts_fw_upgrade.c b/drivers/input/touchscreen/mediatek/synaptics_7020/synaptics_ts_fw_upgrade.c index ddb54e011..8de6f4959 100644 --- a/drivers/input/touchscreen/mediatek/synaptics_7020/synaptics_ts_fw_upgrade.c +++ b/drivers/input/touchscreen/mediatek/synaptics_7020/synaptics_ts_fw_upgrade.c @@ -172,7 +172,7 @@ void SynaSetup(struct synaptics_ts_data *ts) { unsigned char address; unsigned char buffer[6]; - SYNAPTICS_INFO_MSG("%s\n", __FUNCTION__); + SYNAPTICS_INFO_MSG("%s\n", __func__); for (address = 0xe9; address > 0xd0; address = address - 6) { @@ -230,7 +230,7 @@ void SynaInitialize(struct synaptics_ts_data *ts) { unsigned char uData[2]; - SYNAPTICS_INFO_MSG("%s\n", __FUNCTION__); + SYNAPTICS_INFO_MSG("%s\n", __func__); SYNAPTICS_INFO_MSG("Initializing Reflash Process...\n"); uData[0] = 0x00; @@ -256,7 +256,7 @@ void SynaReadFirmwareInfo(struct synaptics_ts_data *ts) uData[0] = 0; uData[1] = 0; - SYNAPTICS_INFO_MSG("%s\n", __FUNCTION__); + SYNAPTICS_INFO_MSG("%s\n", __func__); SYNAPTICS_INFO_MSG("Read Firmware Info\n"); @@ -274,7 +274,7 @@ void SynaReadFirmwareInfo(struct synaptics_ts_data *ts) void SynaReadConfigInfo(struct synaptics_ts_data *ts) { unsigned char uData[2]; - SYNAPTICS_INFO_MSG("%s\n", __FUNCTION__); + SYNAPTICS_INFO_MSG("%s\n", __func__); SYNAPTICS_INFO_MSG("Read Config Info\n"); @@ -291,7 +291,7 @@ void SynaReadConfigInfo(struct synaptics_ts_data *ts) void SynaReadBootloadID(struct synaptics_ts_data *ts) { unsigned char uData[2]; - SYNAPTICS_INFO_MSG("%s\n", __FUNCTION__); + SYNAPTICS_INFO_MSG("%s\n", __func__); readRMI(ts->client, SynaF34ReflashQuery_BootID, &uData[0], 2); SynaBootloadID = uData[0] + uData[1] * 0x100; @@ -302,7 +302,7 @@ void SynaReadBootloadID(struct synaptics_ts_data *ts) void SynaWriteBootloadID(struct synaptics_ts_data *ts) { unsigned char uData[2]; - SYNAPTICS_INFO_MSG("%s\n", __FUNCTION__); + SYNAPTICS_INFO_MSG("%s\n", __func__); uData[0] = SynaBootloadID % 0x100; uData[1] = SynaBootloadID / 0x100; @@ -357,7 +357,7 @@ int SynaEnableFlashing(struct synaptics_ts_data *ts) int ret; unsigned char uData; unsigned char uStatus; - SYNAPTICS_INFO_MSG("%s\n", __FUNCTION__); + SYNAPTICS_INFO_MSG("%s\n", __func__); SYNAPTICS_INFO_MSG("Enable Reflash...\n"); @@ -407,7 +407,7 @@ int SynaProgramConfiguration(struct synaptics_ts_data *ts) unsigned char *puData = (unsigned char *)&my_image_bin[0xb100]; unsigned short blockNum; - SYNAPTICS_INFO_MSG("%s\n", __FUNCTION__); + SYNAPTICS_INFO_MSG("%s\n", __func__); SYNAPTICS_INFO_MSG("Program Configuration Section...\n"); @@ -437,7 +437,7 @@ int SynaFinalizeReflash(struct synaptics_ts_data *ts) int ret; unsigned char uData; unsigned char uStatus; - SYNAPTICS_INFO_MSG("%s\n", __FUNCTION__); + SYNAPTICS_INFO_MSG("%s\n", __func__); SYNAPTICS_INFO_MSG("Finalizing Reflash...\n"); @@ -483,7 +483,7 @@ int SynaFlashFirmwareWrite(struct synaptics_ts_data *ts) unsigned char *puFirmwareData = (unsigned char *)&my_image_bin[0x100]; unsigned char uData[2]; unsigned short blockNum; - SYNAPTICS_INFO_MSG("%s\n", __FUNCTION__); + SYNAPTICS_INFO_MSG("%s\n", __func__); for (blockNum = 0; blockNum < SynaFirmwareBlockCount; ++blockNum) { @@ -513,7 +513,7 @@ int SynaProgramFirmware(struct synaptics_ts_data *ts) { int ret; unsigned char uData; - SYNAPTICS_INFO_MSG("%s\n", __FUNCTION__); + SYNAPTICS_INFO_MSG("%s\n", __func__); SYNAPTICS_INFO_MSG("Program Firmware Section...\n"); @@ -541,7 +541,7 @@ int SynaProgramFirmware(struct synaptics_ts_data *ts) int eraseConfigBlock(struct synaptics_ts_data *ts) { unsigned char uData; - SYNAPTICS_INFO_MSG("%s\n", __FUNCTION__); + SYNAPTICS_INFO_MSG("%s\n", __func__); // Erase of config block is done by first entering into bootloader mode SynaReadBootloadID(ts); @@ -567,7 +567,7 @@ void CRC_Calculate(unsigned short * data, unsigned short len) unsigned long Data_CRC = 0xffffffff; unsigned long sum1 = (unsigned long)(Data_CRC & 0xFFFF); unsigned long sum2 = (unsigned long)(Data_CRC >> 16); - SYNAPTICS_INFO_MSG("%s\n", __FUNCTION__); + SYNAPTICS_INFO_MSG("%s\n", __func__); for (i = 0; i < len; i++) { @@ -663,7 +663,7 @@ int ConfigBlockReflash(struct synaptics_ts_data *ts) { int ret; unsigned char uData[2]; - SYNAPTICS_INFO_MSG("%s\n", __FUNCTION__); + SYNAPTICS_INFO_MSG("%s\n", __func__); SynaInitialize(ts); @@ -720,7 +720,7 @@ int ConfigBlockReflash(struct synaptics_ts_data *ts) int CompleteReflash(struct synaptics_ts_data *ts) { int ret; - SYNAPTICS_INFO_MSG("%s\n", __FUNCTION__); + SYNAPTICS_INFO_MSG("%s\n", __func__); SynaInitialize(ts); SynaReadConfigInfo(ts); @@ -759,7 +759,7 @@ int CompleteReflash(struct synaptics_ts_data *ts) int CompleteReflash_Lockdown(struct synaptics_ts_data *ts) { int ret; - SYNAPTICS_INFO_MSG("%s\n", __FUNCTION__); + SYNAPTICS_INFO_MSG("%s\n", __func__); SynaInitialize(ts); diff --git a/drivers/input/touchscreen/mediatek/synaptics_7020_s7/s7020_driver.h b/drivers/input/touchscreen/mediatek/synaptics_7020_s7/s7020_driver.h index 02edfa553..60fef60b4 100644 --- a/drivers/input/touchscreen/mediatek/synaptics_7020_s7/s7020_driver.h +++ b/drivers/input/touchscreen/mediatek/synaptics_7020_s7/s7020_driver.h @@ -18,6 +18,6 @@ * Debugging Macros ****************************************************************************/ #define TPD_TAG "[Synaptics S7020] " -#define TPD_FUN(f) printk(KERN_ERR TPD_TAG"[%s %d]\n", __FUNCTION__, __LINE__) -#define TPD_ERR(fmt, args...) printk(KERN_ERR TPD_TAG"[%s %d] : "fmt, __FUNCTION__, __LINE__, ##args) +#define TPD_FUN(f) printk(KERN_ERR TPD_TAG"[%s %d]\n", __func__, __LINE__) +#define TPD_ERR(fmt, args...) printk(KERN_ERR TPD_TAG"[%s %d] : "fmt, __func__, __LINE__, ##args) #define TPD_LOG(fmt, args...) printk(KERN_ERR TPD_TAG fmt, ##args)
\ No newline at end of file diff --git a/drivers/input/touchscreen/mediatek/synaptics_7020_s7/s7020_fw_update.c b/drivers/input/touchscreen/mediatek/synaptics_7020_s7/s7020_fw_update.c index 8863fd7f0..72615f5b3 100644 --- a/drivers/input/touchscreen/mediatek/synaptics_7020_s7/s7020_fw_update.c +++ b/drivers/input/touchscreen/mediatek/synaptics_7020_s7/s7020_fw_update.c @@ -173,7 +173,7 @@ void SynaSetup(struct i2c_client *client) unsigned char address; unsigned char buffer[6]; memset(buffer, 0, sizeof(buffer)); - TPD_LOG("%s\n", __FUNCTION__); + TPD_LOG("%s\n", __func__); for (address = 0xe9; address > 0xd0; address = address - 6) { @@ -233,7 +233,7 @@ void SynaInitialize(struct i2c_client *client) uData[0] = 0; uData[1] = 0; - TPD_LOG("%s\n", __FUNCTION__); + TPD_LOG("%s\n", __func__); TPD_LOG("Initializing Reflash Process...\n"); uData[0] = 0x00; @@ -259,7 +259,7 @@ void SynaReadFirmwareInfo(struct i2c_client *client) uData[0] = 0; uData[1] = 0; - TPD_LOG("%s\n", __FUNCTION__); + TPD_LOG("%s\n", __func__); TPD_LOG("Read Firmware Info\n"); @@ -279,7 +279,7 @@ void SynaReadConfigInfo(struct i2c_client *client) unsigned char uData[2]; uData[0] = 0; uData[1] = 0; - TPD_LOG("%s\n", __FUNCTION__); + TPD_LOG("%s\n", __func__); TPD_LOG("Read Config Info\n"); @@ -298,7 +298,7 @@ void SynaReadBootloadID(struct i2c_client *client) unsigned char uData[2]; uData[0] = 0; uData[1] = 0; - TPD_LOG("%s\n", __FUNCTION__); + TPD_LOG("%s\n", __func__); readRMI(client, SynaF34ReflashQuery_BootID, &uData[0], 2); SynaBootloadID = uData[0] + uData[1] * 0x100; @@ -309,7 +309,7 @@ void SynaReadBootloadID(struct i2c_client *client) void SynaWriteBootloadID(struct i2c_client *client) { unsigned char uData[2]; - TPD_LOG("%s\n", __FUNCTION__); + TPD_LOG("%s\n", __func__); uData[0] = SynaBootloadID % 0x100; uData[1] = SynaBootloadID / 0x100; @@ -364,7 +364,7 @@ int SynaEnableFlashing(struct i2c_client *client) int ret; unsigned char uData = 0; unsigned char uStatus = 0; - TPD_LOG("%s\n", __FUNCTION__); + TPD_LOG("%s\n", __func__); TPD_LOG("Enable Reflash...\n"); @@ -414,7 +414,7 @@ int SynaProgramConfiguration(struct i2c_client *client) unsigned char *puData = (unsigned char *)&my_image_bin[0xb100]; unsigned short blockNum; - TPD_LOG("%s\n", __FUNCTION__); + TPD_LOG("%s\n", __func__); TPD_LOG("Program Configuration Section...\n"); @@ -444,7 +444,7 @@ int SynaFinalizeReflash(struct i2c_client *client) int ret; unsigned char uData = 0; unsigned char uStatus = 0; - TPD_LOG("%s\n", __FUNCTION__); + TPD_LOG("%s\n", __func__); TPD_LOG("Finalizing Reflash...\n"); @@ -490,7 +490,7 @@ int SynaFlashFirmwareWrite(struct i2c_client *client) unsigned char *puFirmwareData = (unsigned char *)&my_image_bin[0x100]; unsigned char uData[2]; unsigned short blockNum; - TPD_LOG("%s\n", __FUNCTION__); + TPD_LOG("%s\n", __func__); for (blockNum = 0; blockNum < SynaFirmwareBlockCount; ++blockNum) { @@ -520,7 +520,7 @@ int SynaProgramFirmware(struct i2c_client *client) { int ret; unsigned char uData; - TPD_LOG("%s\n", __FUNCTION__); + TPD_LOG("%s\n", __func__); TPD_LOG("Program Firmware Section...\n"); @@ -548,7 +548,7 @@ int SynaProgramFirmware(struct i2c_client *client) int eraseConfigBlock(struct i2c_client *client) { unsigned char uData; - TPD_LOG("%s\n", __FUNCTION__); + TPD_LOG("%s\n", __func__); // Erase of config block is done by first entering into bootloader mode SynaReadBootloadID(client); @@ -574,7 +574,7 @@ void CRC_Calculate(unsigned short * data, unsigned short len) unsigned long Data_CRC = 0xffffffff; unsigned long sum1 = (unsigned long)(Data_CRC & 0xFFFF); unsigned long sum2 = (unsigned long)(Data_CRC >> 16); - TPD_LOG("%s\n", __FUNCTION__); + TPD_LOG("%s\n", __func__); for (i = 0; i < len; i++) { @@ -676,7 +676,7 @@ int ConfigBlockReflash(struct i2c_client *client) uData[0] = 0; uData[1] = 0; - TPD_LOG("%s\n", __FUNCTION__); + TPD_LOG("%s\n", __func__); SynaInitialize(client); @@ -733,7 +733,7 @@ int ConfigBlockReflash(struct i2c_client *client) int CompleteReflash(struct i2c_client *client) { int ret; - TPD_LOG("%s\n", __FUNCTION__); + TPD_LOG("%s\n", __func__); SynaInitialize(client); SynaReadConfigInfo(client); @@ -772,7 +772,7 @@ int CompleteReflash(struct i2c_client *client) int CompleteReflash_Lockdown(struct i2c_client *client) { int ret; - TPD_LOG("%s\n", __FUNCTION__); + TPD_LOG("%s\n", __func__); SynaInitialize(client); diff --git a/drivers/input/touchscreen/mediatek/tangleM32_16/tangleM32_16_driver.c b/drivers/input/touchscreen/mediatek/tangleM32_16/tangleM32_16_driver.c index 42e0b1308..4f547668f 100644 --- a/drivers/input/touchscreen/mediatek/tangleM32_16/tangleM32_16_driver.c +++ b/drivers/input/touchscreen/mediatek/tangleM32_16/tangleM32_16_driver.c @@ -382,7 +382,7 @@ static int tpd_i2c_probe(struct i2c_client *client, const struct i2c_device_id * } void tpd_eint_interrupt_handler(void) { - TPD_DMESG("[mtk-tpd], %s\n", __FUNCTION__); + TPD_DMESG("[mtk-tpd], %s\n", __func__); TPD_DEBUG_PRINT_INT; tpd_flag=1; wake_up_interruptible(&waiter); } static int tpd_i2c_remove(struct i2c_client *client) {return 0;} @@ -459,7 +459,7 @@ static int touch_event_handler(void *unused) { msleep(20); } - TPD_DMESG("[mtk-tpd] %s: wait for touch event \n", __FUNCTION__); + TPD_DMESG("[mtk-tpd] %s: wait for touch event \n", __func__); wait_event_interruptible(waiter, tpd_flag != 0); @@ -513,7 +513,7 @@ static int touch_event_handler(void *unused) { int tpd_local_init(void) { if(tpd_debuglog==1) { - TPD_DMESG("[mtk-tpd] %s\n", __FUNCTION__); + TPD_DMESG("[mtk-tpd] %s\n", __func__); } if(i2c_add_driver(&tpd_i2c_driver)!=0) { TPD_DMESG("unable to add i2c driver.\n"); @@ -539,7 +539,7 @@ int tpd_local_init(void) memcpy(tpd_calmat, tpd_calmat_local, 8*4); memcpy(tpd_def_calmat, tpd_def_calmat_local, 8*4); #endif - TPD_DMESG("end %s, %d\n", __FUNCTION__, __LINE__); + TPD_DMESG("end %s, %d\n", __func__, __LINE__); tpd_type_cap = 1; return 0; } @@ -548,7 +548,7 @@ int tpd_local_init(void) void tpd_suspend(struct early_suspend *h) { if(tpd_debuglog==1) { - TPD_DMESG("[mtk-tpd] %s\n", __FUNCTION__); + TPD_DMESG("[mtk-tpd] %s\n", __func__); } tpd_halt = 1; mt_eint_mask(CUST_EINT_TOUCH_PANEL_NUM); @@ -567,7 +567,7 @@ void tpd_suspend(struct early_suspend *h) void tpd_resume(struct early_suspend *h) { if(tpd_debuglog==1) { - TPD_DMESG("[mtk-tpd] %s\n", __FUNCTION__); + TPD_DMESG("[mtk-tpd] %s\n", __func__); } #ifdef TPD_HAVE_POWER_ON_OFF msleep(100); diff --git a/drivers/input/touchscreen/mediatek/tm01564/tm1896_driver.c b/drivers/input/touchscreen/mediatek/tm01564/tm1896_driver.c index 0a0d19080..51197f712 100644 --- a/drivers/input/touchscreen/mediatek/tm01564/tm1896_driver.c +++ b/drivers/input/touchscreen/mediatek/tm01564/tm1896_driver.c @@ -579,7 +579,7 @@ static int RMI4_read_PDT(struct i2c_client *client) if(i2c_transfer(client->adapter, msg, 2) < 0) { - printk("%s:%d: read RIM4 PDT error!\n",__FUNCTION__,__LINE__); + printk("%s:%d: read RIM4 PDT error!\n",__func__,__LINE__); return -1; } @@ -599,7 +599,7 @@ static int RMI4_read_PDT(struct i2c_client *client) if((m_PdtF01Common.m_CommandBase != fd_01.commandBase) || (m_PdtF34Flash.m_QueryBase != fd_34.queryBase)) { - printk("%s:%d: RIM4 PDT has changed!!!\n",__FUNCTION__,__LINE__); + printk("%s:%d: RIM4 PDT has changed!!!\n",__func__,__LINE__); ret = tpd_rmi4_read_pdt(ts); if(ret < 0) @@ -855,21 +855,21 @@ static int synaptics_download(struct i2c_client *client,const unsigned char *pgm ret = RMI4_enable_program(client); if( ret != 0) { - printk("%s:%d:RMI enable program error,return...\n",__FUNCTION__,__LINE__); + printk("%s:%d:RMI enable program error,return...\n",__func__,__LINE__); goto error; } ret = RMI4_check_firmware(client,pgm_data); if( ret != 0) { - printk("%s:%d:RMI check firmware error,return...\n",__FUNCTION__,__LINE__); + printk("%s:%d:RMI check firmware error,return...\n",__func__,__LINE__); goto error; } ret = RMI4_program_firmware(client, pgm_data + 0x100); if( ret != 0) { - printk("%s:%d:RMI program firmware error,return...",__FUNCTION__,__LINE__); + printk("%s:%d:RMI program firmware error,return...",__func__,__LINE__); goto error; } @@ -878,7 +878,7 @@ static int synaptics_download(struct i2c_client *client,const unsigned char *pgm error: RMI4_disable_program_hw(client); - printk("%s:%d:error,return ....",__FUNCTION__,__LINE__); + printk("%s:%d:error,return ....",__func__,__LINE__); return -1; } @@ -899,14 +899,14 @@ static int i2c_update_firmware(struct i2c_client *client) filp = filp_open(filename, O_RDONLY, S_IRUSR); if (IS_ERR(filp)) { - printk("%s: file %s filp_open error\n", __FUNCTION__,filename); + printk("%s: file %s filp_open error\n", __func__,filename); set_fs(oldfs); return -1; } if (!filp->f_op) { - printk("%s: File Operation Method Error\n", __FUNCTION__); + printk("%s: File Operation Method Error\n", __func__); filp_close(filp, NULL); set_fs(oldfs); return -1; @@ -915,7 +915,7 @@ static int i2c_update_firmware(struct i2c_client *client) inode = filp->f_path.dentry->d_inode; if (!inode) { - printk("%s: Get inode from filp failed\n", __FUNCTION__); + printk("%s: Get inode from filp failed\n", __func__); filp_close(filp, NULL); set_fs(oldfs); return -1; @@ -944,7 +944,7 @@ static int i2c_update_firmware(struct i2c_client *client) /* read data */ if (filp->f_op->read(filp, buf, length, &filp->f_pos) != length) { - printk("%s: file read error\n", __FUNCTION__); + printk("%s: file read error\n", __func__); filp_close(filp, NULL); set_fs(oldfs); vfree(buf); @@ -1050,7 +1050,7 @@ static int tpd_local_init(void) boot_mode = get_boot_mode(); if (boot_mode == 3) boot_mode = NORMAL_BOOT; - TPD_DMESG("end %s, %d\n", __FUNCTION__, __LINE__); + TPD_DMESG("end %s, %d\n", __func__, __LINE__); tpd_type_cap = 1; return 0; } 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; } diff --git a/drivers/misc/mediatek/aee/mrdump/mrdump_full.c b/drivers/misc/mediatek/aee/mrdump/mrdump_full.c index 8b2b93a02..65e26dedc 100644 --- a/drivers/misc/mediatek/aee/mrdump/mrdump_full.c +++ b/drivers/misc/mediatek/aee/mrdump/mrdump_full.c @@ -372,7 +372,7 @@ static int __init mrdump_init_log(void) /* Preserved last result */ mrdump_result = vmalloc(PAGE_ALIGN(sizeof(struct mrdump_cblock_result))); if (mrdump_result == NULL) { - printk(KERN_ERR "%s: cannot allocate result memory\n", __FUNCTION__); + printk(KERN_ERR "%s: cannot allocate result memory\n", __func__); return -EINVAL; } memset(mrdump_result, 0, sizeof(struct mrdump_cblock_result)); @@ -381,7 +381,7 @@ static int __init mrdump_init_log(void) kobj = kset_find_obj(module_kset, KBUILD_MODNAME); if (kobj) { if (sysfs_create_group(kobj, &attr_group)) { - printk(KERN_ERR "%s: sysfs create sysfs failed\n", __FUNCTION__); + printk(KERN_ERR "%s: sysfs create sysfs failed\n", __func__); goto error; } } @@ -410,12 +410,12 @@ static int __init mrdump_init(void) printk(KERN_ERR "MT-RAMDUMP init control block %p\n", mrdump_cb_init); if (mrdump_cb_init == NULL) { - printk(KERN_ERR "%s: No control block memory found\n", __FUNCTION__); + printk(KERN_ERR "%s: No control block memory found\n", __func__); return -EINVAL; } if ((0 != memcmp(mrdump_cb_init->sig, MRDUMP_VERSION, 8)) && (0 != memcmp(mrdump_cb_init->sig, MRDUMP_LK_DUMP, 8))) { mrdump_enable = 0; - printk(KERN_ERR "%s: MT-RAMDUMP init failed. Version not matched.\n", __FUNCTION__); + printk(KERN_ERR "%s: MT-RAMDUMP init failed. Version not matched.\n", __func__); return -EINVAL; } diff --git a/drivers/misc/mediatek/almk/almk_drv.c b/drivers/misc/mediatek/almk/almk_drv.c index e49a2599b..1c3dedc20 100644 --- a/drivers/misc/mediatek/almk/almk_drv.c +++ b/drivers/misc/mediatek/almk/almk_drv.c @@ -69,7 +69,7 @@ static int check_all_minfree(void *param, void *param2) int free_pages = global_page_state(NR_FREE_PAGES) + global_page_state(NR_FILE_PAGES) + global_page_state(NR_FILE_DIRTY); - printk(KERN_ALERT"%s\n", __FUNCTION__); + printk(KERN_ALERT"%s\n", __func__); printk(KERN_ALERT"=====================================\n"); for_each_process(p) { //get_min_free_pages(p->pid); diff --git a/drivers/misc/mediatek/alsps/APDS9930-new/APDS9930.c b/drivers/misc/mediatek/alsps/APDS9930-new/APDS9930.c index 9a04c68d7..549140ab6 100644 --- a/drivers/misc/mediatek/alsps/APDS9930-new/APDS9930.c +++ b/drivers/misc/mediatek/alsps/APDS9930-new/APDS9930.c @@ -51,8 +51,8 @@ #define APDS9930_DEV_NAME "APDS9930" /*----------------------------------------------------------------------------*/ #define APS_TAG "[ALS/PS] " -#define APS_FUN(f) printk(KERN_INFO APS_TAG"%s\n", __FUNCTION__) -#define APS_ERR(fmt, args...) printk(KERN_ERR APS_TAG"%s %d : "fmt, __FUNCTION__, __LINE__, ##args) +#define APS_FUN(f) printk(KERN_INFO APS_TAG"%s\n", __func__) +#define APS_ERR(fmt, args...) printk(KERN_ERR APS_TAG"%s %d : "fmt, __func__, __LINE__, ##args) #define APS_LOG(fmt, args...) printk(KERN_ERR APS_TAG fmt, ##args) #define APS_DBG(fmt, args...) printk(KERN_INFO APS_TAG fmt, ##args) @@ -1453,7 +1453,7 @@ static long APDS9930_unlocked_ioctl(struct file *file, unsigned int cmd, break; /*------------------------------------------------------------------------------------------*/ default: - APS_ERR("%s not supported = 0x%04x", __FUNCTION__, cmd); + APS_ERR("%s not supported = 0x%04x", __func__, cmd); err = -ENOIOCTLCMD; break; } diff --git a/drivers/misc/mediatek/alsps/APDS9930/APDS9930.c b/drivers/misc/mediatek/alsps/APDS9930/APDS9930.c index 99acabbec..13a0133a5 100644 --- a/drivers/misc/mediatek/alsps/APDS9930/APDS9930.c +++ b/drivers/misc/mediatek/alsps/APDS9930/APDS9930.c @@ -49,8 +49,8 @@ #define APDS9930_DEV_NAME "APDS9930" /*----------------------------------------------------------------------------*/ #define APS_TAG "[ALS/PS] " -#define APS_FUN(f) printk(KERN_INFO APS_TAG"%s\n", __FUNCTION__) -#define APS_ERR(fmt, args...) printk(KERN_ERR APS_TAG"%s %d : "fmt, __FUNCTION__, __LINE__, ##args) +#define APS_FUN(f) printk(KERN_INFO APS_TAG"%s\n", __func__) +#define APS_ERR(fmt, args...) printk(KERN_ERR APS_TAG"%s %d : "fmt, __func__, __LINE__, ##args) #define APS_LOG(fmt, args...) printk(KERN_ERR APS_TAG fmt, ##args) #define APS_DBG(fmt, args...) printk(KERN_INFO APS_TAG fmt, ##args) @@ -1441,7 +1441,7 @@ static long APDS9930_unlocked_ioctl(struct file *file, unsigned int cmd, break; /*------------------------------------------------------------------------------------------*/ default: - APS_ERR("%s not supported = 0x%04x", __FUNCTION__, cmd); + APS_ERR("%s not supported = 0x%04x", __func__, cmd); err = -ENOIOCTLCMD; break; } diff --git a/drivers/misc/mediatek/alsps/EPL2182-new/epl2182.c b/drivers/misc/mediatek/alsps/EPL2182-new/epl2182.c index 26e90255a..1570ad07e 100644 --- a/drivers/misc/mediatek/alsps/EPL2182-new/epl2182.c +++ b/drivers/misc/mediatek/alsps/EPL2182-new/epl2182.c @@ -100,8 +100,8 @@ typedef struct _epl_raw_data /*----------------------------------------------------------------------------*/ #define APS_TAG "[ALS/PS] " -#define APS_FUN(f) printk(KERN_ERR APS_TAG"%s\n", __FUNCTION__) -#define APS_ERR(fmt, args...) printk(KERN_ERR APS_TAG"%s %d : "fmt, __FUNCTION__, __LINE__, ##args) +#define APS_FUN(f) printk(KERN_ERR APS_TAG"%s\n", __func__) +#define APS_ERR(fmt, args...) printk(KERN_ERR APS_TAG"%s %d : "fmt, __func__, __LINE__, ##args) #define APS_LOG(fmt, args...) printk(KERN_ERR APS_TAG fmt, ##args) #define APS_DBG(fmt, args...) printk(KERN_ERR APS_TAG fmt, ##args) #define FTM_CUST_ALSPS "/data/epl2182" @@ -1523,7 +1523,7 @@ static long epl2182_unlocked_ioctl(struct file *file, unsigned int cmd, unsigned default: - APS_ERR("%s not supported = 0x%04x", __FUNCTION__, cmd); + APS_ERR("%s not supported = 0x%04x", __func__, cmd); err = -ENOIOCTLCMD; break; } diff --git a/drivers/misc/mediatek/alsps/aal_control.c b/drivers/misc/mediatek/alsps/aal_control.c index d452da3f6..1971780e1 100644 --- a/drivers/misc/mediatek/alsps/aal_control.c +++ b/drivers/misc/mediatek/alsps/aal_control.c @@ -72,7 +72,7 @@ static long AAL_unlocked_ioctl(struct file *file, unsigned int cmd, unsigned lon break; default: - AAL_ERR("%s not supported = 0x%04x", __FUNCTION__, cmd); + AAL_ERR("%s not supported = 0x%04x", __func__, cmd); err = -ENOIOCTLCMD; break; } diff --git a/drivers/misc/mediatek/alsps/apm_16d/apm_16d.c b/drivers/misc/mediatek/alsps/apm_16d/apm_16d.c index 485bbbac3..5eccbaa43 100644 --- a/drivers/misc/mediatek/alsps/apm_16d/apm_16d.c +++ b/drivers/misc/mediatek/alsps/apm_16d/apm_16d.c @@ -40,8 +40,8 @@ /*----------------------------------------------------------------------------*/ #define APM_TAG "[ALS/PS] " -#define APM_FUN() printk( APM_TAG"%s\n", __FUNCTION__) -#define APM_ERR(fmt, args...) printk( APM_TAG"%s %d : "fmt, __FUNCTION__, __LINE__, ##args) +#define APM_FUN() printk( APM_TAG"%s\n", __func__) +#define APM_ERR(fmt, args...) printk( APM_TAG"%s %d : "fmt, __func__, __LINE__, ##args) #define APM_LOG(fmt, args...) printk( APM_TAG fmt, ##args) #define APM_DBG(fmt, args...) printk( fmt, ##args) @@ -348,11 +348,11 @@ int apm_16d_write_als(struct i2c_client *client, u8 data) if(ret < 0) { APM_ERR("write als = %d\n", ret); - printk("[%s] 123 i2c addr = 0x%x, als_cmd = 0x%x, data = 0x%x\n", __FUNCTION__, client->addr, obj->addr.als_cmd, data); + printk("[%s] 123 i2c addr = 0x%x, als_cmd = 0x%x, data = 0x%x\n", __func__, client->addr, obj->addr.als_cmd, data); return -EFAULT; } else - printk("[%s] cc_i2c addr = 0x%x,cc_ als_cmd = 0x%x, cc_data = 0x%x\n", __FUNCTION__, client->addr, obj->addr.als_cmd, data); + printk("[%s] cc_i2c addr = 0x%x,cc_ als_cmd = 0x%x, cc_data = 0x%x\n", __func__, client->addr, obj->addr.als_cmd, data); return 0; } @@ -382,12 +382,12 @@ int apm_16d_read_ps(struct i2c_client *client, int *data) apm_16d_master_recv(client, obj->addr.ps_cmd, buf, 1); //apm_16d_master_recv(client, client->addr, buf, 1); - printk("[%s] read ps cmd = 0x%x\n", __FUNCTION__, buf[0]); + printk("[%s] read ps cmd = 0x%x\n", __func__, buf[0]); //buf[0]=obj->addr.status; apm_16d_master_recv(client, obj->addr.status, buf, 1); //apm_16d_master_recv(client, client->addr, buf, 1); - printk("[%s] read apm status = 0x%x\n", __FUNCTION__, buf[0]); + printk("[%s] read apm status = 0x%x\n", __func__, buf[0]); #endif return 0; @@ -454,7 +454,7 @@ static void apm_16d_power(struct alsps_hw *hw, unsigned int on) static unsigned int power_on = 0; #if (defined(DCT_H958)) - printk("[%s] line = %d on = %d\n", __FUNCTION__, __LINE__, on); + printk("[%s] line = %d on = %d\n", __func__, __LINE__, on); if(power_on == on) { APM_LOG("ignore power control: %d\n", on); @@ -1020,7 +1020,7 @@ static ssize_t apm_16d_show_als(struct device_driver *ddri, char *buf) int dat; #endif - printk("\n[%s]---line = %d----\n",__FUNCTION__, __LINE__); + printk("\n[%s]---line = %d----\n",__func__, __LINE__); if(!apm_16d_obj) @@ -2020,7 +2020,7 @@ static long apm_16d_unlocked_ioctl(struct file *file, unsigned int cmd, #endif default: - APM_ERR("%s not supported = 0x%04x", __FUNCTION__, cmd); + APM_ERR("%s not supported = 0x%04x", __func__, cmd); err = -ENOIOCTLCMD; break; } @@ -2049,7 +2049,7 @@ static int apm_16d_i2c_suspend(struct i2c_client *client, pm_message_t msg) int err; APM_FUN(); -printk("[%s] line =%d called \n",__FUNCTION__, __LINE__); +printk("[%s] line =%d called \n",__func__, __LINE__); if(msg.event == PM_EVENT_SUSPEND) { if(!obj) @@ -2084,7 +2084,7 @@ static int apm_16d_i2c_resume(struct i2c_client *client) struct apm_16d_priv *obj = i2c_get_clientdata(client); int err; APM_FUN(); - printk("[%s] line =%d called \n",__FUNCTION__, __LINE__); + printk("[%s] line =%d called \n",__func__, __LINE__); if(!obj) { APM_ERR("null pointer!!\n"); @@ -2137,7 +2137,7 @@ static void apm_16d_early_suspend(struct early_suspend *h) APM_ERR("disable als fail: %d\n", err); } #endif -printk("[%s] line =%d called \n",__FUNCTION__, __LINE__); +printk("[%s] line =%d called \n",__func__, __LINE__); } /*----------------------------------------------------------------------------*/ static void apm_16d_late_resume(struct early_suspend *h) @@ -2167,7 +2167,7 @@ static void apm_16d_late_resume(struct early_suspend *h) } } #endif -printk("[%s] line =%d called \n",__FUNCTION__, __LINE__); +printk("[%s] line =%d called \n",__func__, __LINE__); } int apm_16d_ps_operate(void* self, uint32_t command, void* buff_in, int size_in, @@ -2373,7 +2373,7 @@ static int apm_16d_i2c_probe(struct i2c_client *client, const struct i2c_device_ goto exit; } - printk("\n\n[%s] amp_16d chip addr = 0x%x\n\n",__FUNCTION__, client->addr); + printk("\n\n[%s] amp_16d chip addr = 0x%x\n\n",__func__, client->addr); memset(obj, 0, sizeof(*obj)); apm_16d_obj = obj; #if defined(CONFIG_MTK_AUTO_DETECT_ALSPS) diff --git a/drivers/misc/mediatek/alsps/cm3232-new/cm3232.c b/drivers/misc/mediatek/alsps/cm3232-new/cm3232.c index 787db7005..8ca2b536d 100644 --- a/drivers/misc/mediatek/alsps/cm3232-new/cm3232.c +++ b/drivers/misc/mediatek/alsps/cm3232-new/cm3232.c @@ -56,8 +56,8 @@ #define CM3232_DEV_NAME "cm3232" /*----------------------------------------------------------------------------*/ #define APS_TAG "[ALS/PS] " -#define APS_FUN(f) printk(KERN_INFO APS_TAG"%s\n", __FUNCTION__) -#define APS_ERR(fmt, args...) printk(KERN_ERR APS_TAG"%s %d : "fmt, __FUNCTION__, __LINE__, ##args) +#define APS_FUN(f) printk(KERN_INFO APS_TAG"%s\n", __func__) +#define APS_ERR(fmt, args...) printk(KERN_ERR APS_TAG"%s %d : "fmt, __func__, __LINE__, ##args) #define APS_LOG(fmt, args...) printk(KERN_INFO APS_TAG fmt, ##args) #define APS_DBG(fmt, args...) printk(KERN_INFO APS_TAG fmt, ##args) /****************************************************************************** @@ -1023,7 +1023,7 @@ static long cm3232_unlocked_ioctl(struct file *file, unsigned int cmd, unsigned /*------------------------------------------------------------------------------------------*/ default: - APS_ERR("%s not supported = 0x%04x", __FUNCTION__, cmd); + APS_ERR("%s not supported = 0x%04x", __func__, cmd); err = -ENOIOCTLCMD; break; } diff --git a/drivers/misc/mediatek/alsps/cm36283-new/cm36283.c b/drivers/misc/mediatek/alsps/cm36283-new/cm36283.c index fbb67913e..c6ae837ca 100644 --- a/drivers/misc/mediatek/alsps/cm36283-new/cm36283.c +++ b/drivers/misc/mediatek/alsps/cm36283-new/cm36283.c @@ -52,8 +52,8 @@ #define CM36283_DEV_NAME "cm36283" /*----------------------------------------------------------------------------*/ #define APS_TAG "[ALS/PS] " -#define APS_FUN(f) printk(KERN_INFO APS_TAG"%s\n", __FUNCTION__) -#define APS_ERR(fmt, args...) printk(KERN_ERR APS_TAG"%s %d : "fmt, __FUNCTION__, __LINE__, ##args) +#define APS_FUN(f) printk(KERN_INFO APS_TAG"%s\n", __func__) +#define APS_ERR(fmt, args...) printk(KERN_ERR APS_TAG"%s %d : "fmt, __func__, __LINE__, ##args) #define APS_LOG(fmt, args...) printk(KERN_ERR APS_TAG fmt, ##args) #define APS_DBG(fmt, args...) printk(KERN_INFO APS_TAG fmt, ##args) @@ -1693,7 +1693,7 @@ static long cm36283_unlocked_ioctl(struct file *file, unsigned int cmd, unsigned /*------------------------------------------------------------------------------------------*/ default: - APS_ERR("%s not supported = 0x%04x", __FUNCTION__, cmd); + APS_ERR("%s not supported = 0x%04x", __func__, cmd); err = -ENOIOCTLCMD; break; } diff --git a/drivers/misc/mediatek/alsps/cm36283/cm36283.c b/drivers/misc/mediatek/alsps/cm36283/cm36283.c index 686a864d2..a339e53e4 100644 --- a/drivers/misc/mediatek/alsps/cm36283/cm36283.c +++ b/drivers/misc/mediatek/alsps/cm36283/cm36283.c @@ -47,8 +47,8 @@ #define CM36283_DEV_NAME "cm36283" /*----------------------------------------------------------------------------*/ #define APS_TAG "[ALS/PS] " -#define APS_FUN(f) printk(KERN_INFO APS_TAG"%s\n", __FUNCTION__) -#define APS_ERR(fmt, args...) printk(KERN_ERR APS_TAG"%s %d : "fmt, __FUNCTION__, __LINE__, ##args) +#define APS_FUN(f) printk(KERN_INFO APS_TAG"%s\n", __func__) +#define APS_ERR(fmt, args...) printk(KERN_ERR APS_TAG"%s %d : "fmt, __func__, __LINE__, ##args) #define APS_LOG(fmt, args...) printk(KERN_ERR APS_TAG fmt, ##args) #define APS_DBG(fmt, args...) printk(KERN_INFO APS_TAG fmt, ##args) @@ -1391,7 +1391,7 @@ static long cm36283_unlocked_ioctl(struct file *file, unsigned int cmd, unsigned /*------------------------------------------------------------------------------------------*/ default: - APS_ERR("%s not supported = 0x%04x", __FUNCTION__, cmd); + APS_ERR("%s not supported = 0x%04x", __func__, cmd); err = -ENOIOCTLCMD; break; } diff --git a/drivers/misc/mediatek/alsps/cm36652-new/cm36652.c b/drivers/misc/mediatek/alsps/cm36652-new/cm36652.c index d679b94d6..ae286ab03 100644 --- a/drivers/misc/mediatek/alsps/cm36652-new/cm36652.c +++ b/drivers/misc/mediatek/alsps/cm36652-new/cm36652.c @@ -57,8 +57,8 @@ #define CM36652_DEV_NAME "cm36652" /*----------------------------------------------------------------------------*/ #define APS_TAG "[ALS/PS] " -#define APS_FUN(f) printk(KERN_INFO APS_TAG"%s\n", __FUNCTION__) -#define APS_ERR(fmt, args...) printk(KERN_ERR APS_TAG"%s %d : "fmt, __FUNCTION__, __LINE__, ##args) +#define APS_FUN(f) printk(KERN_INFO APS_TAG"%s\n", __func__) +#define APS_ERR(fmt, args...) printk(KERN_ERR APS_TAG"%s %d : "fmt, __func__, __LINE__, ##args) #define APS_LOG(fmt, args...) printk(KERN_NOTICE APS_TAG fmt, ##args) #define APS_DBG(fmt, args...) printk(KERN_ERR APS_TAG fmt, ##args) @@ -1678,7 +1678,7 @@ static long cm36652_unlocked_ioctl(struct file *file, unsigned int cmd, unsigned /*------------------------------------------------------------------------------------------*/ default: - APS_ERR("%s not supported = 0x%04x", __FUNCTION__, cmd); + APS_ERR("%s not supported = 0x%04x", __func__, cmd); err = -ENOIOCTLCMD; break; } diff --git a/drivers/misc/mediatek/alsps/epl2182/epl2182.c b/drivers/misc/mediatek/alsps/epl2182/epl2182.c index cd9595b81..5ca840381 100644 --- a/drivers/misc/mediatek/alsps/epl2182/epl2182.c +++ b/drivers/misc/mediatek/alsps/epl2182/epl2182.c @@ -93,8 +93,8 @@ typedef struct _epl_raw_data /*----------------------------------------------------------------------------*/ #define APS_TAG "[ALS/PS] " -#define APS_FUN(f) printk(KERN_INFO APS_TAG"%s\n", __FUNCTION__) -#define APS_ERR(fmt, args...) printk(KERN_ERR APS_TAG"%s %d : "fmt, __FUNCTION__, __LINE__, ##args) +#define APS_FUN(f) printk(KERN_INFO APS_TAG"%s\n", __func__) +#define APS_ERR(fmt, args...) printk(KERN_ERR APS_TAG"%s %d : "fmt, __func__, __LINE__, ##args) #define APS_LOG(fmt, args...) printk(KERN_DEBUG APS_TAG fmt, ##args) #define APS_DBG(fmt, args...) printk(KERN_DEBUG fmt, ##args) #define FTM_CUST_ALSPS "/data/epl2182" @@ -1275,7 +1275,7 @@ static long epl2182_unlocked_ioctl(struct file *file, unsigned int cmd, unsigned default: - APS_ERR("%s not supported = 0x%04x", __FUNCTION__, cmd); + APS_ERR("%s not supported = 0x%04x", __func__, cmd); err = -ENOIOCTLCMD; break; } diff --git a/drivers/misc/mediatek/alsps/inc/aal_control.h b/drivers/misc/mediatek/alsps/inc/aal_control.h index d0259cfb3..9a6a5f2fc 100644 --- a/drivers/misc/mediatek/alsps/inc/aal_control.h +++ b/drivers/misc/mediatek/alsps/inc/aal_control.h @@ -3,8 +3,8 @@ #define AAL_TAG "[ALS/AAL]" #define AAL_LOG(fmt, args...) printk(KERN_ERR AAL_TAG fmt, ##args) -#define AAL_FUN(f) printk(KERN_INFO AAL_TAG"%s\n", __FUNCTION__) -#define AAL_ERR(fmt, args...) printk(KERN_ERR AAL_TAG"%s %d : "fmt, __FUNCTION__, __LINE__, ##args) +#define AAL_FUN(f) printk(KERN_INFO AAL_TAG"%s\n", __func__) +#define AAL_ERR(fmt, args...) printk(KERN_ERR AAL_TAG"%s %d : "fmt, __func__, __LINE__, ##args) #endif extern int aal_use; diff --git a/drivers/misc/mediatek/alsps/rpr410/rpr410.c b/drivers/misc/mediatek/alsps/rpr410/rpr410.c index bb370afef..36e5dab20 100644 --- a/drivers/misc/mediatek/alsps/rpr410/rpr410.c +++ b/drivers/misc/mediatek/alsps/rpr410/rpr410.c @@ -54,8 +54,8 @@ #define RPR410_DEV_NAME "RPR410" /*----------------------------------------------------------------------------*/ #define APS_TAG "[ALS/PS] " -#define APS_FUN(f) printk(KERN_INFO APS_TAG"%s\n", __FUNCTION__) -#define APS_ERR(fmt, args...) printk(KERN_ERR APS_TAG"%s %d : "fmt, __FUNCTION__, __LINE__, ##args) +#define APS_FUN(f) printk(KERN_INFO APS_TAG"%s\n", __func__) +#define APS_ERR(fmt, args...) printk(KERN_ERR APS_TAG"%s %d : "fmt, __func__, __LINE__, ##args) #define APS_LOG(fmt, args...) printk(KERN_INFO APS_TAG fmt, ##args) #define APS_DBG(fmt, args...) printk(KERN_ERR APS_TAG fmt, ##args) /****************************************************************************** @@ -1622,7 +1622,7 @@ static long rpr410_unlocked_ioctl(struct file *file, unsigned int cmd, break; default: - APS_ERR("%s not supported = 0x%04x\n", __FUNCTION__, cmd); + APS_ERR("%s not supported = 0x%04x\n", __func__, cmd); err = -ENOIOCTLCMD; break; } diff --git a/drivers/misc/mediatek/alsps/stk3x1x-new/stk3x1x.c b/drivers/misc/mediatek/alsps/stk3x1x-new/stk3x1x.c index 160a6e4ad..6658dba2b 100644 --- a/drivers/misc/mediatek/alsps/stk3x1x-new/stk3x1x.c +++ b/drivers/misc/mediatek/alsps/stk3x1x-new/stk3x1x.c @@ -73,8 +73,8 @@ #define stk3x1x_DEV_NAME "stk3x1x" /*----------------------------------------------------------------------------*/ #define APS_TAG "[ALS/PS] " -#define APS_FUN(f) printk(APS_TAG"%s\n", __FUNCTION__) -#define APS_ERR(fmt, args...) printk(APS_TAG"%s %d : "fmt, __FUNCTION__, __LINE__, ##args) +#define APS_FUN(f) printk(APS_TAG"%s\n", __func__) +#define APS_ERR(fmt, args...) printk(APS_TAG"%s %d : "fmt, __func__, __LINE__, ##args) #define APS_LOG(fmt, args...) printk(APS_TAG fmt, ##args) #define APS_DBG(fmt, args...) printk(fmt, ##args) /****************************************************************************** @@ -1078,7 +1078,7 @@ static int stk3x1x_enable_ps(struct i2c_client *client, int enable) } } - APS_LOG("%s: enable=%d\n", __FUNCTION__, enable); + APS_LOG("%s: enable=%d\n", __func__, enable); cur &= (~(0x45)); if(enable) { @@ -1137,7 +1137,7 @@ static int stk3x1x_enable_ps(struct i2c_client *client, int enable) sensor_data.values[0] = err; sensor_data.value_divide = 1; sensor_data.status = SENSOR_STATUS_ACCURACY_MEDIUM; - APS_LOG("%s:ps raw 0x%x -> value 0x%x \n",__FUNCTION__, obj->ps,sensor_data.values[0]); + APS_LOG("%s:ps raw 0x%x -> value 0x%x \n",__func__, obj->ps,sensor_data.values[0]); if(ps_report_interrupt_data(sensor_data.values[0])) { APS_ERR("call ps_report_interrupt_data fail\n"); @@ -1283,7 +1283,7 @@ static void stk3x1x_eint_work(struct work_struct *work) sensor_data.values[0] = stk3x1x_get_als_value(obj, obj->als); sensor_data.value_divide = 1; sensor_data.status = SENSOR_STATUS_ACCURACY_MEDIUM; - APS_LOG("%s:als raw 0x%x -> value 0x%x \n", __FUNCTION__, obj->als,sensor_data.values[0]); + APS_LOG("%s:als raw 0x%x -> value 0x%x \n", __func__, obj->als,sensor_data.values[0]); //let up layer to know if(ps_report_interrupt_data(sensor_data.values[0])) { @@ -1304,7 +1304,7 @@ static void stk3x1x_eint_work(struct work_struct *work) sensor_data.values[0] = (flag_reg & STK_FLG_NF_MASK)? 1 : 0; sensor_data.value_divide = 1; sensor_data.status = SENSOR_STATUS_ACCURACY_MEDIUM; - APS_LOG("%s:ps raw 0x%x -> value 0x%x \n",__FUNCTION__, obj->ps,sensor_data.values[0]); + APS_LOG("%s:ps raw 0x%x -> value 0x%x \n",__func__, obj->ps,sensor_data.values[0]); //let up layer to know if(ps_report_interrupt_data(sensor_data.values[0])) { @@ -2367,7 +2367,7 @@ static int stk3x1x_ioctl(struct inode *inode, struct file *file, unsigned int cm goto err_out; } #ifdef STK_PS_POLLING_LOG - APS_LOG("%s:ps raw 0x%x -> value 0x%x \n",__FUNCTION__, obj->ps, dat); + APS_LOG("%s:ps raw 0x%x -> value 0x%x \n",__func__, obj->ps, dat); #endif if(copy_to_user(ptr, &dat, sizeof(dat))) { @@ -2556,7 +2556,7 @@ static int stk3x1x_ioctl(struct inode *inode, struct file *file, unsigned int cm /*------------------------------------------------------------------------------------------*/ default: - APS_ERR("%s not supported = 0x%04x", __FUNCTION__, cmd); + APS_ERR("%s not supported = 0x%04x", __func__, cmd); err = -ENOIOCTLCMD; break; } @@ -2782,7 +2782,7 @@ int stk3x1x_ps_operate(void* self, uint32_t command, void* buff_in, int size_in, sensor_data->value_divide = 1; sensor_data->status = SENSOR_STATUS_ACCURACY_MEDIUM; #ifdef STK_PS_POLLING_LOG - APS_LOG("%s:ps raw 0x%x -> value 0x%x \n",__FUNCTION__, obj->ps, sensor_data->values[0]); + APS_LOG("%s:ps raw 0x%x -> value 0x%x \n",__func__, obj->ps, sensor_data->values[0]); #endif } } @@ -3097,7 +3097,7 @@ static int stk3x1x_i2c_probe(struct i2c_client *client, const struct i2c_device_ struct ps_control_path ps_ctl={0}; struct ps_data_path ps_data={0}; - APS_LOG("%s: driver version: %s\n", __FUNCTION__, DRIVER_VERSION); + APS_LOG("%s: driver version: %s\n", __func__, DRIVER_VERSION); if(!(obj = kzalloc(sizeof(*obj), GFP_KERNEL))) { err = -ENOMEM; @@ -3138,18 +3138,18 @@ static int stk3x1x_i2c_probe(struct i2c_client *client, const struct i2c_device_ if(obj->hw->polling_mode_ps == 0) { - APS_LOG("%s: enable PS interrupt\n", __FUNCTION__); + APS_LOG("%s: enable PS interrupt\n", __func__); } obj->int_val |= STK_INT_PS_MODE1; if(obj->hw->polling_mode_als == 0) { obj->int_val |= STK_INT_ALS; - APS_LOG("%s: enable ALS interrupt\n", __FUNCTION__); + APS_LOG("%s: enable ALS interrupt\n", __func__); } APS_LOG("%s: state_val=0x%x, psctrl_val=0x%x, alsctrl_val=0x%x, ledctrl_val=0x%x, wait_val=0x%x, int_val=0x%x\n", - __FUNCTION__, atomic_read(&obj->state_val), atomic_read(&obj->psctrl_val), atomic_read(&obj->alsctrl_val), + __func__, atomic_read(&obj->state_val), atomic_read(&obj->psctrl_val), atomic_read(&obj->alsctrl_val), obj->ledctrl_val, obj->wait_val, obj->int_val); APS_LOG("stk3x1x_i2c_probe() OK!\n"); @@ -3269,7 +3269,7 @@ static int stk3x1x_i2c_probe(struct i2c_client *client, const struct i2c_device_ #endif stk3x1x_init_flag = 0; - APS_LOG("%s: OK\n", __FUNCTION__); + APS_LOG("%s: OK\n", __func__); return 0; exit_sensor_obj_attach_fail: @@ -3282,7 +3282,7 @@ static int stk3x1x_i2c_probe(struct i2c_client *client, const struct i2c_device_ exit: stk3x1x_i2c_client = NULL; stk3x1x_init_flag = -1; - APS_ERR("%s: err = %d\n", __FUNCTION__, err); + APS_ERR("%s: err = %d\n", __func__, err); return err; } diff --git a/drivers/misc/mediatek/alsps/stk3x1x/stk3x1x.c b/drivers/misc/mediatek/alsps/stk3x1x/stk3x1x.c index fd7b7cecd..a9923b327 100644 --- a/drivers/misc/mediatek/alsps/stk3x1x/stk3x1x.c +++ b/drivers/misc/mediatek/alsps/stk3x1x/stk3x1x.c @@ -65,8 +65,8 @@ #define stk3x1x_DEV_NAME "stk3x1x" /*----------------------------------------------------------------------------*/ #define APS_TAG "[ALS/PS] " -#define APS_FUN(f) printk(APS_TAG"%s\n", __FUNCTION__) -#define APS_ERR(fmt, args...) printk(APS_TAG"%s %d : "fmt, __FUNCTION__, __LINE__, ##args) +#define APS_FUN(f) printk(APS_TAG"%s\n", __func__) +#define APS_ERR(fmt, args...) printk(APS_TAG"%s %d : "fmt, __func__, __LINE__, ##args) #define APS_LOG(fmt, args...) printk(APS_TAG fmt, ##args) #define APS_DBG(fmt, args...) printk(fmt, ##args) /****************************************************************************** @@ -1015,7 +1015,7 @@ static int stk3x1x_enable_ps(struct i2c_client *client, int enable) } } - APS_LOG("%s: enable=%d\n", __FUNCTION__, enable); + APS_LOG("%s: enable=%d\n", __func__, enable); cur &= (~(0x45)); if(enable) { @@ -1074,7 +1074,7 @@ static int stk3x1x_enable_ps(struct i2c_client *client, int enable) sensor_data.values[0] = err; sensor_data.value_divide = 1; sensor_data.status = SENSOR_STATUS_ACCURACY_MEDIUM; - APS_LOG("%s:ps raw 0x%x -> value 0x%x \n",__FUNCTION__, obj->ps,sensor_data.values[0]); + APS_LOG("%s:ps raw 0x%x -> value 0x%x \n",__func__, obj->ps,sensor_data.values[0]); if((err = hwmsen_get_interrupt_data(ID_PROXIMITY, &sensor_data))) { APS_ERR("call hwmsen_get_interrupt_data fail = %d\n", err); @@ -1220,7 +1220,7 @@ static void stk3x1x_eint_work(struct work_struct *work) sensor_data.values[0] = stk3x1x_get_als_value(obj, obj->als); sensor_data.value_divide = 1; sensor_data.status = SENSOR_STATUS_ACCURACY_MEDIUM; - APS_LOG("%s:als raw 0x%x -> value 0x%x \n", __FUNCTION__, obj->als,sensor_data.values[0]); + APS_LOG("%s:als raw 0x%x -> value 0x%x \n", __func__, obj->als,sensor_data.values[0]); //let up layer to know if((err = hwmsen_get_interrupt_data(ID_LIGHT, &sensor_data))) { @@ -1241,7 +1241,7 @@ static void stk3x1x_eint_work(struct work_struct *work) sensor_data.values[0] = (flag_reg & STK_FLG_NF_MASK)? 1 : 0; sensor_data.value_divide = 1; sensor_data.status = SENSOR_STATUS_ACCURACY_MEDIUM; - APS_LOG("%s:ps raw 0x%x -> value 0x%x \n",__FUNCTION__, obj->ps,sensor_data.values[0]); + APS_LOG("%s:ps raw 0x%x -> value 0x%x \n",__func__, obj->ps,sensor_data.values[0]); //let up layer to know if((err = hwmsen_get_interrupt_data(ID_PROXIMITY, &sensor_data))) { @@ -2304,7 +2304,7 @@ static int stk3x1x_ioctl(struct inode *inode, struct file *file, unsigned int cm goto err_out; } #ifdef STK_PS_POLLING_LOG - APS_LOG("%s:ps raw 0x%x -> value 0x%x \n",__FUNCTION__, obj->ps, dat); + APS_LOG("%s:ps raw 0x%x -> value 0x%x \n",__func__, obj->ps, dat); #endif if(copy_to_user(ptr, &dat, sizeof(dat))) { @@ -2493,7 +2493,7 @@ static int stk3x1x_ioctl(struct inode *inode, struct file *file, unsigned int cm /*------------------------------------------------------------------------------------------*/ default: - APS_ERR("%s not supported = 0x%04x", __FUNCTION__, cmd); + APS_ERR("%s not supported = 0x%04x", __func__, cmd); err = -ENOIOCTLCMD; break; } @@ -2719,7 +2719,7 @@ int stk3x1x_ps_operate(void* self, uint32_t command, void* buff_in, int size_in, sensor_data->value_divide = 1; sensor_data->status = SENSOR_STATUS_ACCURACY_MEDIUM; #ifdef STK_PS_POLLING_LOG - APS_LOG("%s:ps raw 0x%x -> value 0x%x \n",__FUNCTION__, obj->ps, sensor_data->values[0]); + APS_LOG("%s:ps raw 0x%x -> value 0x%x \n",__func__, obj->ps, sensor_data->values[0]); #endif } } @@ -2841,7 +2841,7 @@ static int stk3x1x_i2c_probe(struct i2c_client *client, const struct i2c_device_ struct hwmsen_object obj_ps, obj_als; int err = 0; - APS_LOG("%s: driver version: %s\n", __FUNCTION__, DRIVER_VERSION); + APS_LOG("%s: driver version: %s\n", __func__, DRIVER_VERSION); if(!(obj = kzalloc(sizeof(*obj), GFP_KERNEL))) { @@ -2883,18 +2883,18 @@ static int stk3x1x_i2c_probe(struct i2c_client *client, const struct i2c_device_ if(obj->hw->polling_mode_ps == 0) { - APS_LOG("%s: enable PS interrupt\n", __FUNCTION__); + APS_LOG("%s: enable PS interrupt\n", __func__); } obj->int_val |= STK_INT_PS_MODE1; if(obj->hw->polling_mode_als == 0) { obj->int_val |= STK_INT_ALS; - APS_LOG("%s: enable ALS interrupt\n", __FUNCTION__); + APS_LOG("%s: enable ALS interrupt\n", __func__); } APS_LOG("%s: state_val=0x%x, psctrl_val=0x%x, alsctrl_val=0x%x, ledctrl_val=0x%x, wait_val=0x%x, int_val=0x%x\n", - __FUNCTION__, atomic_read(&obj->state_val), atomic_read(&obj->psctrl_val), atomic_read(&obj->alsctrl_val), + __func__, atomic_read(&obj->state_val), atomic_read(&obj->psctrl_val), atomic_read(&obj->alsctrl_val), obj->ledctrl_val, obj->wait_val, obj->int_val); APS_LOG("stk3x1x_i2c_probe() OK!\n"); @@ -2977,7 +2977,7 @@ static int stk3x1x_i2c_probe(struct i2c_client *client, const struct i2c_device_ register_early_suspend(&obj->early_drv); #endif - APS_LOG("%s: OK\n", __FUNCTION__); + APS_LOG("%s: OK\n", __func__); return 0; @@ -2990,7 +2990,7 @@ static int stk3x1x_i2c_probe(struct i2c_client *client, const struct i2c_device_ kfree(obj); exit: stk3x1x_i2c_client = NULL; - APS_ERR("%s: err = %d\n", __FUNCTION__, err); + APS_ERR("%s: err = %d\n", __func__, err); return err; } /*----------------------------------------------------------------------------*/ diff --git a/drivers/misc/mediatek/alsps/tmd2771/tmd2771.c b/drivers/misc/mediatek/alsps/tmd2771/tmd2771.c index 20d655aef..b4b3a7d89 100644 --- a/drivers/misc/mediatek/alsps/tmd2771/tmd2771.c +++ b/drivers/misc/mediatek/alsps/tmd2771/tmd2771.c @@ -50,8 +50,8 @@ #define TMD2771_DEV_NAME "TMD2771" /*----------------------------------------------------------------------------*/ #define APS_TAG "[ALS/PS] " -#define APS_FUN(f) printk(KERN_INFO APS_TAG"%s\n", __FUNCTION__) -#define APS_ERR(fmt, args...) printk(KERN_ERR APS_TAG"%s %d : "fmt, __FUNCTION__, __LINE__, ##args) +#define APS_FUN(f) printk(KERN_INFO APS_TAG"%s\n", __func__) +#define APS_ERR(fmt, args...) printk(KERN_ERR APS_TAG"%s %d : "fmt, __func__, __LINE__, ##args) #define APS_LOG(fmt, args...) printk(KERN_ERR APS_TAG fmt, ##args) #define APS_DBG(fmt, args...) printk(KERN_INFO APS_TAG fmt, ##args) @@ -1436,7 +1436,7 @@ static long TMD2771_unlocked_ioctl(struct file *file, unsigned int cmd, break; /*------------------------------------------------------------------------------------------*/ default: - APS_ERR("%s not supported = 0x%04x", __FUNCTION__, cmd); + APS_ERR("%s not supported = 0x%04x", __func__, cmd); err = -ENOIOCTLCMD; break; } diff --git a/drivers/misc/mediatek/alsps/tmd2771_auto/tmd2771.c b/drivers/misc/mediatek/alsps/tmd2771_auto/tmd2771.c index 97e6e369c..9f786b457 100644 --- a/drivers/misc/mediatek/alsps/tmd2771_auto/tmd2771.c +++ b/drivers/misc/mediatek/alsps/tmd2771_auto/tmd2771.c @@ -50,8 +50,8 @@ #define TMD2771_DEV_NAME "TMD2771" /*----------------------------------------------------------------------------*/ #define APS_TAG "[ALS/PS] " -#define APS_FUN(f) printk(KERN_ERR APS_TAG"%s\n", __FUNCTION__) -#define APS_ERR(fmt, args...) printk(KERN_ERR APS_TAG"%s %d : "fmt, __FUNCTION__, __LINE__, ##args) +#define APS_FUN(f) printk(KERN_ERR APS_TAG"%s\n", __func__) +#define APS_ERR(fmt, args...) printk(KERN_ERR APS_TAG"%s %d : "fmt, __func__, __LINE__, ##args) #define APS_LOG(fmt, args...) printk(KERN_ERR APS_TAG fmt, ##args) #define APS_DBG(fmt, args...) printk(KERN_ERR APS_TAG fmt, ##args) @@ -1460,7 +1460,7 @@ static long TMD2771_unlocked_ioctl(struct file *file, unsigned int cmd, break; /*------------------------------------------------------------------------------------------*/ default: - APS_ERR("%s not supported = 0x%04x", __FUNCTION__, cmd); + APS_ERR("%s not supported = 0x%04x", __func__, cmd); err = -ENOIOCTLCMD; break; } diff --git a/drivers/misc/mediatek/barometer/ms5607/ms5607.c b/drivers/misc/mediatek/barometer/ms5607/ms5607.c index fecf87443..83adb561a 100644 --- a/drivers/misc/mediatek/barometer/ms5607/ms5607.c +++ b/drivers/misc/mediatek/barometer/ms5607/ms5607.c @@ -152,8 +152,8 @@ static bool sensor_power = false; /*----------------------------------------------------------------------------*/ #define BAR_TAG "[Barometer] " -#define BAR_FUN(f) printk(KERN_INFO BAR_TAG"%s\n", __FUNCTION__) -#define BAR_ERR(fmt, args...) printk(KERN_ERR BAR_TAG"%s %d : "fmt, __FUNCTION__, __LINE__, ##args) +#define BAR_FUN(f) printk(KERN_INFO BAR_TAG"%s\n", __func__) +#define BAR_ERR(fmt, args...) printk(KERN_ERR BAR_TAG"%s %d : "fmt, __func__, __LINE__, ##args) #define BAR_LOG(fmt, args...) printk(KERN_INFO BAR_TAG fmt, ##args) /*----------------------------------------------------------------------------*/ /* diff --git a/drivers/misc/mediatek/c2k_ccci/c2k_hw.c b/drivers/misc/mediatek/c2k_ccci/c2k_hw.c index 81614ee8b..54297ebaa 100644 --- a/drivers/misc/mediatek/c2k_ccci/c2k_hw.c +++ b/drivers/misc/mediatek/c2k_ccci/c2k_hw.c @@ -205,7 +205,7 @@ int c2k_gpio_to_irq(int gpio) des = gpio_des_find_by_gpio(gpio); if(NULL == des){ - printk("%s: no irq for gpio %d\n", __FUNCTION__, gpio); + printk("%s: no irq for gpio %d\n", __func__, gpio); return -1; }else{ return des->irq; @@ -218,7 +218,7 @@ int c2k_irq_to_gpio(int irq) des = gpio_des_find_by_irq(irq); if(NULL == des){ - printk("%s: no gpio for irq %d\n", __FUNCTION__, irq); + printk("%s: no gpio for irq %d\n", __func__, irq); return -1; }else{ return des->gpio; @@ -243,7 +243,7 @@ int c2k_irq_set_type(int irq, unsigned int type) des = gpio_des_find_by_irq(irq); if(NULL == des){ - printk("%s: no gpio for irq %d\n", __FUNCTION__, irq); + printk("%s: no gpio for irq %d\n", __func__, irq); return -1; }else{ des->irq_type = type; @@ -258,7 +258,7 @@ int c2k_gpio_get_irq_type(int gpio) des = gpio_des_find_by_gpio(gpio); if(NULL == des){ - printk("%s: no irqtype for gpio %d\n", __FUNCTION__, gpio); + printk("%s: no irqtype for gpio %d\n", __func__, gpio); return -1; }else{ return des->irq_type; @@ -272,7 +272,7 @@ int c2k_gpio_set_ls(int gpio, unsigned int ls) des = gpio_des_find_by_gpio(gpio); if(NULL == des){ - printk("%s: no des for gpio %d\n", __FUNCTION__, gpio); + printk("%s: no des for gpio %d\n", __func__, gpio); return -1; }else{ des->eint_ls = ls;; @@ -286,7 +286,7 @@ int c2k_gpio_get_ls(int gpio) des = gpio_des_find_by_gpio(gpio); if(NULL == des){ - printk("%s: no des for gpio %d\n", __FUNCTION__, gpio); + printk("%s: no des for gpio %d\n", __func__, gpio); return -1; }else{ return des->eint_ls; @@ -299,7 +299,7 @@ int c2k_gpio_to_ls(int gpio) des = gpio_des_find_by_gpio(gpio); if(NULL == des){ - printk("%s: no des for gpio %d\n", __FUNCTION__, gpio); + printk("%s: no des for gpio %d\n", __func__, gpio); return -1; }else{ if (des->irq_type == IRQ_TYPE_EDGE_FALLING) @@ -321,7 +321,7 @@ extern void set_ap_wake_cp(int value); int c2k_ap_ready_indicate(int value) { if (value != 0 && value != 1){ - printk("%s: invalid para %d\n", __FUNCTION__, value); + printk("%s: invalid para %d\n", __func__, value); return (-1); } @@ -333,7 +333,7 @@ int c2k_ap_ready_indicate(int value) int c2k_ap_wake_cp(int value) { if (value != 0 && value != 1){ - printk("%s: invalid para %d\n", __FUNCTION__, value); + printk("%s: invalid para %d\n", __func__, value); return (-1); } diff --git a/drivers/misc/mediatek/c2k_ccci/cbp_sdio.c b/drivers/misc/mediatek/c2k_ccci/cbp_sdio.c index fa70b0860..728cfe0b8 100644 --- a/drivers/misc/mediatek/c2k_ccci/cbp_sdio.c +++ b/drivers/misc/mediatek/c2k_ccci/cbp_sdio.c @@ -868,12 +868,12 @@ static int cbp_probe(struct platform_device *pdev) sdio_tx_handle.polar = plat->gpio_sync_polar; ret = asc_tx_register_handle(&sdio_tx_handle); if(ret){ - LOGPRT(LOG_ERR, "%s %d asc_tx_register_handle failed.\n",__FUNCTION__,__LINE__); + LOGPRT(LOG_ERR, "%s %d asc_tx_register_handle failed.\n",__func__,__LINE__); goto err_ipc; } ret = asc_tx_add_user(sdio_tx_handle.name, &sdio_tx_user); if(ret){ - LOGPRT(LOG_ERR, "%s %d asc_tx_add_user failed.\n",__FUNCTION__,__LINE__); + LOGPRT(LOG_ERR, "%s %d asc_tx_add_user failed.\n",__func__,__LINE__); goto err_ipc; } @@ -882,12 +882,12 @@ static int cbp_probe(struct platform_device *pdev) sdio_rx_handle.polar = plat->gpio_sync_polar; ret = asc_rx_register_handle(&sdio_rx_handle); if(ret){ - LOGPRT(LOG_ERR, "%s %d asc_rx_register_handle failed.\n",__FUNCTION__,__LINE__); + LOGPRT(LOG_ERR, "%s %d asc_rx_register_handle failed.\n",__func__,__LINE__); goto err_ipc; } ret = asc_rx_add_user(sdio_rx_handle.name, &sdio_rx_user); if(ret){ - LOGPRT(LOG_ERR, "%s %d asc_rx_add_user failed.\n",__FUNCTION__,__LINE__); + LOGPRT(LOG_ERR, "%s %d asc_rx_add_user failed.\n",__func__,__LINE__); goto err_ipc; } plat->ipc_enable = true; @@ -1015,7 +1015,7 @@ static int cbp_pm_event(struct notifier_block *notifier, unsigned long pm_event, struct cbp_platform_data *cdata = &cbp_data; unsigned long flags; - LOGPRT(LOG_NOTICE,"%s pm_event=%ld\n",__FUNCTION__,pm_event); + LOGPRT(LOG_NOTICE,"%s pm_event=%ld\n",__func__,pm_event); switch(pm_event) { case PM_HIBERNATION_PREPARE: // This event is recieved when system is preparing to hibernation. @@ -1033,7 +1033,7 @@ static int cbp_pm_event(struct notifier_block *notifier, unsigned long pm_event, cdata->modem->status = MD_OFF; spin_unlock_irqrestore(&cdata->modem->status_lock, flags); } - LOGPRT(LOG_NOTICE,"[%s] ipoh occured\n", __FUNCTION__); + LOGPRT(LOG_NOTICE,"[%s] ipoh occured\n", __func__); modem_reset_handler(); c2k_platform_restore_first_init(); LOGPRT(LOG_NOTICE, "%s %d power off sdio host\n", __func__, __LINE__); diff --git a/drivers/misc/mediatek/c2k_ccci/f_rawbulk.c b/drivers/misc/mediatek/c2k_ccci/f_rawbulk.c index 49f4cac7e..86067528d 100644 --- a/drivers/misc/mediatek/c2k_ccci/f_rawbulk.c +++ b/drivers/misc/mediatek/c2k_ccci/f_rawbulk.c @@ -182,7 +182,7 @@ int rawbulk_function_bind(struct usb_configuration *c, struct ep_out = usb_ep_autoconfig(gadget, (struct usb_endpoint_descriptor *) fn->fs_descs[BULKOUT_DESC]); if (!ep_out) { - printk(KERN_ERR "%s %d config ep_out error \n", __FUNCTION__,__LINE__); + printk(KERN_ERR "%s %d config ep_out error \n", __func__,__LINE__); return -ENOMEM; } @@ -190,7 +190,7 @@ int rawbulk_function_bind(struct usb_configuration *c, struct fn->fs_descs[BULKIN_DESC]); if (!ep_in) { usb_ep_disable(ep_out); - printk(KERN_ERR "%s %d config ep_in error \n", __FUNCTION__,__LINE__); + printk(KERN_ERR "%s %d config ep_in error \n", __func__,__LINE__); return -ENOMEM; } diff --git a/drivers/misc/mediatek/c2k_ccci/modem_sdio.c b/drivers/misc/mediatek/c2k_ccci/modem_sdio.c index 359c199d8..d87b0399b 100644 --- a/drivers/misc/mediatek/c2k_ccci/modem_sdio.c +++ b/drivers/misc/mediatek/c2k_ccci/modem_sdio.c @@ -344,7 +344,7 @@ static int check_port(struct sdio_modem_port *port) struct sdio_modem *modem = NULL; int ret = 0; if (!port){ - LOGPRT(LOG_ERR, "%s port NULL\n", __FUNCTION__); + LOGPRT(LOG_ERR, "%s port NULL\n", __func__); ret = -ENODEV; } else{ @@ -1960,7 +1960,7 @@ void exception_data_dump(const char *buf, unsigned int len) int i; if (!buf || (len <= 0)){ - LOGPRT(LOG_ERR, "[MODEM SDIO] %s: Bad parameters!\n", __FUNCTION__); + LOGPRT(LOG_ERR, "[MODEM SDIO] %s: Bad parameters!\n", __func__); goto err_exit; } LOGPRT(LOG_INFO, "[MODEM SDIO] Exception data dump begin\n"); @@ -3893,7 +3893,7 @@ int sdio_rawbulk_intercept(int port_num, unsigned int inception) { struct sdio_modem_port *port = sdio_modem_tty_port_get(port_num); if (!port || !port->func){ - LOGPRT(LOG_ERR, "%s %d failed\n", __FUNCTION__,__LINE__); + LOGPRT(LOG_ERR, "%s %d failed\n", __func__,__LINE__); return ret; } LOGPRT(LOG_DEBUG, "modem inception = %d\n", inception); @@ -3925,7 +3925,7 @@ int modem_buffer_push(int port_num, void *buf, int count) ret = check_port(port); if (ret < 0){ - LOGPRT(LOG_ERR, "%s %d invalid port\n", __FUNCTION__,__LINE__); + LOGPRT(LOG_ERR, "%s %d invalid port\n", __func__,__LINE__); return ret; } @@ -3938,7 +3938,7 @@ int modem_buffer_push(int port_num, void *buf, int count) data_len = FIFO_SIZE - kfifo_len(&port->transmit_fifo); spin_unlock_irqrestore(&port->write_lock, flags); if(data_len < count) { - LOGPRT(LOG_DEBUG, "%s %d: SDIO driver buffer is full!\n", __FUNCTION__,__LINE__); + LOGPRT(LOG_DEBUG, "%s %d: SDIO driver buffer is full!\n", __func__,__LINE__); return -ENOMEM; } @@ -5234,7 +5234,7 @@ int modem_sdio_init(struct cbp_platform_data *pdata) ret = -ENOMEM; goto err_kazlloc_sdio_modem_port; } - //printk("[MODEM SDIO] %s index[%d] 0x%x\n", __FUNCTION__, index, port); + //printk("[MODEM SDIO] %s index[%d] 0x%x\n", __func__, index, port); #if !ENABLE_CHAR_DEV tty_port_init(&port->port); port->port.ops = &sdio_modem_port_ops; diff --git a/drivers/misc/mediatek/c2k_ccci/mt6735/c2k_platform.c b/drivers/misc/mediatek/c2k_ccci/mt6735/c2k_platform.c index f2166b1ec..a70424dec 100644 --- a/drivers/misc/mediatek/c2k_ccci/mt6735/c2k_platform.c +++ b/drivers/misc/mediatek/c2k_ccci/mt6735/c2k_platform.c @@ -517,7 +517,7 @@ void set_ap_ready(int value) reg_value &= ~AP_READY_BIT; //set 0 to indicate ap ready c2k_write32(infra_ao_base, INFRA_AO_C2K_SPM_CTRL, reg_value); - printk("[C2K]%s: set ap ready %d\n", __FUNCTION__, value); + printk("[C2K]%s: set ap ready %d\n", __func__, value); } void set_ap_wake_cp(int value) diff --git a/drivers/misc/mediatek/c2k_ccci/power.c b/drivers/misc/mediatek/c2k_ccci/power.c index 0a451206c..8c850c31d 100644 --- a/drivers/misc/mediatek/c2k_ccci/power.c +++ b/drivers/misc/mediatek/c2k_ccci/power.c @@ -117,7 +117,7 @@ extern int dump_c2k_sdio_status(struct sdio_modem *modem); static void modem_signal_user(int event) { if(cmdata && cmdata->fasync){ - printk("%s: evnet %d.\n",__FUNCTION__, (short)event); + printk("%s: evnet %d.\n",__func__, (short)event); kill_fasync(&cmdata->fasync, SIGIO, event); } } @@ -268,7 +268,7 @@ ssize_t modem_power_store( }else if(!strncmp(buf, "off", strlen("off"))){ power = 0; }else{ - printk("%s: input %s is invalid.\n", __FUNCTION__, buf); + printk("%s: input %s is invalid.\n", __func__, buf); return n; } @@ -700,7 +700,7 @@ EXPORT_SYMBOL(modem_unregister_notifier); static irqreturn_t modem_reset_indication_irq(int irq, void *data) { - printk("[C2K MODEM] %s %d \n",__FUNCTION__,__LINE__); + printk("[C2K MODEM] %s %d \n",__func__,__LINE__); #ifndef CONFIG_EVDO_DT_VIA_SUPPORT c2k_gpio_to_ls(GPIO_C2K_MDM_RST_IND); @@ -709,13 +709,13 @@ static irqreturn_t modem_reset_indication_irq(int irq, void *data) if(GPIO_C2K_VALID(GPIO_C2K_MDM_RST_IND)){ //c2k_gpio_set_irq_type(GPIO_C2K_MDM_RST_IND, IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING); if(c2k_gpio_get_value(GPIO_C2K_MDM_RST_IND)){ - printk("[C2K] %s %d ON, md is off now...\n",__FUNCTION__,__LINE__); + printk("[C2K] %s %d ON, md is off now...\n",__func__,__LINE__); wake_lock_timeout(&cmdata->wlock, MDM_RST_LOCK_TIME * HZ); //#ifdef CONFIG_EVDO_DT_VIA_SUPPORT modem_notify_event(MDM_EVT_NOTIFY_RESET_ON); //#endif }else{ - printk("%s %d OFF, md is on now...\n",__FUNCTION__,__LINE__); + printk("%s %d OFF, md is on now...\n",__func__,__LINE__); //#ifdef CONFIG_EVDO_DT_VIA_SUPPORT modem_notify_event(MDM_EVT_NOTIFY_RESET_OFF); //#endif @@ -749,7 +749,7 @@ static int modem_userspace_notifier(int msg, void *data) char *hd = (char *)data; if(!hd) { - printk(KERN_ERR "%s:error sync user\n", __FUNCTION__); + printk(KERN_ERR "%s:error sync user\n", __func__); return -ENODEV; } @@ -780,7 +780,7 @@ static int modem_userspace_notifier(int msg, void *data) break; default: - printk("%s unknow message %d\n", __FUNCTION__, msg); + printk("%s unknow message %d\n", __func__, msg); } return ret; @@ -801,7 +801,7 @@ static int modem_sync_init(void) cfg.polar = 1; ret = asc_tx_register_handle(&cfg); if(ret < 0){ - printk("%s: fail to regist tx handle %s\n", __FUNCTION__, CBP_TX_HD_NAME); + printk("%s: fail to regist tx handle %s\n", __func__, CBP_TX_HD_NAME); goto end_sync_init; } } @@ -815,7 +815,7 @@ static int modem_sync_init(void) cfg.polar = 1; ret = asc_rx_register_handle(&cfg); if(ret < 0){ - printk("%s: fail to regist rx handle %s\n", __FUNCTION__, USB_RX_HD_NAME); + printk("%s: fail to regist rx handle %s\n", __func__, USB_RX_HD_NAME); goto end_sync_init; } memset(&user, 0, sizeof(struct asc_infor)); @@ -824,7 +824,7 @@ static int modem_sync_init(void) snprintf(user.name, ASC_NAME_LEN, USB_RX_USER_NAME); ret = asc_rx_add_user(USB_RX_HD_NAME, &user); if(ret < 0){ - printk("%s: fail to regist rx user %s\n", __FUNCTION__, USB_RX_USER_NAME); + printk("%s: fail to regist rx user %s\n", __func__, USB_RX_USER_NAME); goto end_sync_init; } } @@ -838,7 +838,7 @@ static int modem_sync_init(void) cfg.polar = 1; ret = asc_rx_register_handle(&cfg); if(ret < 0){ - printk("%s: fail to regist rx handle %s\n", __FUNCTION__, UART_RX_HD_NAME); + printk("%s: fail to regist rx handle %s\n", __func__, UART_RX_HD_NAME); goto end_sync_init; } @@ -848,14 +848,14 @@ static int modem_sync_init(void) snprintf(user.name, ASC_NAME_LEN, UART_RX_USER_NAME); ret = asc_rx_add_user(UART_RX_HD_NAME, &user); if(ret < 0){ - printk("%s: fail to regist rx user %s\n", __FUNCTION__, UART_RX_USER_NAME); + printk("%s: fail to regist rx user %s\n", __func__, UART_RX_USER_NAME); goto end_sync_init; } } end_sync_init: if(ret){ - printk("%s: error\n", __FUNCTION__); + printk("%s: error\n", __func__); } return ret; } diff --git a/drivers/misc/mediatek/c2k_ccci/sync.c b/drivers/misc/mediatek/c2k_ccci/sync.c index 29772abac..788d8578d 100644 --- a/drivers/misc/mediatek/c2k_ccci/sync.c +++ b/drivers/misc/mediatek/c2k_ccci/sync.c @@ -472,7 +472,7 @@ static int asc_rx_event_send(struct asc_rx_handle *rx, int id) int ret = -ENODEV; if(rx->thread == NULL){ - ASCPRT("%s:no thread for event\n", __FUNCTION__); + ASCPRT("%s:no thread for event\n", __func__); return ret; } @@ -508,7 +508,7 @@ static int asc_rx_event_recv(struct asc_rx_handle *rx) int ret = -ENODEV; if(rx->thread == NULL){ - ASCPRT("%s:no thread for event\n", __FUNCTION__); + ASCPRT("%s:no thread for event\n", __func__); return ret; } @@ -683,7 +683,7 @@ static int asc_rx_handle_init(struct asc_rx_handle *rx) name = kzalloc(ASC_NAME_LEN, GFP_KERNEL); if(!name){ ret = -ENOMEM; - ASCPRT("%s: no memory to malloc for wake lock name\n", __FUNCTION__); + ASCPRT("%s: no memory to malloc for wake lock name\n", __func__); goto err_malloc_name; } snprintf(name, ASC_NAME_LEN, "asc_rx_%s", rx->cfg.name); @@ -903,7 +903,7 @@ static int asc_tx_event_send(struct asc_tx_handle *tx, int id) int ret = -ENODEV; if(tx->thread == NULL){ - ASCPRT("%s:no thread for event\n", __FUNCTION__); + ASCPRT("%s:no thread for event\n", __func__); return ret; } @@ -938,7 +938,7 @@ static int asc_tx_event_recv(struct asc_tx_handle *tx) int ret = -ENODEV; if(tx->thread == NULL){ - ASCPRT("%s:no thread for event\n", __FUNCTION__); + ASCPRT("%s:no thread for event\n", __func__); return ret; } @@ -1162,7 +1162,7 @@ static int asc_tx_handle_init(struct asc_tx_handle *tx) name = kzalloc(ASC_NAME_LEN, GFP_KERNEL); if(!name){ ret = -ENOMEM; - ASCPRT("%s: no memory to malloc for wake lock name\n", __FUNCTION__); + ASCPRT("%s: no memory to malloc for wake lock name\n", __func__); goto err_malloc_name; } snprintf(name, ASC_NAME_LEN, "asc_tx_%s", tx->cfg.name); @@ -1354,7 +1354,7 @@ static void asc_tx_handle_reset(struct asc_tx_handle *tx) { unsigned long flags; - ASCDPRT("%s %s\n", __FUNCTION__, tx->cfg.name); + ASCDPRT("%s %s\n", __func__, tx->cfg.name); del_timer(&tx->timer_wait_ready); del_timer(&tx->timer_wait_idle); del_timer(&tx->timer_wait_sleep); @@ -1506,7 +1506,7 @@ int asc_tx_add_user(const char *name, struct asc_infor *infor) list_add_tail(&user->node, &tx->user_list); spin_unlock_irqrestore(&tx->slock, flags); }else{ - ASCPRT("%s error: user %s already exist!!\n", __FUNCTION__, infor->name); + ASCPRT("%s error: user %s already exist!!\n", __func__, infor->name); ret = -EINVAL; } error: @@ -1533,7 +1533,7 @@ void asc_tx_del_user(const char *path) memcpy(hname, path, min(name - path, ASC_NAME_LEN - 1)); name++; }else{ - ASCPRT("%s: invalid path %s\n", __FUNCTION__, path); + ASCPRT("%s: invalid path %s\n", __func__, path); return ; } @@ -1599,18 +1599,18 @@ int asc_tx_get_ready(const char *path, int sync) return -ENODEV; if(!strncmp(name, ASC_TX_AUTO_USER, strlen(ASC_TX_AUTO_USER))){ - ASCPRT("%s:tx user name %s is reserved\n", __FUNCTION__, name); + ASCPRT("%s:tx user name %s is reserved\n", __func__, name); return -EINVAL; } spin_lock_irqsave(&tx->user_count_lock, flags); if(asc_tx_get_user(tx, name) < 0){ - ASCPRT("%s:tx user name %s is unknow\n", __FUNCTION__, name); + ASCPRT("%s:tx user name %s is unknow\n", __func__, name); spin_unlock_irqrestore(&tx->user_count_lock, flags); return -ENODEV; } - ASCDPRT("%s: %s=%d, %s=%d\n", __FUNCTION__,\ + ASCDPRT("%s: %s=%d, %s=%d\n", __func__,\ tx->cfg.name, asc_tx_refer(tx, NULL), path, asc_tx_refer(tx, name)); spin_unlock_irqrestore(&tx->user_count_lock, flags); @@ -1630,7 +1630,7 @@ int asc_tx_get_ready(const char *path, int sync) break; case AP_TX_ST_READY: if(atomic_read(&tx->sleeping)){ - ASCPRT("%s: tx state is sleeping\n", __FUNCTION__); + ASCPRT("%s: tx state is sleeping\n", __func__); asc_tx_event_send(tx, AP_TX_EVENT_REQUEST); } break; @@ -1695,15 +1695,15 @@ int asc_tx_put_ready(const char *path, int sync) spin_lock_irqsave(&tx->user_count_lock, flags); if(asc_tx_put_user(tx, name) < 0){ - ASCPRT("%s:tx user name %s is unknow\n", __FUNCTION__, name); + ASCPRT("%s:tx user name %s is unknow\n", __func__, name); spin_unlock_irqrestore(&tx->user_count_lock, flags); return -ENODEV; } - ASCDPRT("%s: %s=%d, %s=%d\n", __FUNCTION__,\ + ASCDPRT("%s: %s=%d, %s=%d\n", __func__,\ tx->cfg.name, asc_tx_refer(tx, NULL), path, asc_tx_refer(tx, name)); /*count is not 0, so do nothing*/ if(asc_tx_refer(tx, NULL) != 0){ - ASCPRT("%s:asc_tx_refer user count is not 0\n", __FUNCTION__); + ASCPRT("%s:asc_tx_refer user count is not 0\n", __func__); spin_unlock_irqrestore(&tx->user_count_lock, flags); return 0; } @@ -1759,7 +1759,7 @@ int asc_tx_auto_ready(const char *name, int sync) unsigned long flags = 0; if (!name) { - ASCPRT("%s:Invalid name\n", __FUNCTION__); + ASCPRT("%s:Invalid name\n", __func__); return -EINVAL; } @@ -1774,7 +1774,7 @@ int asc_tx_auto_ready(const char *name, int sync) spin_lock_irqsave(&tx->user_count_lock, flags); if(atomic_read(&user->count) == 0){ - ASCDPRT("%s: %s=%d, %s=%d\n", __FUNCTION__,\ + ASCDPRT("%s: %s=%d, %s=%d\n", __func__,\ tx->cfg.name, asc_tx_refer(tx, NULL), ASC_TX_AUTO_USER, asc_tx_refer(tx, ASC_TX_AUTO_USER)); atomic_inc(&user->count); } @@ -1826,13 +1826,13 @@ int asc_tx_auto_ready(const char *name, int sync) if(timeout > msecs_to_jiffies(ASC_TX_WAIT_READY_TIME)){ /*unlikely,unless sleeping has some unknow bug*/ ASCDPRT("why come here . %s %s now is ready,but wait time expire\n", - __FUNCTION__, tx->cfg.name); + __func__, tx->cfg.name); break; } if(atomic_read(&tx->sleeping)){ /*sleep handle is on the way,we should wait another 20ms for it done*/ ASCDPRT("%s %s sleep handle is on the way,should wait it finish\n", - __FUNCTION__, tx->cfg.name); + __func__, tx->cfg.name); continue; }else{ /*likely,cp is ready now*/ @@ -1850,7 +1850,7 @@ int asc_tx_auto_ready(const char *name, int sync) try++; }else{ ret = -EBUSY; - ASCDPRT(" %s %s wait cp ready failed\n", __FUNCTION__, tx->cfg.name); + ASCDPRT(" %s %s wait cp ready failed\n", __func__, tx->cfg.name); break; } }while(1); @@ -1871,7 +1871,7 @@ int asc_tx_ready_count(const char *name, int inc) int do_sleep; if (!name) { - ASCPRT("%s:Invalid name\n", __FUNCTION__); + ASCPRT("%s:Invalid name\n", __func__); return -EINVAL; } @@ -1887,7 +1887,7 @@ int asc_tx_ready_count(const char *name, int inc) if (tx->ready_hold == 0 && atomic_read(&tx->delay_sleep)){ atomic_set(&tx->delay_sleep, 0); spin_unlock_irqrestore(&tx->slock, flags); - ASCPRT("%s:asc_tx_put_ready for %s name\n", __FUNCTION__, tx->cfg.name); + ASCPRT("%s:asc_tx_put_ready for %s name\n", __func__, tx->cfg.name); snprintf(path, ASC_NAME_LEN, "%s.%s", tx->cfg.name, ASC_TX_AUTO_USER); asc_tx_put_ready(path, 0); return 0; @@ -1903,7 +1903,7 @@ static void asc_rx_handle_reset(struct asc_rx_handle *rx) { unsigned long flags; - ASCDPRT("%s %s\n", __FUNCTION__, rx->cfg.name); + ASCDPRT("%s %s\n", __func__, rx->cfg.name); del_timer(&rx->timer); wake_unlock(&rx->wlock); asc_rx_indicate_sleep(rx); @@ -1970,7 +1970,7 @@ int asc_rx_add_user(const char *name, struct asc_infor *infor) } } }else{ - ASCPRT("%s error: user %s already exist!!\n", __FUNCTION__, infor->name); + ASCPRT("%s error: user %s already exist!!\n", __func__, infor->name); ret = -EINVAL; } error: @@ -1998,7 +1998,7 @@ void asc_rx_del_user(const char *path) memcpy(hname, path, min(name - path, ASC_NAME_LEN - 1)); name++; }else{ - ASCPRT("%s: Invalid path %s\n",__FUNCTION__, path); + ASCPRT("%s: Invalid path %s\n",__func__, path); return ; } @@ -2036,7 +2036,7 @@ int asc_rx_confirm_ready(const char *name, int ready) rx = asc_rx_handle_lookup(name); if(!rx){ - ASCDPRT("%s: name %s is unknow\n", __FUNCTION__, name); + ASCDPRT("%s: name %s is unknow\n", __func__, name); return -ENODEV; } @@ -2190,7 +2190,7 @@ static ssize_t asc_refer_show(struct kobject *kobj, struct kobj_attribute *attr, s += sprintf(s, "%d\n", asc_tx_refer(tx, ASC_TX_SYSFS_USER)); return s - buf; }else{ - ASCPRT("%s read error\n", __FUNCTION__); + ASCPRT("%s read error\n", __func__); return -EINVAL; } @@ -2251,7 +2251,7 @@ static ssize_t asc_state_show(struct kobject *kobj, struct kobj_attribute *attr, s += sprintf(s, "%s\n", tx->table[atomic_read(&tx->state)].name); return s - buf; }else{ - ASCPRT("%s read error\n", __FUNCTION__); + ASCPRT("%s read error\n", __func__); return -EINVAL; } @@ -2284,7 +2284,7 @@ static ssize_t asc_auto_ready_show(struct kobject *kobj, struct kobj_attribute * s += sprintf(s, "%d\n", tx->auto_delay); return s - buf; }else{ - ASCPRT("%s read error\n", __FUNCTION__); + ASCPRT("%s read error\n", __func__); return -EINVAL; } @@ -2322,7 +2322,7 @@ static ssize_t asc_auto_ready_store(struct kobject *kobj, struct kobj_attribute } error = asc_tx_auto_ready(tx->cfg.name, 1); }else{ - ASCPRT("%s read error\n", __FUNCTION__); + ASCPRT("%s read error\n", __func__); error = -EINVAL; } @@ -2382,7 +2382,7 @@ static ssize_t asc_confirm_ready_store(struct kobject *kobj, struct kobj_attribu error = asc_rx_confirm_ready(rx->cfg.name, !!val); }else{ - ASCPRT("%s read error\n", __FUNCTION__); + ASCPRT("%s read error\n", __func__); error = -EINVAL; } @@ -2468,7 +2468,7 @@ int asc_rx_register_handle(struct asc_config *cfg) struct asc_rx_handle *rx = NULL; if(NULL == asc_work_queue){ - ASCPRT("%s: error Asc has not been init\n", __FUNCTION__); + ASCPRT("%s: error Asc has not been init\n", __func__); return -EINVAL; } @@ -2477,7 +2477,7 @@ int asc_rx_register_handle(struct asc_config *cfg) } if(((cfg->gpio_wake) & 0xFFFF) < 0){ - ASCPRT("%s: config %s gpio is invalid.\n", __FUNCTION__, cfg->name); + ASCPRT("%s: config %s gpio is invalid.\n", __func__, cfg->name); return -EINVAL; } @@ -2541,7 +2541,7 @@ int asc_tx_register_handle(struct asc_config *cfg) struct asc_tx_handle *tx = NULL; if(NULL == asc_work_queue){ - ASCPRT("%s: error Asc has not been init\n", __FUNCTION__); + ASCPRT("%s: error Asc has not been init\n", __func__); return -EINVAL; } @@ -2550,7 +2550,7 @@ int asc_tx_register_handle(struct asc_config *cfg) } //by yfu if(((cfg->gpio_wake) & 0xFFFF) < 0){ - ASCPRT("%s: config %s gpio is invalid.\n", __FUNCTION__, cfg->name); + ASCPRT("%s: config %s gpio is invalid.\n", __func__, cfg->name); return -EINVAL; } diff --git a/drivers/misc/mediatek/cam_cal/src/mt6735/cat24c16/cat24c16.c b/drivers/misc/mediatek/cam_cal/src/mt6735/cat24c16/cat24c16.c index 2762fd67a..7c0305536 100644 --- a/drivers/misc/mediatek/cam_cal/src/mt6735/cat24c16/cat24c16.c +++ b/drivers/misc/mediatek/cam_cal/src/mt6735/cat24c16/cat24c16.c @@ -29,9 +29,9 @@ #ifdef CAM_CAL_DEBUG #define PFX "cat2416c" -#define CAM_CALINF(fmt, arg...) pr_debug("[%s] " fmt, __FUNCTION__, ##arg) -#define CAM_CALDB(fmt, arg...) pr_debug("[%s] " fmt, __FUNCTION__, ##arg) -#define CAM_CALERR(fmt, arg...) pr_err("[%s] " fmt, __FUNCTION__, ##arg) +#define CAM_CALINF(fmt, arg...) pr_debug("[%s] " fmt, __func__, ##arg) +#define CAM_CALDB(fmt, arg...) pr_debug("[%s] " fmt, __func__, ##arg) +#define CAM_CALERR(fmt, arg...) pr_err("[%s] " fmt, __func__, ##arg) #else #define CAM_CALDB(x,...) #endif diff --git a/drivers/misc/mediatek/cam_cal/src/mt6735/imx135_otp/imx135_otp.c b/drivers/misc/mediatek/cam_cal/src/mt6735/imx135_otp/imx135_otp.c index 37fa0e649..1511cba9c 100644 --- a/drivers/misc/mediatek/cam_cal/src/mt6735/imx135_otp/imx135_otp.c +++ b/drivers/misc/mediatek/cam_cal/src/mt6735/imx135_otp/imx135_otp.c @@ -32,13 +32,13 @@ #ifdef CAM_CAL_DEBUG -#define CAM_CALINF(fmt, arg...) pr_debug("[%s] " fmt, __FUNCTION__, ##arg) -#define CAM_CALDB(fmt, arg...) pr_debug("[%s] " fmt, __FUNCTION__, ##arg) -#define CAM_CALERR(fmt, arg...) pr_err("[%s] " fmt, __FUNCTION__, ##arg) +#define CAM_CALINF(fmt, arg...) pr_debug("[%s] " fmt, __func__, ##arg) +#define CAM_CALDB(fmt, arg...) pr_debug("[%s] " fmt, __func__, ##arg) +#define CAM_CALERR(fmt, arg...) pr_err("[%s] " fmt, __func__, ##arg) #else #define CAM_CALINF(x,...) #define CAM_CALDB(x,...) -#define CAM_CALERR(fmt, arg...) pr_err("[%s] " fmt, __FUNCTION__, ##arg) +#define CAM_CALERR(fmt, arg...) pr_err("[%s] " fmt, __func__, ##arg) #endif static DEFINE_SPINLOCK(g_CAM_CALLock); // for SMP diff --git a/drivers/misc/mediatek/cam_cal/src/mt6735/imx219_eeprom/imx219_eeprom.c b/drivers/misc/mediatek/cam_cal/src/mt6735/imx219_eeprom/imx219_eeprom.c index 97ad3f91f..391a81348 100644 --- a/drivers/misc/mediatek/cam_cal/src/mt6735/imx219_eeprom/imx219_eeprom.c +++ b/drivers/misc/mediatek/cam_cal/src/mt6735/imx219_eeprom/imx219_eeprom.c @@ -31,13 +31,13 @@ #ifdef CAM_CAL_DEBUG -#define CAM_CALINF(fmt, arg...) pr_debug("[%s] " fmt, __FUNCTION__, ##arg) -#define CAM_CALDB(fmt, arg...) pr_debug("[%s] " fmt, __FUNCTION__, ##arg) -#define CAM_CALERR(fmt, arg...) pr_err("[%s] " fmt, __FUNCTION__, ##arg) +#define CAM_CALINF(fmt, arg...) pr_debug("[%s] " fmt, __func__, ##arg) +#define CAM_CALDB(fmt, arg...) pr_debug("[%s] " fmt, __func__, ##arg) +#define CAM_CALERR(fmt, arg...) pr_err("[%s] " fmt, __func__, ##arg) #else #define CAM_CALINF(x,...) #define CAM_CALDB(x,...) -#define CAM_CALERR(fmt, arg...) pr_err("[%s] " fmt, __FUNCTION__, ##arg) +#define CAM_CALERR(fmt, arg...) pr_err("[%s] " fmt, __func__, ##arg) #endif static DEFINE_SPINLOCK(g_CAM_CALLock); // for SMP diff --git a/drivers/misc/mediatek/ccci_util/ccci_util_dummy.c b/drivers/misc/mediatek/ccci_util/ccci_util_dummy.c index c109f0beb..63687a37d 100644 --- a/drivers/misc/mediatek/ccci_util/ccci_util_dummy.c +++ b/drivers/misc/mediatek/ccci_util/ccci_util_dummy.c @@ -8,36 +8,36 @@ int __weak exec_ccci_kern_func_by_md_id(int md_id, unsigned int id, char *buf, unsigned int len) { -printk("[ccci/dummy] %s is not supported!\n",__FUNCTION__); +printk("[ccci/dummy] %s is not supported!\n",__func__); return 0; } int __weak switch_sim_mode(int id, char *buf, unsigned int len) { -printk("[ccci/dummy] %s is not supported!\n",__FUNCTION__); +printk("[ccci/dummy] %s is not supported!\n",__func__); return 0; } unsigned int __weak get_sim_switch_type(void) { -printk("[ccci/dummy] %s is not supported!\n",__FUNCTION__); +printk("[ccci/dummy] %s is not supported!\n",__func__); return 0; } unsigned int __weak get_modem_is_enabled(int md_id) { -printk("[ccci/dummy] %s is not supported!\n",__FUNCTION__); +printk("[ccci/dummy] %s is not supported!\n",__func__); return 0; } int __weak register_ccci_sys_call_back(int md_id, unsigned int id, int (*func)(int, int)) { -printk("[ccci/dummy] %s is not supported!\n",__FUNCTION__); +printk("[ccci/dummy] %s is not supported!\n",__func__); return 0; } unsigned int __weak mt_irq_get_pending(unsigned int irq) { -printk("[ccci/dummy] %s is not supported!\n",__FUNCTION__); +printk("[ccci/dummy] %s is not supported!\n",__func__); return 0; } void __weak notify_time_update(void) { -printk("[ccci/dummy] %s is not supported!\n",__FUNCTION__); +printk("[ccci/dummy] %s is not supported!\n",__func__); } diff --git a/drivers/misc/mediatek/ccmni/ccmni.h b/drivers/misc/mediatek/ccmni/ccmni.h index ef8ca9aa9..0f915189b 100644 --- a/drivers/misc/mediatek/ccmni/ccmni.h +++ b/drivers/misc/mediatek/ccmni/ccmni.h @@ -142,7 +142,7 @@ do { \ #define CCMNI_INF_MSG(idx, fmt, args...) printk(KERN_NOTICE "[ccci%d/net]" fmt, (idx+1), ##args) #define CCMNI_RAM_MSG(idx, fmt, args...) printk(KERN_DEBUG "[ccci%d/net]" fmt, (idx+1), ##args) -#define CCMNI_ERR_MSG(idx, fmt, args...) printk(KERN_ERR "[ccci%d/net][Error:%d]%s:" fmt, (idx+1), __LINE__, __FUNCTION__, ##args) +#define CCMNI_ERR_MSG(idx, fmt, args...) printk(KERN_ERR "[ccci%d/net][Error:%d]%s:" fmt, (idx+1), __LINE__, __func__, ##args) #endif // __CCCI_CCMNI_H__ diff --git a/drivers/misc/mediatek/chargepump/lm3632/lm3632_driver.c b/drivers/misc/mediatek/chargepump/lm3632/lm3632_driver.c index 72c8e6cba..980bc8749 100644 --- a/drivers/misc/mediatek/chargepump/lm3632/lm3632_driver.c +++ b/drivers/misc/mediatek/chargepump/lm3632/lm3632_driver.c @@ -66,8 +66,8 @@ this source file refer to MT6572 platform #define LM3632_DEV_NAME "charge-pump" #define CPD_TAG "[chargepump] " -#define CPD_FUN(f) printk(CPD_TAG"%s\n", __FUNCTION__) -#define CPD_ERR(fmt, args...) printk(CPD_TAG"%s %d : "fmt, __FUNCTION__, __LINE__, ##args) +#define CPD_FUN(f) printk(CPD_TAG"%s\n", __func__) +#define CPD_ERR(fmt, args...) printk(CPD_TAG"%s %d : "fmt, __func__, __LINE__, ##args) #define CPD_LOG(fmt, args...) printk(CPD_TAG fmt, ##args) // I2C variable diff --git a/drivers/misc/mediatek/chargepump/lm3639/lm3639_driver.c b/drivers/misc/mediatek/chargepump/lm3639/lm3639_driver.c index fbcefd05d..9f3e24822 100644 --- a/drivers/misc/mediatek/chargepump/lm3639/lm3639_driver.c +++ b/drivers/misc/mediatek/chargepump/lm3639/lm3639_driver.c @@ -60,8 +60,8 @@ #define LM3639_DEV_NAME "charge-pump" #define CPD_TAG "[ChargePump] " -#define CPD_FUN(f) printk(CPD_TAG"%s\n", __FUNCTION__) -#define CPD_ERR(fmt, args...) printk(CPD_TAG"%s %d : "fmt, __FUNCTION__, __LINE__, ##args) +#define CPD_FUN(f) printk(CPD_TAG"%s\n", __func__) +#define CPD_ERR(fmt, args...) printk(CPD_TAG"%s %d : "fmt, __func__, __LINE__, ##args) #define CPD_LOG(fmt, args...) printk(CPD_TAG fmt, ##args) // I2C variable diff --git a/drivers/misc/mediatek/chargepump/rt8542/rt8542_driver.c b/drivers/misc/mediatek/chargepump/rt8542/rt8542_driver.c index 7809b8e8f..9912890a4 100644 --- a/drivers/misc/mediatek/chargepump/rt8542/rt8542_driver.c +++ b/drivers/misc/mediatek/chargepump/rt8542/rt8542_driver.c @@ -60,8 +60,8 @@ #define RT8542_DEV_NAME "charge-pump" #define CPD_TAG "[ChargePump] " -#define CPD_FUN(f) printk(CPD_TAG"%s\n", __FUNCTION__) -#define CPD_ERR(fmt, args...) printk(CPD_TAG"%s %d : "fmt, __FUNCTION__, __LINE__, ##args) +#define CPD_FUN(f) printk(CPD_TAG"%s\n", __func__) +#define CPD_ERR(fmt, args...) printk(CPD_TAG"%s %d : "fmt, __func__, __LINE__, ##args) #define CPD_LOG(fmt, args...) printk(CPD_TAG fmt, ##args) // I2C variable diff --git a/drivers/misc/mediatek/cmdq/cmdq_test.c b/drivers/misc/mediatek/cmdq/cmdq_test.c index fc1309008..ddd2dde2f 100644 --- a/drivers/misc/mediatek/cmdq/cmdq_test.c +++ b/drivers/misc/mediatek/cmdq/cmdq_test.c @@ -663,7 +663,7 @@ DECLARE_WORK(leave_loop, leave_loop_func); int32_t my_irq_callback(unsigned long data) { - CMDQ_MSG("%s data=%d\n", __FUNCTION__, data); + CMDQ_MSG("%s data=%d\n", __func__, data); ++gLoopCount; diff --git a/drivers/misc/mediatek/connectivity/common/combo/linux/stp_uart.c b/drivers/misc/mediatek/connectivity/common/combo/linux/stp_uart.c index 2aad21f45..d60602d6a 100644 --- a/drivers/misc/mediatek/connectivity/common/combo/linux/stp_uart.c +++ b/drivers/misc/mediatek/connectivity/common/combo/linux/stp_uart.c @@ -241,7 +241,7 @@ static void stp_uart_tty_close(struct tty_struct *tty) */ static void stp_uart_tty_wakeup(struct tty_struct *tty) { - /* pr_debug("%s: start !!\n", __FUNCTION__); */ + /* pr_debug("%s: start !!\n", __func__); */ /* clear_bit(TTY_DO_WRITE_WAKEUP, &tty->flags); */ diff --git a/drivers/misc/mediatek/connectivity/wlan/gen2/include/debug.h b/drivers/misc/mediatek/connectivity/wlan/gen2/include/debug.h index 301b57466..a7700cfad 100644 --- a/drivers/misc/mediatek/connectivity/wlan/gen2/include/debug.h +++ b/drivers/misc/mediatek/connectivity/wlan/gen2/include/debug.h @@ -276,7 +276,7 @@ typedef enum _ENUM_DBG_MODULE_T { extern PINT_16 g_wbuf_p; extern PINT_8 g_buf_p; - /* If __FUNCTION__ is already defined by compiler, we just use it. */ + /* If __func__ is already defined by compiler, we just use it. */ #if defined(__func__) #define DEBUGFUNC(_Func) #else diff --git a/drivers/misc/mediatek/connectivity/wlan/gen2/mgmt/stats.c b/drivers/misc/mediatek/connectivity/wlan/gen2/mgmt/stats.c index afa49be4d..f6ad1c292 100644 --- a/drivers/misc/mediatek/connectivity/wlan/gen2/mgmt/stats.c +++ b/drivers/misc/mediatek/connectivity/wlan/gen2/mgmt/stats.c @@ -803,7 +803,7 @@ VOID statsEventHandle(GLUE_INFO_T *prGlueInfo, UINT8 *prInBuf, UINT32 u4InBufLen /* sanity check */ /* DBGLOG(RX, INFO, */ -/* ("<stats> %s: Rcv a event\n", __FUNCTION__)); */ +/* ("<stats> %s: Rcv a event\n", __func__)); */ if ((prGlueInfo == NULL) || (prInBuf == NULL)) return; /* shall not be here */ @@ -813,7 +813,7 @@ VOID statsEventHandle(GLUE_INFO_T *prGlueInfo, UINT8 *prInBuf, UINT32 u4InBufLen u4InBufLen -= 4; /* DBGLOG(RX, INFO, */ -/* ("<stats> %s: Rcv a event: %d\n", __FUNCTION__, u4EventId)); */ +/* ("<stats> %s: Rcv a event: %d\n", __func__, u4EventId)); */ switch (u4EventId) { case STATS_HOST_EVENT_ENV_REPORT: diff --git a/drivers/misc/mediatek/connectivity/wlan/gen2/os/linux/gl_wext.c b/drivers/misc/mediatek/connectivity/wlan/gen2/os/linux/gl_wext.c index 8648b82ed..9d9b335f5 100644 --- a/drivers/misc/mediatek/connectivity/wlan/gen2/os/linux/gl_wext.c +++ b/drivers/misc/mediatek/connectivity/wlan/gen2/os/linux/gl_wext.c @@ -1214,7 +1214,7 @@ wext_set_mode(IN struct net_device *prNetDev, return -EOPNOTSUPP; } - /* printk("%s(): Set Mode = %d\n", __FUNCTION__, *pu4Mode); */ + /* printk("%s(): Set Mode = %d\n", __func__, *pu4Mode); */ rStatus = kalIoctl(prGlueInfo, wlanoidSetInfrastructureMode, diff --git a/drivers/misc/mediatek/connectivity/wlan/gen3/common/wlan_oid.c b/drivers/misc/mediatek/connectivity/wlan/gen3/common/wlan_oid.c index 1ed50805f..6c96bc5dc 100644 --- a/drivers/misc/mediatek/connectivity/wlan/gen3/common/wlan_oid.c +++ b/drivers/misc/mediatek/connectivity/wlan/gen3/common/wlan_oid.c @@ -8107,7 +8107,7 @@ wlanoidSetNetworkAddress(IN P_ADAPTER_T prAdapter, prCmdNetworkAddressList->ucAddressCount = (UINT_8) u4IPv4AddrCount; prNetworkAddress = prNetworkAddressList->arAddress; - /* DBGLOG(INIT, INFO, ("%s: u4IPv4AddrCount (%lu)\n", __FUNCTION__, u4IPv4AddrCount)); */ + /* DBGLOG(INIT, INFO, ("%s: u4IPv4AddrCount (%lu)\n", __func__, u4IPv4AddrCount)); */ for (i = 0, u4IPv4AddrIdx = 0; i < prNetworkAddressList->u4AddressCount; i++) { if (prNetworkAddress->u2AddressType == PARAM_PROTOCOL_ID_TCP_IP && diff --git a/drivers/misc/mediatek/connectivity/wlan/gen3/include/debug.h b/drivers/misc/mediatek/connectivity/wlan/gen3/include/debug.h index e2d6a993a..b18951aa8 100644 --- a/drivers/misc/mediatek/connectivity/wlan/gen3/include/debug.h +++ b/drivers/misc/mediatek/connectivity/wlan/gen3/include/debug.h @@ -3631,13 +3631,13 @@ typedef enum _ENUM_DBG_MODULE_T { /* #define LOG_FUNC(_Fmt...) kalDbgLog(DBG_CLASS_INFO, (_Fmt)); */ #define LOG_FUNC kalPrintTag -/* If __FUNCTION__ is already defined by compiler, we just use it. */ +/* If __func__ is already defined by compiler, we just use it. */ #define DEBUGFUNC(_Func) /* Disabled due to AOSP -#if defined(__FUNCTION__) +#if defined(__func__) #define DEBUGFUNC(_Func) #else - #define DEBUGFUNC(_Func) static const char __FUNCTION__[] = _Func; + #define DEBUGFUNC(_Func) static const char __func__[] = _Func; #endif */ diff --git a/drivers/misc/mediatek/connectivity/wlan/gen3/lint/options.lnt b/drivers/misc/mediatek/connectivity/wlan/gen3/lint/options.lnt index dcf0f439a..e76a0a06e 100644 --- a/drivers/misc/mediatek/connectivity/wlan/gen3/lint/options.lnt +++ b/drivers/misc/mediatek/connectivity/wlan/gen3/lint/options.lnt @@ -34,7 +34,7 @@ -d__arm // Define __arm --d__FUNCTION__="function" // Non-standard preprocessor macro +-d__func__="function" // Non-standard preprocessor macro //=========================================================================== // General message inhibitions diff --git a/drivers/misc/mediatek/dispsys/mt6735/ddp_wdma.c b/drivers/misc/mediatek/dispsys/mt6735/ddp_wdma.c index ec009aa95..db67f5fc8 100755 --- a/drivers/misc/mediatek/dispsys/mt6735/ddp_wdma.c +++ b/drivers/misc/mediatek/dispsys/mt6735/ddp_wdma.c @@ -528,7 +528,7 @@ static int wdma_config_l(DISP_MODULE_ENUM module, disp_ddp_path_config* pConfig, int ret; ret = cmdqRecCreate(CMDQ_SCENARIO_DISP_PRIMARY_DISABLE_SECURE_PATH, &(nonsec_switch_handle)); if(ret) - DDPAEE("[SVP]fail to create disable handle %s ret=%d\n", __FUNCTION__, ret); + DDPAEE("[SVP]fail to create disable handle %s ret=%d\n", __func__, ret); cmdqRecReset(nonsec_switch_handle); _cmdq_insert_wait_frame_done_token_mira(nonsec_switch_handle); diff --git a/drivers/misc/mediatek/dispsys/mt6735/mt6735/ddp_ovl.c b/drivers/misc/mediatek/dispsys/mt6735/mt6735/ddp_ovl.c index a1703b29a..bba874b7d 100644 --- a/drivers/misc/mediatek/dispsys/mt6735/mt6735/ddp_ovl.c +++ b/drivers/misc/mediatek/dispsys/mt6735/mt6735/ddp_ovl.c @@ -1069,7 +1069,7 @@ static int ovl_config_l(DISP_MODULE_ENUM module, // ret = cmdqRecCreate(CMDQ_SCENARIO_DISP_PRIMARY_DISABLE_SECURE_PATH, &(nonsec_switch_handle)); if(ret) - DDPAEE("[SVP]fail to create disable handle %s ret=%d\n", __FUNCTION__, ret); + DDPAEE("[SVP]fail to create disable handle %s ret=%d\n", __func__, ret); cmdqRecReset(nonsec_switch_handle); _cmdq_insert_wait_frame_done_token_mira(nonsec_switch_handle); diff --git a/drivers/misc/mediatek/dispsys/mt6735/mt6735/ddp_rdma.c b/drivers/misc/mediatek/dispsys/mt6735/mt6735/ddp_rdma.c index 474479f4b..424b9a9a9 100644 --- a/drivers/misc/mediatek/dispsys/mt6735/mt6735/ddp_rdma.c +++ b/drivers/misc/mediatek/dispsys/mt6735/mt6735/ddp_rdma.c @@ -679,7 +679,7 @@ static int do_rdma_config_l(DISP_MODULE_ENUM module, disp_ddp_path_config* pConf if(mode == RDMA_MODE_DIRECT_LINK && r_config->security != DISP_NORMAL_BUFFER) { - DDPERR("%s: rdma directlink BUT is sec ??!!\n", __FUNCTION__); + DDPERR("%s: rdma directlink BUT is sec ??!!\n", __func__); } rdma_config(module, @@ -728,7 +728,7 @@ static int setup_rdma_sec(DISP_MODULE_ENUM module, disp_ddp_path_config* pConfig int ret; ret = cmdqRecCreate(CMDQ_SCENARIO_DISP_PRIMARY_DISABLE_SECURE_PATH, &(nonsec_switch_handle)); if(ret) - DDPAEE("[SVP]fail to create disable handle %s ret=%d\n", __FUNCTION__, ret); + DDPAEE("[SVP]fail to create disable handle %s ret=%d\n", __func__, ret); cmdqRecReset(nonsec_switch_handle); _cmdq_insert_wait_frame_done_token_mira(nonsec_switch_handle); diff --git a/drivers/misc/mediatek/dispsys/mt6735/mt6735m/ddp_ovl.c b/drivers/misc/mediatek/dispsys/mt6735/mt6735m/ddp_ovl.c index 1fce5a302..ec75373ea 100644 --- a/drivers/misc/mediatek/dispsys/mt6735/mt6735m/ddp_ovl.c +++ b/drivers/misc/mediatek/dispsys/mt6735/mt6735m/ddp_ovl.c @@ -1051,7 +1051,7 @@ static int ovl_config_l(DISP_MODULE_ENUM module, // ret = cmdqRecCreate(CMDQ_SCENARIO_DISP_PRIMARY_DISABLE_SECURE_PATH, &(nonsec_switch_handle)); if(ret) - DDPAEE("[SVP]fail to create disable handle %s ret=%d\n", __FUNCTION__, ret); + DDPAEE("[SVP]fail to create disable handle %s ret=%d\n", __func__, ret); cmdqRecReset(nonsec_switch_handle); _cmdq_insert_wait_frame_done_token_mira(nonsec_switch_handle); diff --git a/drivers/misc/mediatek/dispsys/mt6735/mt6735m/ddp_rdma.c b/drivers/misc/mediatek/dispsys/mt6735/mt6735m/ddp_rdma.c index c176f97f2..d1408f4db 100644 --- a/drivers/misc/mediatek/dispsys/mt6735/mt6735m/ddp_rdma.c +++ b/drivers/misc/mediatek/dispsys/mt6735/mt6735m/ddp_rdma.c @@ -667,7 +667,7 @@ static int do_rdma_config_l(DISP_MODULE_ENUM module, disp_ddp_path_config* pConf if(mode == RDMA_MODE_DIRECT_LINK && r_config->security != DISP_NORMAL_BUFFER) { - DDPERR("%s: rdma directlink BUT is sec ??!!\n", __FUNCTION__); + DDPERR("%s: rdma directlink BUT is sec ??!!\n", __func__); } rdma_config(module, @@ -716,7 +716,7 @@ static int setup_rdma_sec(DISP_MODULE_ENUM module, disp_ddp_path_config* pConfig int ret; ret = cmdqRecCreate(CMDQ_SCENARIO_DISP_PRIMARY_DISABLE_SECURE_PATH, &(nonsec_switch_handle)); if(ret) - DDPAEE("[SVP]fail to create disable handle %s ret=%d\n", __FUNCTION__, ret); + DDPAEE("[SVP]fail to create disable handle %s ret=%d\n", __func__, ret); cmdqRecReset(nonsec_switch_handle); _cmdq_insert_wait_frame_done_token_mira(nonsec_switch_handle); diff --git a/drivers/misc/mediatek/dispsys/mt6735/mt6753/ddp_ovl.c b/drivers/misc/mediatek/dispsys/mt6735/mt6753/ddp_ovl.c index 9279fb944..4e2a03db6 100644 --- a/drivers/misc/mediatek/dispsys/mt6735/mt6753/ddp_ovl.c +++ b/drivers/misc/mediatek/dispsys/mt6735/mt6753/ddp_ovl.c @@ -1064,7 +1064,7 @@ static int ovl_config_l(DISP_MODULE_ENUM module, // ret = cmdqRecCreate(CMDQ_SCENARIO_DISP_PRIMARY_DISABLE_SECURE_PATH, &(nonsec_switch_handle)); if(ret) - DDPAEE("[SVP]fail to create disable handle %s ret=%d\n", __FUNCTION__, ret); + DDPAEE("[SVP]fail to create disable handle %s ret=%d\n", __func__, ret); cmdqRecReset(nonsec_switch_handle); _cmdq_insert_wait_frame_done_token_mira(nonsec_switch_handle); diff --git a/drivers/misc/mediatek/dispsys/mt6735/mt6753/ddp_rdma.c b/drivers/misc/mediatek/dispsys/mt6735/mt6753/ddp_rdma.c index 8bde468c0..2b3a7306a 100644 --- a/drivers/misc/mediatek/dispsys/mt6735/mt6753/ddp_rdma.c +++ b/drivers/misc/mediatek/dispsys/mt6735/mt6753/ddp_rdma.c @@ -755,7 +755,7 @@ static int do_rdma_config_l(DISP_MODULE_ENUM module, disp_ddp_path_config* pConf if(mode == RDMA_MODE_DIRECT_LINK && r_config->security != DISP_NORMAL_BUFFER) { - DDPERR("%s: rdma directlink BUT is sec ??!!\n", __FUNCTION__); + DDPERR("%s: rdma directlink BUT is sec ??!!\n", __func__); } rdma_config(module, @@ -805,7 +805,7 @@ static int setup_rdma_sec(DISP_MODULE_ENUM module, disp_ddp_path_config* pConfig int ret; ret = cmdqRecCreate(CMDQ_SCENARIO_DISP_PRIMARY_DISABLE_SECURE_PATH, &(nonsec_switch_handle)); if(ret) - DDPAEE("[SVP]fail to create disable handle %s ret=%d\n", __FUNCTION__, ret); + DDPAEE("[SVP]fail to create disable handle %s ret=%d\n", __func__, ret); cmdqRecReset(nonsec_switch_handle); _cmdq_insert_wait_frame_done_token_mira(nonsec_switch_handle); diff --git a/drivers/misc/mediatek/dual_ccci/ccci_chrdev.c b/drivers/misc/mediatek/dual_ccci/ccci_chrdev.c index fc8afa68d..b04383ec5 100644 --- a/drivers/misc/mediatek/dual_ccci/ccci_chrdev.c +++ b/drivers/misc/mediatek/dual_ccci/ccci_chrdev.c @@ -89,7 +89,7 @@ int scan_image_list(int md_id, char fmt[], int out_img_list[], int img_list_size unsigned int __weak get_sim_switch_type(void) { - CCCI_MSG("%s is not implement!!! line:%d\n", __FUNCTION__, __LINE__);; + CCCI_MSG("%s is not implement!!! line:%d\n", __func__, __LINE__);; return 0; } @@ -819,14 +819,14 @@ static int ccci_vir_chr_open(struct inode *inode, struct file *file) ret = get_md_id_by_dev_major(major); if(ret < 0) { - CCCI_MSG("%s: get md id fail: %d\n", __FUNCTION__, ret); + CCCI_MSG("%s: get md id fail: %d\n", __func__, ret); goto out; } md_id = ret; ret = get_dev_id_by_md_id(md_id, "vir chr", NULL, &minor_start); if(ret < 0) { - CCCI_MSG_INF(md_id, "chr", "%s: get dev minor id fail: %d\n", __FUNCTION__, ret); + CCCI_MSG_INF(md_id, "chr", "%s: get dev minor id fail: %d\n", __func__, ret); goto out; } index = minor - minor_start; @@ -834,13 +834,13 @@ static int ccci_vir_chr_open(struct inode *inode, struct file *file) client = find_get_vir_client(md_id, index, current->pid); CCCI_CHR_MSG(md_id, "Vchar(ch%d) open by %s\n", index, current->comm); if (IS_ERR(client)) { - CCCI_MSG_INF(md_id, "chr", "%s: find client fail \n", __FUNCTION__); + CCCI_MSG_INF(md_id, "chr", "%s: find client fail \n", __func__); ret = PTR_ERR(client); goto out; } if(atomic_read(&client->user)>1) { - CCCI_MSG_INF(md_id, "chr", "%s: [Error]multi-open, not support it\n", __FUNCTION__); + CCCI_MSG_INF(md_id, "chr", "%s: [Error]multi-open, not support it\n", __func__); return -EPERM; } @@ -907,7 +907,7 @@ retry: if (ret == sizeof(buff)) { if (copy_to_user(u_buff, &buff,sizeof(buff))) { CCCI_MSG_INF(md_id, "chr", "%s: copy_to_user fail: %08X, %08X, %02d, %08X\n", - __FUNCTION__, buff.data0, buff.data1, buff.channel, buff.reserved); + __func__, buff.data0, buff.data1, buff.channel, buff.reserved); ret= -EFAULT; } } else { @@ -1349,7 +1349,7 @@ void ccci_vir_chrdev_exit(int md_id) int __weak ccci_set_md_sbp(int md_id, unsigned int md_sbp) { - CCCI_ERR("calling weak function %s(%d,%d)\n", __FUNCTION__, md_id, md_sbp); + CCCI_ERR("calling weak function %s(%d,%d)\n", __func__, md_id, md_sbp); return -1; } diff --git a/drivers/misc/mediatek/dual_ccci/ccci_hw.c b/drivers/misc/mediatek/dual_ccci/ccci_hw.c index c03d61531..cb7feb05b 100644 --- a/drivers/misc/mediatek/dual_ccci/ccci_hw.c +++ b/drivers/misc/mediatek/dual_ccci/ccci_hw.c @@ -484,7 +484,7 @@ ccif_t* ccif_create_instance(ccif_hw_info_t *info, void* ctl_b, int md_id) case CCIF_VIR: default: - CCCI_MSG_INF(md_id, "cci", "%s: [error]invalid ccif type(%d)\n", __FUNCTION__, info->type); + CCCI_MSG_INF(md_id, "cci", "%s: [error]invalid ccif type(%d)\n", __func__, info->type); kfree(ccif); return NULL; } diff --git a/drivers/misc/mediatek/dual_ccci/ccci_ipc.c b/drivers/misc/mediatek/dual_ccci/ccci_ipc.c index 0286f17bc..87ea1ab1d 100644 --- a/drivers/misc/mediatek/dual_ccci/ccci_ipc.c +++ b/drivers/misc/mediatek/dual_ccci/ccci_ipc.c @@ -153,7 +153,7 @@ void find_task_to_clear(IPC_TASK task_table[], unsigned int to_id) { if (task_table[i].to_id==to_id) { - CCCI_DBG_MSG(ctl_b->m_md_id, "ipc", "%s: task->to_id(%d:%d)\n", __FUNCTION__, i, task_table[i].to_id); + CCCI_DBG_MSG(ctl_b->m_md_id, "ipc", "%s: task->to_id(%d:%d)\n", __func__, i, task_table[i].to_id); if (task==NULL) { @@ -164,7 +164,7 @@ void find_task_to_clear(IPC_TASK task_table[], unsigned int to_id) if (time_after(task->jiffies,task_table[i].jiffies)) { task=task_table+i; - CCCI_DBG_MSG(ctl_b->m_md_id, "ipc", "%s: select task->to_id(%d:%d)\n", __FUNCTION__, i, task_table[i].to_id); + CCCI_DBG_MSG(ctl_b->m_md_id, "ipc", "%s: select task->to_id(%d:%d)\n", __func__, i, task_table[i].to_id); } else if (task->jiffies==task_table[i].jiffies) { CCCI_DBG_MSG(ctl_b->m_md_id, "ipc", "[Error]Wrong time stamp(%ld, %ld), select task->to_id(%d:%d)\n", task->jiffies, task_table[i].jiffies, tmp, task->to_id); @@ -554,7 +554,7 @@ static int ccci_ipc_open(struct inode *inode, struct file *file) CCCI_MSG_INF(md_id, "ipc", "[Error]Wrong minor num %d.\n",index); return -EINVAL; } - CCCI_DBG_MSG(md_id, "ipc", "%s: register task%d\n", __FUNCTION__, index); + CCCI_DBG_MSG(md_id, "ipc", "%s: register task%d\n", __func__, index); nonseekable_open(inode,file); file->private_data = ctl_b->ipc_task+index; atomic_inc(&((ctl_b->ipc_task+index)->user)); @@ -642,7 +642,7 @@ static ssize_t ccci_ipc_write(struct file *file, const char __user *buf, size_t if (count < sizeof(ipc_ilm_t)) { - CCCI_MSG_INF(md_id, "ipc", "%s: [Error]Write len(%d) < ipc_ilm_t\n", __FUNCTION__, count); + CCCI_MSG_INF(md_id, "ipc", "%s: [Error]Write len(%d) < ipc_ilm_t\n", __func__, count); ret = -EINVAL; goto out; } @@ -650,19 +650,19 @@ static ssize_t ccci_ipc_write(struct file *file, const char __user *buf, size_t ilm = kmalloc(count, GFP_KERNEL); if (ilm == NULL) { - CCCI_MSG_INF(md_id, "ipc", "%s: kmalloc fail!\n", __FUNCTION__); + CCCI_MSG_INF(md_id, "ipc", "%s: kmalloc fail!\n", __func__); ret = -ENOMEM; goto out; } if (copy_from_user(ilm, buf, count)) { - CCCI_MSG_INF(md_id, "ipc", "%s: copy_from_user fail!\n", __FUNCTION__); + CCCI_MSG_INF(md_id, "ipc", "%s: copy_from_user fail!\n", __func__); ret = -EFAULT; goto out_free; } if ((id_map = local_MD_id_2_unify_id(ilm->dest_mod_id)) == NULL) { - CCCI_MSG_INF(md_id, "ipc", "%s: [Error]Invalid Dest MD id (%d)\n", __FUNCTION__, ilm->dest_mod_id); + CCCI_MSG_INF(md_id, "ipc", "%s: [Error]Invalid Dest MD id (%d)\n", __func__, ilm->dest_mod_id); ret = -EINVAL; goto out_free; } @@ -695,7 +695,7 @@ static ssize_t ccci_ipc_write(struct file *file, const char __user *buf, size_t task->to_id = ilm->dest_mod_id; task->ilm_p->src_mod_id = task - ctl_b->ipc_task; - CCCI_DBG_MSG(md_id, "ipc", "%s: src=%d, dst=%d, data_len=%d\n", __FUNCTION__, + CCCI_DBG_MSG(md_id, "ipc", "%s: src=%d, dst=%d, data_len=%d\n", __func__, task->ilm_p->src_mod_id, task->to_id, count); if (count > sizeof(ipc_ilm_t)) @@ -713,7 +713,7 @@ static ssize_t ccci_ipc_write(struct file *file, const char __user *buf, size_t ret = ccci_ipc_write_stream(md_id, CCCI_IPC_TX, task->ilm_phy_addr, sizeof(ipc_ilm_t), id_map->extq_id); if (ret != sizeof(ccci_msg_t)) { - CCCI_MSG_INF(md_id, "ipc", "%s: ccci_ipc_write_stream fail: %d\n", __FUNCTION__, ret); + CCCI_MSG_INF(md_id, "ipc", "%s: ccci_ipc_write_stream fail: %d\n", __func__, ret); clear_bit(CCCI_TASK_PENDING, &task->flag); ret = -EAGAIN; goto out_free; @@ -788,7 +788,7 @@ static int ccci_ipc_release(struct inode *inode, struct file *file) spin_unlock_irqrestore(&task->lock, flags); } clear_bit(CCCI_TASK_PENDING, &task->flag); - CCCI_DBG_MSG(0, "ipc", "%s\n", __FUNCTION__); + CCCI_DBG_MSG(0, "ipc", "%s\n", __func__); return 0; } diff --git a/drivers/misc/mediatek/dual_ccci/ccci_logical.c b/drivers/misc/mediatek/dual_ccci/ccci_logical.c index 6e5bcd921..4690b43b5 100644 --- a/drivers/misc/mediatek/dual_ccci/ccci_logical.c +++ b/drivers/misc/mediatek/dual_ccci/ccci_logical.c @@ -192,7 +192,7 @@ int register_to_logic_ch(int md_id, int ch, void (*func)(void*), void *owner) ch_info->m_owner = owner; } else { CCCI_MSG_INF(md_id, "cci", "%s fail: %s(ch%d) cb func has registered\n", \ - __FUNCTION__, ch_info->m_ch_name, ch_info->m_ch_id); + __func__, ch_info->m_ch_name, ch_info->m_ch_id); ret = -CCCI_ERR_LOGIC_CH_HAS_REGISTERED; } spin_unlock_irqrestore(&ch_info->m_lock, flags); @@ -207,7 +207,7 @@ int un_register_to_logic_ch(int md_id, int ch) logic_dispatch_ctl_block_t *ctl_b; if (unlikely(ch >= CCCI_MAX_CH_NUM)){ - CCCI_MSG_INF(md_id, "cci", "%s fail: invalid logic ch%d\n", __FUNCTION__, ch); + CCCI_MSG_INF(md_id, "cci", "%s fail: invalid logic ch%d\n", __func__, ch); return -CCCI_ERR_INVALID_LOGIC_CHANNEL_ID; } @@ -228,20 +228,20 @@ int un_register_to_logic_ch(int md_id, int ch) int get_logic_ch_data(logic_channel_info_t *ch_info, ccci_msg_t *msg) { if (unlikely(ch_info == NULL)){ - CCCI_MSG("%s fail: get invalid ch info\n", __FUNCTION__); + CCCI_MSG("%s fail: get invalid ch info\n", __func__); return -CCCI_ERR_GET_NULL_POINTER; } if (unlikely(ch_info->m_attrs&L_CH_ATTR_TX)){ CCCI_MSG_INF(ch_info->m_md_id, "cci", "%s fail: %s(ch%d) is tx \n", \ - __FUNCTION__, ch_info->m_ch_name, msg->channel); + __func__, ch_info->m_ch_name, msg->channel); return -CCCI_ERR_GET_RX_DATA_FROM_TX_CHANNEL; } // check whether fifo is ready if (unlikely(!ch_info->m_kfifo_ready)){ CCCI_MSG_INF(ch_info->m_md_id, "cci", "%s fail: %s(ch%d) kfifo not ready\n", \ - __FUNCTION__, ch_info->m_ch_name, msg->channel); + __func__, ch_info->m_ch_name, msg->channel); return -CCCI_ERR_KFIFO_IS_NOT_READY; } @@ -259,20 +259,20 @@ int get_logic_ch_data(logic_channel_info_t *ch_info, ccci_msg_t *msg) int get_logic_ch_data_len(logic_channel_info_t *ch_info) { if (unlikely(ch_info == NULL)){ - CCCI_MSG("%s get invalid ch info\n", __FUNCTION__); + CCCI_MSG("%s get invalid ch info\n", __func__); return 0; } if (unlikely(ch_info->m_attrs&L_CH_ATTR_TX)){ CCCI_MSG_INF(ch_info->m_md_id, "cci", "%s fail: %s(ch%d) is tx \n", \ - __FUNCTION__, ch_info->m_ch_name, ch_info->m_ch_id); + __func__, ch_info->m_ch_name, ch_info->m_ch_id); return 0; } // check whether fifo is ready if (unlikely(!ch_info->m_kfifo_ready)){ CCCI_MSG_INF(ch_info->m_md_id, "cci", "%s fail: %s(ch%d) kfifo not ready\n", \ - __FUNCTION__, ch_info->m_ch_name, ch_info->m_ch_id); + __func__, ch_info->m_ch_name, ch_info->m_ch_id); return 0; } @@ -287,7 +287,7 @@ logic_channel_info_t* get_logic_ch_info(int md_id, int ch_id) logic_dispatch_ctl_block_t *ctl_block; if (unlikely(ch_id >= CCCI_MAX_CH_NUM)){ - CCCI_MSG_INF(md_id, "cci", "%s fail: invalid logic ch%d\n", __FUNCTION__, ch_id); + CCCI_MSG_INF(md_id, "cci", "%s fail: invalid logic ch%d\n", __func__, ch_id); return NULL; } @@ -307,14 +307,14 @@ static int __logic_dispatch_push(ccif_msg_t *msg, void *ctl_b) if (unlikely(msg->channel >= CCCI_MAX_CH_NUM)){ CCCI_MSG_INF(md_id, "cci", "%s get invalid logic ch id:%d\n", \ - __FUNCTION__, msg->channel); + __func__, msg->channel); ret = -CCCI_ERR_INVALID_LOGIC_CHANNEL_ID; goto _out; } ch_info = &(ctl_block->m_logic_ch_table[msg->channel]); if (unlikely(ch_info->m_attrs&L_CH_ATTR_TX)){ - CCCI_MSG_INF(md_id, "cci", "%s CH:%d %s is tx channel\n", __FUNCTION__, \ + CCCI_MSG_INF(md_id, "cci", "%s CH:%d %s is tx channel\n", __func__, \ msg->channel, ch_info->m_ch_name); ret = -CCCI_ERR_PUSH_RX_DATA_TO_TX_CHANNEL; goto _out; @@ -323,7 +323,7 @@ static int __logic_dispatch_push(ccif_msg_t *msg, void *ctl_b) // check whether fifo is ready if (!ch_info->m_kfifo_ready){ CCCI_MSG_INF(md_id, "cci", "%s CH:%d %s's kfifo is not ready\n", \ - __FUNCTION__, msg->channel, ch_info->m_ch_name); + __func__, msg->channel, ch_info->m_ch_name); ret = -CCCI_ERR_KFIFO_IS_NOT_READY; goto _out; } @@ -432,7 +432,7 @@ int logic_layer_reset(int md_id) while ((CCIF_TOP_HALF_RUNNING&ccif->m_status)||ctl_b->m_running||ctl_b->m_has_pending_data){ yield(); if ((jiffies-ref_jiffies)>2*HZ){ - CCCI_MSG_INF(ctl_b->m_md_id, "cci", "%s wait isr/tasklet more than 2 seconds\n", __FUNCTION__); + CCCI_MSG_INF(ctl_b->m_md_id, "cci", "%s wait isr/tasklet more than 2 seconds\n", __func__); break; } } @@ -496,7 +496,7 @@ int ccci_message_send(int md_id, ccci_msg_t *msg, int retry_en) ccif = ctl_b->m_ccif; if(unlikely(ctl_b->m_freezed)){ - CCCI_MSG_INF(md_id, "cci", "%s fail: ccci is freezed\n", __FUNCTION__); + CCCI_MSG_INF(md_id, "cci", "%s fail: ccci is freezed\n", __func__); ret = -CCCI_ERR_MD_NOT_READY; goto out; } @@ -507,7 +507,7 @@ int ccci_message_send(int md_id, ccci_msg_t *msg, int retry_en) goto out; } else { CCCI_MSG_INF(md_id, "cci", "%s fail: invalid logic ch(%d)\n", \ - __FUNCTION__, msg->channel); + __func__, msg->channel); ret = -CCCI_ERR_INVALID_LOGIC_CHANNEL_ID; goto out; } @@ -675,21 +675,21 @@ int ccci_logic_ctlb_init(int md_id) // Channel number check if((sizeof(logic_ch_static_info_tab)/sizeof(logic_channel_static_info_t)) != CCCI_MAX_CH_NUM) { - CCCI_MSG_INF(md_id, "cci", "%s: channel max number mis-match fail\n", __FUNCTION__); + CCCI_MSG_INF(md_id, "cci", "%s: channel max number mis-match fail\n", __func__); return -CCCI_ERR_CHANNEL_NUM_MIS_MATCH; } // Allocate ctl block memory ctl_b = (logic_dispatch_ctl_block_t*)kzalloc(sizeof(logic_dispatch_ctl_block_t), GFP_KERNEL); if(ctl_b == NULL) { - CCCI_MSG_INF(md_id, "cci", "%s: alloc memory fail for logic_dispatch_ctlb\n", __FUNCTION__); + CCCI_MSG_INF(md_id, "cci", "%s: alloc memory fail for logic_dispatch_ctlb\n", __func__); return -CCCI_ERR_ALLOCATE_MEMORY_FAIL; } logic_dispatch_ctlb[md_id] = ctl_b; // Get CCIF HW info if(get_ccif_hw_info(md_id, &ccif_hw_inf) < 0) { - CCCI_MSG_INF(md_id, "cci", "%s: get ccif%d hw info fail\n", __FUNCTION__, md_id+1); + CCCI_MSG_INF(md_id, "cci", "%s: get ccif%d hw info fail\n", __func__, md_id+1); ret = -CCCI_ERR_CCIF_GET_HW_INFO_FAIL; goto _ccif_instance_create_fail; } @@ -697,7 +697,7 @@ int ccci_logic_ctlb_init(int md_id) // Create ccif instance ccif = ccif_create_instance(&ccif_hw_inf, ctl_b, md_id); if(ccif == NULL) { - CCCI_MSG_INF(md_id, "cci", "%s: create ccif instance fail\n", __FUNCTION__); + CCCI_MSG_INF(md_id, "cci", "%s: create ccif instance fail\n", __func__); ret = -CCCI_ERR_CREATE_CCIF_INSTANCE_FAIL; goto _ccif_instance_create_fail; } @@ -722,7 +722,7 @@ int ccci_logic_ctlb_init(int md_id) ch_info = &ctl_b->m_logic_ch_table[ch_id]; if (ch_info->m_ch_id != CCCI_INVALID_CH_ID) { - CCCI_MSG_INF(md_id, "cci", "[Error]%s: ch%d has registered\n", __FUNCTION__, ch_id); + CCCI_MSG_INF(md_id, "cci", "[Error]%s: ch%d has registered\n", __func__, ch_id); ret = -CCCI_ERR_REPEAT_CHANNEL_ID; goto _ccif_logic_channel_init_fail; } else { @@ -734,7 +734,7 @@ int ccci_logic_ctlb_init(int md_id) if(logic_ch_static_info_tab[i].m_kfifo_size) { if (0 != kfifo_alloc(&ch_info->m_kfifo, sizeof(ccif_msg_t)*logic_ch_static_info_tab[i].m_kfifo_size, GFP_KERNEL)) { CCCI_MSG_INF(md_id, "cci", "%s: alloc kfifo fail for %s(ch%d) \n", \ - __FUNCTION__, ch_info->m_ch_name, ch_id); + __func__, ch_info->m_ch_name, ch_id); ch_info->m_kfifo_ready = 0; ret = CCCI_ERR_ALLOCATE_MEMORY_FAIL; diff --git a/drivers/misc/mediatek/dual_ccci/ccci_statistics.c b/drivers/misc/mediatek/dual_ccci/ccci_statistics.c index 0180f404c..aed3b26d6 100644 --- a/drivers/misc/mediatek/dual_ccci/ccci_statistics.c +++ b/drivers/misc/mediatek/dual_ccci/ccci_statistics.c @@ -81,7 +81,7 @@ static int s_to_date( long seconds, long usec, int *us, int *sec, int *min, i if(!sec || !min || !hour || !day || !month || !year) { - CCCI_MSG("<ctl>%s invalid param!\n", __FUNCTION__); + CCCI_MSG("<ctl>%s invalid param!\n", __func__); return (-1); } diff --git a/drivers/misc/mediatek/dual_ccci/include/ccci_common.h b/drivers/misc/mediatek/dual_ccci/include/ccci_common.h index e528763b4..50668bfbf 100644 --- a/drivers/misc/mediatek/dual_ccci/include/ccci_common.h +++ b/drivers/misc/mediatek/dual_ccci/include/ccci_common.h @@ -81,7 +81,7 @@ do { \ #define CCCI_RPC_MSG(fmt, args...) CCCI_FILTER_MSG(RPC, "<rpc>"fmt, ##args) #define CCCI_IPC_MSG(fmt, args...) CCCI_FILTER_MSG(IPC, "<ipc>"fmt, ##args) #define CCCI_PMIC_MSG(fmt, args...) CCCI_FILTER_MSG(PMIC, "<pmic>"fmt, ##args) -#define CCCI_FUNC_ENTRY(f) CCCI_FILTER_MSG(FUNC, "%s\n", __FUNCTION__) +#define CCCI_FUNC_ENTRY(f) CCCI_FILTER_MSG(FUNC, "%s\n", __func__) #define CCCI_MISC_MSG(fmt, args...) CCCI_FILTER_MSG(MISC, fmt, ##args) #define CCCI_CHR_MSG(fmt, args...) CCCI_FILTER_MSG(CHR, "<chr>"fmt, ##args) #define CCCI_CCIF_MSG(fmt, args...) CCCI_FILTER_MSG(CCIF, "<chr>"fmt, ##args) @@ -100,7 +100,7 @@ do { \ #define CCCI_RPC_MSG(idx, fmt, args...) CCCI_FILTER_MSG(RPC, "/rpc", idx, fmt, ##args) #define CCCI_IPC_MSG(idx, fmt, args...) CCCI_FILTER_MSG(IPC, "/ipc", idx, fmt, ##args) #define CCCI_PMIC_MSG(idx, fmt, args...) CCCI_FILTER_MSG(PMIC, "/pmc", idx, fmt, ##args) -#define CCCI_FUNC_ENTRY(idx) CCCI_FILTER_MSG(FUNC, "/fun", idx, "%s\n", __FUNCTION__) +#define CCCI_FUNC_ENTRY(idx) CCCI_FILTER_MSG(FUNC, "/fun", idx, "%s\n", __func__) #define CCCI_MISC_MSG(idx, fmt, args...) CCCI_FILTER_MSG(MISC, "/mis", idx, fmt, ##args) #define CCCI_CHR_MSG(idx, fmt, args...) CCCI_FILTER_MSG(CHR, "/chr", idx, fmt, ##args) #define CCCI_CCIF_MSG(idx, fmt, args...) CCCI_FILTER_MSG(CCIF, "/cci", idx, fmt, ##args) diff --git a/drivers/misc/mediatek/eccci/modem_cldma.c b/drivers/misc/mediatek/eccci/modem_cldma.c index 516344838..683bbc311 100644 --- a/drivers/misc/mediatek/eccci/modem_cldma.c +++ b/drivers/misc/mediatek/eccci/modem_cldma.c @@ -960,7 +960,7 @@ static inline void cldma_stop(struct ccci_modem *md) int ret, count; unsigned long flags; int qno; - CCCI_INF_MSG(md->index, TAG, "%s from %ps\n", __FUNCTION__, __builtin_return_address(0)); + CCCI_INF_MSG(md->index, TAG, "%s from %ps\n", __func__, __builtin_return_address(0)); spin_lock_irqsave(&md_ctrl->cldma_timeout_lock, flags); // stop all Tx and Rx queues count = 0; @@ -1030,7 +1030,7 @@ static inline void cldma_stop_for_ee(struct ccci_modem *md) int ret,count; unsigned long flags; - CCCI_INF_MSG(md->index, TAG, "%s from %ps\n", __FUNCTION__, __builtin_return_address(0)); + CCCI_INF_MSG(md->index, TAG, "%s from %ps\n", __func__, __builtin_return_address(0)); spin_lock_irqsave(&md_ctrl->cldma_timeout_lock, flags); // stop all Tx and Rx queues, but non-stop Rx ones count = 0; @@ -1094,7 +1094,7 @@ static inline void cldma_reset(struct ccci_modem *md) struct md_cd_ctrl *md_ctrl = (struct md_cd_ctrl *)md->private_data; volatile unsigned int SO_CFG; - CCCI_INF_MSG(md->index, TAG, "%s from %ps\n", __FUNCTION__, __builtin_return_address(0)); + CCCI_INF_MSG(md->index, TAG, "%s from %ps\n", __func__, __builtin_return_address(0)); cldma_stop(md); // enable OUT DMA cldma_write32(md_ctrl->cldma_ap_ao_base, CLDMA_AP_SO_CFG, cldma_read32(md_ctrl->cldma_ap_ao_base, CLDMA_AP_SO_CFG)|0x01); @@ -1148,7 +1148,7 @@ static inline void cldma_start(struct ccci_modem *md) int i; unsigned long flags; - CCCI_INF_MSG(md->index, TAG, "%s from %ps\n", __FUNCTION__, __builtin_return_address(0)); + CCCI_INF_MSG(md->index, TAG, "%s from %ps\n", __func__, __builtin_return_address(0)); spin_lock_irqsave(&md_ctrl->cldma_timeout_lock, flags); // set start address for(i=0; i<QUEUE_LEN(md_ctrl->txq); i++) { diff --git a/drivers/misc/mediatek/eemcs/eemcs_debug.h b/drivers/misc/mediatek/eemcs/eemcs_debug.h index 049c4c69c..de54f7aeb 100644 --- a/drivers/misc/mediatek/eemcs/eemcs_debug.h +++ b/drivers/misc/mediatek/eemcs/eemcs_debug.h @@ -55,7 +55,7 @@ typedef enum _ENUM_DBG_MODULE_T { extern KAL_UINT64 g_eemcs_dbg_m[DBG_MODULE_NUM]; -#define FUNC_NAME __FUNCTION__ +#define FUNC_NAME __func__ #if defined(EEMCS_DEBUG) @@ -64,11 +64,11 @@ extern KAL_UINT64 g_eemcs_dbg_m[DBG_MODULE_NUM]; if (g_eemcs_dbg_m[DBG_##_mod##_IDX] & DBG_LEVEL_##_level) { \ if (DBG_LEVEL_##_level == DBG_LEVEL_ERR) { \ LOG_FUNC("[EEMCS/"#_mod"] [Error:%d]%s:"_fmt"\n",\ - __LINE__,__FUNCTION__,##a); \ + __LINE__,__func__,##a); \ } \ else if (DBG_LEVEL_##_level == DBG_LEVEL_WAR) { \ LOG_FUNC("[EEMCS/"#_mod"] [Warn:%d]%s:"_fmt"\n",\ - __LINE__,__FUNCTION__,##a); \ + __LINE__,__func__,##a); \ } \ else { \ LOG_FUNC("[EEMCS/"#_mod"] "_fmt"\n",##a); \ @@ -89,12 +89,12 @@ extern KAL_UINT64 g_eemcs_dbg_m[DBG_MODULE_NUM]; #define DEBUG_LOG_FUNCTION_ENTRY \ do{ \ - DBGLOG(FUNC,DBG,"[EEMCS]==> %s",__FUNCTION__); \ + DBGLOG(FUNC,DBG,"[EEMCS]==> %s",__func__); \ }while(0) #define DEBUG_LOG_FUNCTION_LEAVE \ do{ \ - DBGLOG(FUNC,DBG,"[EEMCS]<== %s",__FUNCTION__); \ + DBGLOG(FUNC,DBG,"[EEMCS]<== %s",__func__); \ }while(0) /******************************************************************************* diff --git a/drivers/misc/mediatek/eemcs/eemcs_kal.h b/drivers/misc/mediatek/eemcs/eemcs_kal.h index ce8a41511..8ac9845bc 100644 --- a/drivers/misc/mediatek/eemcs/eemcs_kal.h +++ b/drivers/misc/mediatek/eemcs/eemcs_kal.h @@ -88,7 +88,7 @@ #define KAL_SLEEP_MSEC(_Msec) msleep(_Msec) #define KAL_SLEEP_SEC(_sec) msleep(_sec * 1000) -#define KAL_FUNC_NAME __FUNCTION__ +#define KAL_FUNC_NAME __func__ /* Message verbosity: lower values indicate higher urgency */ #define DBG_OFF 0 diff --git a/drivers/misc/mediatek/eemcs/lte_dev_test.c b/drivers/misc/mediatek/eemcs/lte_dev_test.c index c535c63dd..fdaa40f8c 100644 --- a/drivers/misc/mediatek/eemcs/lte_dev_test.c +++ b/drivers/misc/mediatek/eemcs/lte_dev_test.c @@ -359,7 +359,7 @@ unsigned int str_to_int(char *str) unsigned int idx = 0 , len = 0; len = strlen(str); - //printk(KERN_ERR "[%s] str len = %d \n", __FUNCTION__, len); + //printk(KERN_ERR "[%s] str len = %d \n", __func__, len); for (idx = 0 ; idx < len ; idx ++) { tmp = str[idx] - 0x30; if (idx != 0) { @@ -367,7 +367,7 @@ unsigned int str_to_int(char *str) } ret_int += tmp; } - //printk(KERN_ERR "[%s] value = %d \n", __FUNCTION__, ret_int); + //printk(KERN_ERR "[%s] value = %d \n", __func__, ret_int); return ret_int; } @@ -379,7 +379,7 @@ unsigned int str_to_hex(char *str) unsigned int idx = 0 , len = 0; len = strlen(str); - //printk(KERN_ERR "[%s] str len = %d", __FUNCTION__, len); + //printk(KERN_ERR "[%s] str len = %d", __func__, len); for (idx = 0 ; idx < len ; idx ++) { if( (str[idx] >= 0x30) && (str[idx] <= 0x39)){ @@ -398,7 +398,7 @@ unsigned int str_to_hex(char *str) } ret_int += tmp; } - //printk(KERN_ERR "[%s] value = %d", __FUNCTION__, ret_int); + //printk(KERN_ERR "[%s] value = %d", __func__, ret_int); return ret_int; } @@ -1546,23 +1546,23 @@ static int t_dev_autotest_by_file(int argc, char** argv) { test_cmd[test_item] = strsep(&buf_ptr, "\r"); if('#' == *test_cmd[test_item]){ - printk("[%s] Test Item ignore (or comment): %s\r\n", __FUNCTION__, test_cmd[test_item]); + printk("[%s] Test Item ignore (or comment): %s\r\n", __func__, test_cmd[test_item]); }else{ - printk("[%s] Now perform Test Item %d : %s\r\n", __FUNCTION__, test_item, test_cmd[test_item]); + printk("[%s] Now perform Test Item %d : %s\r\n", __func__, test_item, test_cmd[test_item]); jiffies_to_timespec(jiffies , &start_t); test_ret = call_function(test_cmd[test_item]); if(test_ret){ - printk("[%s][ERR] Auto Regrassion Test fail at item %d !! \r\n", __FUNCTION__, test_item); - printk("[%s][ERR] Failed item : %s \r\n", __FUNCTION__, test_cmd[test_item]); + printk("[%s][ERR] Auto Regrassion Test fail at item %d !! \r\n", __func__, test_item); + printk("[%s][ERR] Failed item : %s \r\n", __func__, test_cmd[test_item]); return ret; }else{ - printk("[%s] Test Sucess at item %d ... \r\n", __FUNCTION__, test_item); + printk("[%s] Test Sucess at item %d ... \r\n", __func__, test_item); } jiffies_to_timespec(jiffies , &end_t); diff_t = time_diff(start_t, end_t); - printk("[%s] This test is use %d seconds... \r\n", __FUNCTION__, diff_t.tv_sec); + printk("[%s] This test is use %d seconds... \r\n", __func__, diff_t.tv_sec); test_item++; } @@ -1581,7 +1581,7 @@ static int t_dev_autotest_by_file(int argc, char** argv) } while (buf_ptr); - printk("[%s] ALL Test Items is PASS, Congratulation!! \r\n", __FUNCTION__); + printk("[%s] ALL Test Items is PASS, Congratulation!! \r\n", __func__); return 0; } @@ -1602,7 +1602,7 @@ static int t_dev_auto_regression(int argc, char** argv) for (idx = 1 ; idx < argc ; idx ++) { /*translate number string to value*/ arg[idx-1] = str_to_int(argv[idx]); - printk(KERN_ERR "[%s] param[%d] = %d\n",__FUNCTION__,idx-1, arg[idx-1]); + printk(KERN_ERR "[%s] param[%d] = %d\n",__func__,idx-1, arg[idx-1]); } @@ -1932,7 +1932,7 @@ static int t_dev_auto_debug(int argc, char** argv) for (idx = 1 ; idx < argc ; idx ++) { /*translate number string to value*/ arg[idx-1] = str_to_int(argv[idx]); - printk(KERN_ERR "[%s] param[%d] = %d\n",__FUNCTION__,idx-1, arg[idx-1]); + printk(KERN_ERR "[%s] param[%d] = %d\n",__func__,idx-1, arg[idx-1]); } for (idx = 0; idx < 10; idx ++) { @@ -2386,7 +2386,7 @@ static int t_dev_rw_reg(int argc, char** argv) if( idx<2 ){ arg[idx-1] = str_to_int(argv[idx]); } else {arg[idx-1] = str_to_hex(argv[idx]);} - printk(KERN_ERR "[%s] param[%d] = %d\n",__FUNCTION__,idx-1, arg[idx-1]); + printk(KERN_ERR "[%s] param[%d] = %d\n",__func__,idx-1, arg[idx-1]); }; if( 0 == strcmp("r", argv[1]) ){ @@ -2970,7 +2970,7 @@ static int t_dev_txrx_basic(int argc , char **argv) for (idx = 1 ; idx < argc ; idx ++) { /*translate number string to value*/ arg[idx-1] = str_to_int(argv[idx]); - printk(KERN_ERR "[%s] param[%d] = %d\n",__FUNCTION__,idx-1, arg[idx-1]); + printk(KERN_ERR "[%s] param[%d] = %d\n",__func__,idx-1, arg[idx-1]); } memset(&dl_cfg , 0 ,sizeof(athif_dl_tgpd_cfg_t)); @@ -2983,7 +2983,7 @@ static int t_dev_txrx_basic(int argc , char **argv) for (idx = 0 ; idx < pkt_num ; idx ++) { ret = sdio_send_pkt(test_que_no, pkt_sz, 0, 0); if (ret != RET_SUCCESS) { - KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] ATCASE_UL_BASIC_SEND fail !\n",__FUNCTION__)); + KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] ATCASE_UL_BASIC_SEND fail !\n",__func__)); /*send packet fail and retry*/ idx --; } @@ -3003,7 +3003,7 @@ static int t_dev_txrx_basic(int argc , char **argv) } ret = sdio_send_pkt(test_que_no, pkt_sz, 0, 0); if (ret != RET_SUCCESS) { - KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] ATCASE_UL_BASIC_SEND fail !\n",__FUNCTION__)); + KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] ATCASE_UL_BASIC_SEND fail !\n",__func__)); /*send packet fail and retry*/ idx --; } @@ -3017,7 +3017,7 @@ static int t_dev_txrx_basic(int argc , char **argv) for (idx = 0 ; idx < pkt_num ; idx ++) { ret = sdio_send_pkt(test_que_no, pkt_sz, 0, 0); if (ret != RET_SUCCESS) { - KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] ATCASE_UL_BASIC_SEND fail !\n",__FUNCTION__)); + KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] ATCASE_UL_BASIC_SEND fail !\n",__func__)); /*send packet fail and retry*/ idx --; } @@ -3889,7 +3889,7 @@ static int t_dev_tx_basic(int argc , char **argv) for (idx = 1 ; idx < argc ; idx ++) { /*translate number string to value*/ arg[idx-1] = str_to_int(argv[idx]); - printk(KERN_ERR "[%s] param[%d] = %d\n",__FUNCTION__,idx-1, arg[idx-1]); + printk(KERN_ERR "[%s] param[%d] = %d\n",__func__,idx-1, arg[idx-1]); } for(test_que_no=0; test_que_no<HIF_MAX_ULQ_NUM; test_que_no++){ @@ -3897,10 +3897,10 @@ static int t_dev_tx_basic(int argc , char **argv) for(pkt_num=40; pkt_num<=40; pkt_num++){ for (idx = 0 ; idx < pkt_num ; idx ++) { KAL_DBGPRINT(KAL, DBG_TRACE, ("[%s] sending in que=%d, pkt_size=%d, pkt_num=%d ...\n", \ - __FUNCTION__, test_que_no, pkt_sz, idx)); + __func__, test_que_no, pkt_sz, idx)); ret = sdio_send_pkt(test_que_no, pkt_sz, 0, 0); if (ret != RET_SUCCESS) { - KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] Tx basic test fail at sent pkt !\n",__FUNCTION__)); + KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] Tx basic test fail at sent pkt !\n",__func__)); /*send packet fail and retry*/ idx --; return ret; @@ -3910,7 +3910,7 @@ static int t_dev_tx_basic(int argc , char **argv) } } //test print - printk(KERN_ERR "[%s] que[%d] test is passed \n",__FUNCTION__,test_que_no); + printk(KERN_ERR "[%s] que[%d] test is passed \n",__func__,test_que_no); } @@ -3947,7 +3947,7 @@ static int t_dev_tx_multique(int argc , char **argv) for (idx = 1 ; idx < argc ; idx ++) { /*translate number string to value*/ arg[idx-1] = str_to_int(argv[idx]); - printk(KERN_ERR "[%s] param[%d] = %d\n",__FUNCTION__,idx-1, arg[idx-1]); + printk(KERN_ERR "[%s] param[%d] = %d\n",__func__,idx-1, arg[idx-1]); } for(pkt_sz=arg[0]; pkt_sz<=arg[1]; pkt_sz++){ @@ -3957,11 +3957,11 @@ static int t_dev_tx_multique(int argc , char **argv) test_que_no = rand_num % HIF_MAX_ULQ_NUM; KAL_DBGPRINT(KAL, DBG_TRACE, ("[%s] sending in que=%d, pkt_size=%d, pkt_num=%d ...\n", \ - __FUNCTION__, test_que_no, pkt_sz, idx)); + __func__, test_que_no, pkt_sz, idx)); ret = sdio_send_pkt(test_que_no, pkt_sz, 0, 0); if (ret != RET_SUCCESS) { - KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] Tx basic test fail at sent pkt !\n",__FUNCTION__)); + KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] Tx basic test fail at sent pkt !\n",__func__)); /*send packet fail and retry*/ idx --; return ret; @@ -3998,7 +3998,7 @@ static int t_dev_simple_lb(int argc , char **argv) for (idx = 1 ; idx < argc ; idx ++) { /*translate number string to value*/ arg[idx-1] = str_to_int(argv[idx]); - printk(KERN_ERR "[%s] param[%d] = %d\n",__FUNCTION__,idx-1, arg[idx-1]); + printk(KERN_ERR "[%s] param[%d] = %d\n",__func__,idx-1, arg[idx-1]); } cmd.cmd = ATHIF_CMD_PAUSE_RGPD_RL; @@ -4047,12 +4047,12 @@ static int t_dev_simple_lb(int argc , char **argv) for(pkt_num=arg[2]; pkt_num<=arg[3]; pkt_num++){ for (idx = 0 ; idx < pkt_num ; idx ++) { KAL_DBGPRINT(KAL, DBG_TRACE, ("[%s] sending in que=%d, pkt_size=%d, pkt_num=%d ...\n", \ - __FUNCTION__, test_que_no, pkt_sz, idx)); + __func__, test_que_no, pkt_sz, idx)); ret = sdio_send_pkt(test_que_no, pkt_sz, 0, 0); expect_num++; if (ret != RET_SUCCESS) { - KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] Tx basic test fail at sent pkt !\n",__FUNCTION__)); + KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] Tx basic test fail at sent pkt !\n",__func__)); /*send packet fail and retry*/ idx --; return ret; @@ -4062,7 +4062,7 @@ static int t_dev_simple_lb(int argc , char **argv) } // test debug KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] Passe of que=%d, pkt_size=%d\n", \ - __FUNCTION__, test_que_no, pkt_sz)); + __func__, test_que_no, pkt_sz)); } } @@ -4117,7 +4117,7 @@ static int t_dev_simple_lb_empty_enq(int argc , char **argv) for (idx = 1 ; idx < argc ; idx ++) { /*translate number string to value*/ arg[idx-1] = str_to_int(argv[idx]); - KAL_DBGPRINT(KAL, DBG_WARN,("[%s] param[%d] = %d\n",__FUNCTION__,idx-1, arg[idx-1])); + KAL_DBGPRINT(KAL, DBG_WARN,("[%s] param[%d] = %d\n",__func__,idx-1, arg[idx-1])); } cmd.cmd = ATHIF_CMD_PAUSE_RGPD_RL; @@ -4166,12 +4166,12 @@ static int t_dev_simple_lb_empty_enq(int argc , char **argv) for(pkt_num=arg[2]; pkt_num<=arg[3]; pkt_num++){ for (idx = 0 ; idx < pkt_num ; idx ++) { KAL_DBGPRINT(KAL, DBG_TRACE, ("[%s] sending in que=%d, pkt_size=%d, pkt_num=%d ...\n", \ - __FUNCTION__, test_que_no, pkt_sz, idx)); + __func__, test_que_no, pkt_sz, idx)); ret = sdio_send_pkt(test_que_no, pkt_sz, 0, 0); expect_num++; if (ret != RET_SUCCESS) { - KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] Tx basic test fail at sent pkt !\n",__FUNCTION__)); + KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] Tx basic test fail at sent pkt !\n",__func__)); /*send packet fail and retry*/ idx --; return ret; @@ -4181,7 +4181,7 @@ static int t_dev_simple_lb_empty_enq(int argc , char **argv) } // test debug KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] Passe of que=%d, pkt_size=%d\n", \ - __FUNCTION__, test_que_no, pkt_sz)); + __func__, test_que_no, pkt_sz)); } } @@ -4275,7 +4275,7 @@ static int t_dev_random_lb(int argc , char **argv) for (idx = 1 ; idx < argc ; idx ++) { /*translate number string to value*/ arg[idx-1] = str_to_int(argv[idx]); - printk(KERN_ERR "[%s] param[%d] = %d\n",__FUNCTION__,idx-1, arg[idx-1]); + printk(KERN_ERR "[%s] param[%d] = %d\n",__func__,idx-1, arg[idx-1]); } for(round=0; round<arg[0]; round++){ @@ -4301,7 +4301,7 @@ static int t_dev_random_lb(int argc , char **argv) transferdata += pkt_sz; if (ret != RET_SUCCESS) { - KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] Tx basic test fail at sent pkt !\n",__FUNCTION__)); + KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] Tx basic test fail at sent pkt !\n",__func__)); /*send packet fail and retry*/ idx --; return ret; @@ -4381,7 +4381,7 @@ static int t_dev_single_queue_lb(int argc , char **argv) for (idx = 1 ; idx < argc ; idx ++) { /*translate number string to value*/ arg[idx-1] = str_to_int(argv[idx]); - printk(KERN_ERR "[%s] param[%d] = %d\n",__FUNCTION__,idx-1, arg[idx-1]); + printk(KERN_ERR "[%s] param[%d] = %d\n",__func__,idx-1, arg[idx-1]); } cmd.cmd = ATHIF_CMD_PAUSE_RGPD_RL; @@ -4446,12 +4446,12 @@ static int t_dev_single_queue_lb(int argc , char **argv) for(pkt_sz=arg[3]; pkt_sz<=arg[4]; pkt_sz++){ KAL_DBGPRINT(KAL, DBG_TRACE, ("[%s] sending in que=%d, pkt_size=%d, pkt_num=%d ...\n", \ - __FUNCTION__, test_que_no, pkt_sz, idx)); + __func__, test_que_no, pkt_sz, idx)); ret = sdio_send_pkt(test_que_no, pkt_sz, 0, 0); expect_num++; if (ret != RET_SUCCESS) { - KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] Tx basic test fail at sent pkt !\n",__FUNCTION__)); + KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] Tx basic test fail at sent pkt !\n",__func__)); /*send packet fail and retry*/ idx --; return ret; @@ -4461,7 +4461,7 @@ static int t_dev_single_queue_lb(int argc , char **argv) KAL_SLEEP_USEC(1) ; // test debug KAL_DBGPRINT(KAL, DBG_WARN, ("[%s] Passe of que=%d, pkt_size=%d\n", \ - __FUNCTION__, test_que_no, pkt_sz)); + __func__, test_que_no, pkt_sz)); } } @@ -4519,7 +4519,7 @@ static int t_dev_one_pkt_lb(int argc , char **argv) for (idx = 1 ; idx < argc ; idx ++) { /*translate number string to value*/ arg[idx-1] = str_to_int(argv[idx]); - printk(KERN_ERR "[%s] param[%d] = %d\n",__FUNCTION__,idx-1, arg[idx-1]); + printk(KERN_ERR "[%s] param[%d] = %d\n",__func__,idx-1, arg[idx-1]); } cmd.cmd = ATHIF_CMD_PAUSE_RGPD_RL; @@ -4586,12 +4586,12 @@ static int t_dev_one_pkt_lb(int argc , char **argv) KAL_DBGPRINT(KAL, DBG_TRACE, ("[%s] sending in que=%d, pkt_size=%d, pkt_num=%d ...\n", \ - __FUNCTION__, test_que_no, pkt_sz, idx)); + __func__, test_que_no, pkt_sz, idx)); ret = sdio_send_pkt(test_que_no, pkt_sz, 0, 0); expect_num++; if (ret != RET_SUCCESS) { - KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] Tx basic test fail at sent pkt !\n",__FUNCTION__)); + KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] Tx basic test fail at sent pkt !\n",__func__)); /*send packet fail and retry*/ idx --; return ret; @@ -4600,7 +4600,7 @@ static int t_dev_one_pkt_lb(int argc , char **argv) KAL_SLEEP_USEC(1) ; // test debug KAL_DBGPRINT(KAL, DBG_WARN, ("[%s] Passe of que=%d, pkt_size=%d\n", \ - __FUNCTION__, test_que_no, pkt_sz)); + __func__, test_que_no, pkt_sz)); while(expect_num != recv_total_pkt_cnt){ @@ -4753,7 +4753,7 @@ static int t_dev_single_allow_len(int argc, char** argv) for (idx = 1 ; idx < argc ; idx ++) { /*translate number string to value*/ arg[idx-1] = str_to_int(argv[idx]); - printk(KERN_ERR "[%s] param[%d] = %d\n",__FUNCTION__,idx-1, arg[idx-1]); + printk(KERN_ERR "[%s] param[%d] = %d\n",__func__,idx-1, arg[idx-1]); } /*start loopback mode*/ @@ -4766,7 +4766,7 @@ static int t_dev_single_allow_len(int argc, char** argv) if(RET_FAIL == mtlte_dev_test_check_cmd_ack(athif_result_save_t, WAIT_TIMEOUT) ){return RET_FAIL;} - KAL_DBGPRINT(KAL, DBG_ERROR,("[%s : %d] ATCASE_RGPD_ALLOW_LEN, start\n",__FUNCTION__,__LINE__ )); + KAL_DBGPRINT(KAL, DBG_ERROR,("[%s : %d] ATCASE_RGPD_ALLOW_LEN, start\n",__func__,__LINE__ )); for (allow_len_idx = 0 ; allow_len_idx < sizeof(allow_len_list)/sizeof(allowlen_info_t) ; allow_len_idx ++) { if (allow_len_list[allow_len_idx].valid == 0) { continue; @@ -4774,7 +4774,7 @@ static int t_dev_single_allow_len(int argc, char** argv) memset(&rgpd_format, 0 , sizeof(athif_ul_rgpd_format_t)); rgpd_format.rgpd_allow_len = allow_len_list[allow_len_idx].rgpd_allow_len; rgpd_format.rbd_num = 0; - KAL_DBGPRINT(KAL, DBG_ERROR,("[%s : %d] ATCASE_RGPD_ALLOW_LEN, GPD allow_len=%d\n",__FUNCTION__,__LINE__, rgpd_format.rgpd_allow_len)); + KAL_DBGPRINT(KAL, DBG_ERROR,("[%s : %d] ATCASE_RGPD_ALLOW_LEN, GPD allow_len=%d\n",__func__,__LINE__, rgpd_format.rgpd_allow_len)); for (que_no = 0 ; que_no < HIF_MAX_ULQ_NUM ; que_no ++) { while (1) { if (ret = f_ul_rgpd_allow_len_tst(que_no ,&rgpd_format, sizeof(AT_PKT_HEADER), 20) != RET_SUCCESS) @@ -4794,7 +4794,7 @@ static int t_dev_single_allow_len(int argc, char** argv) } } if (ret == RET_SUCCESS) { - KAL_DBGPRINT(KAL, DBG_ERROR,("[%s : %d] ATCASE_RGPD_ALLOW_LEN, passed\n",__FUNCTION__,__LINE__ )); + KAL_DBGPRINT(KAL, DBG_ERROR,("[%s : %d] ATCASE_RGPD_ALLOW_LEN, passed\n",__func__,__LINE__ )); } /*allow len : RBD1=512/1024/1536/2048*/ @@ -4802,10 +4802,10 @@ static int t_dev_single_allow_len(int argc, char** argv) rgpd_format.rgpd_allow_len = 0; rgpd_format.rbd_num = 1; unsigned int bd_allowlen[] = {128, 256, 512, 1024, 1536, 2048}; - KAL_DBGPRINT(KAL, DBG_ERROR,("[%s : %d] ATCASE_1RBD_ALLOW_LEN, 1BD test start\n",__FUNCTION__,__LINE__ )); + KAL_DBGPRINT(KAL, DBG_ERROR,("[%s : %d] ATCASE_1RBD_ALLOW_LEN, 1BD test start\n",__func__,__LINE__ )); for (allow_len_idx = 0 ; allow_len_idx < sizeof(bd_allowlen)/sizeof(unsigned int) ; allow_len_idx ++) { rgpd_format.rbd_allow_len[0] = bd_allowlen[allow_len_idx]; - KAL_DBGPRINT(KAL, DBG_ERROR,("[%s : %d] ATCASE_1RBD_ALLOW_LEN, 1BD test BD1=%d\n",__FUNCTION__,__LINE__ ,rgpd_format.rbd_allow_len[0])); + KAL_DBGPRINT(KAL, DBG_ERROR,("[%s : %d] ATCASE_1RBD_ALLOW_LEN, 1BD test BD1=%d\n",__func__,__LINE__ ,rgpd_format.rbd_allow_len[0])); for (que_no = 0 ; que_no < HIF_MAX_ULQ_NUM ; que_no ++) { while (1) { if (ret = f_ul_rgpd_allow_len_tst(que_no ,&rgpd_format, sizeof(AT_PKT_HEADER), 20) != RET_SUCCESS) @@ -4823,7 +4823,7 @@ static int t_dev_single_allow_len(int argc, char** argv) } if (ret == RET_SUCCESS) { - KAL_DBGPRINT(KAL, DBG_ERROR,("[%s : %d] ATCASE_1RBD_ALLOW_LEN, 1BD test passed\n",__FUNCTION__,__LINE__ )); + KAL_DBGPRINT(KAL, DBG_ERROR,("[%s : %d] ATCASE_1RBD_ALLOW_LEN, 1BD test passed\n",__func__,__LINE__ )); } sdio_test_option.auto_receive_pkt = false; @@ -4857,7 +4857,7 @@ static int t_dev_bd_allow_len(int argc, char** argv) for (idx = 1 ; idx < argc ; idx ++) { /*translate number string to value*/ arg[idx-1] = str_to_int(argv[idx]); - printk(KERN_ERR "[%s] param[%d] = %d\n",__FUNCTION__,idx-1, arg[idx-1]); + printk(KERN_ERR "[%s] param[%d] = %d\n",__func__,idx-1, arg[idx-1]); } /*start loopback mode*/ @@ -4880,12 +4880,12 @@ static int t_dev_bd_allow_len(int argc, char** argv) rgpd_format.rgpd_allow_len = 0; rgpd_format.rbd_num = 2; - KAL_DBGPRINT(KAL, DBG_ERROR,("[%s : %d] ATCASE_2RBD_ALLOW_LEN, 2BD test start\n",__FUNCTION__,__LINE__ )); + KAL_DBGPRINT(KAL, DBG_ERROR,("[%s : %d] ATCASE_2RBD_ALLOW_LEN, 2BD test start\n",__func__,__LINE__ )); for (rbd1_allow_len = 252 ; rbd1_allow_len <= 260 ; rbd1_allow_len += 4) { rbd2_allow_len = 2048 - rbd1_allow_len; rgpd_format.rbd_allow_len[0] = rbd1_allow_len; rgpd_format.rbd_allow_len[1] = rbd2_allow_len; - KAL_DBGPRINT(KAL, DBG_ERROR,("[%s : %d] ATCASE_2RBD_ALLOW_LEN, 1BD test BD1=%d, BD2=%d\n",__FUNCTION__,__LINE__ ,rbd1_allow_len, rbd2_allow_len)); + KAL_DBGPRINT(KAL, DBG_ERROR,("[%s : %d] ATCASE_2RBD_ALLOW_LEN, 1BD test BD1=%d, BD2=%d\n",__func__,__LINE__ ,rbd1_allow_len, rbd2_allow_len)); for (que_no = 0 ; que_no < HIF_MAX_ULQ_NUM ; que_no ++) { do { @@ -4911,7 +4911,7 @@ static int t_dev_bd_allow_len(int argc, char** argv) } } } - KAL_DBGPRINT(KAL, DBG_ERROR,("[%s : %d] ATCASE_2RBD_ALLOW_LEN, 2BD test passed\n",__FUNCTION__,__LINE__ )); + KAL_DBGPRINT(KAL, DBG_ERROR,("[%s : %d] ATCASE_2RBD_ALLOW_LEN, 2BD test passed\n",__func__,__LINE__ )); rd2_allowlen_case1_err: break; @@ -4922,12 +4922,12 @@ rd2_allowlen_case1_err: rgpd_format.rgpd_allow_len = 0; rgpd_format.rbd_num = 2; - KAL_DBGPRINT(KAL, DBG_ERROR,("[%s : %d] ATCASE_2RBD_ALLOW_LEN, 2BD test start\n",__FUNCTION__,__LINE__ )); + KAL_DBGPRINT(KAL, DBG_ERROR,("[%s : %d] ATCASE_2RBD_ALLOW_LEN, 2BD test start\n",__func__,__LINE__ )); for (rbd1_allow_len = 500 ; rbd1_allow_len <= 520 ; rbd1_allow_len += 4) { rbd2_allow_len = 2048 - rbd1_allow_len; rgpd_format.rbd_allow_len[0] = rbd1_allow_len; rgpd_format.rbd_allow_len[1] = rbd2_allow_len; - KAL_DBGPRINT(KAL, DBG_ERROR,("[%s : %d] ATCASE_2RBD_ALLOW_LEN, 1BD test BD1=%d, BD2=%d\n",__FUNCTION__,__LINE__ ,rbd1_allow_len, rbd2_allow_len)); + KAL_DBGPRINT(KAL, DBG_ERROR,("[%s : %d] ATCASE_2RBD_ALLOW_LEN, 1BD test BD1=%d, BD2=%d\n",__func__,__LINE__ ,rbd1_allow_len, rbd2_allow_len)); for (que_no = 0 ; que_no < HIF_MAX_ULQ_NUM ; que_no ++) { do { @@ -4954,7 +4954,7 @@ rd2_allowlen_case1_err: } } } - KAL_DBGPRINT(KAL, DBG_ERROR,("[%s : %d] ATCASE_2RBD_ALLOW_LEN, 2BD test passed\n",__FUNCTION__,__LINE__ )); + KAL_DBGPRINT(KAL, DBG_ERROR,("[%s : %d] ATCASE_2RBD_ALLOW_LEN, 2BD test passed\n",__func__,__LINE__ )); rd2_allowlen_case2_err: break; @@ -4965,7 +4965,7 @@ rd2_allowlen_case2_err: rgpd_format.rgpd_allow_len = 0; rgpd_format.rbd_num = 3; - KAL_DBGPRINT(KAL, DBG_ERROR,("[%s : %d] ATCASE_3RBD_ALLOW_LEN, 3BD test start\n",__FUNCTION__,__LINE__ )); + KAL_DBGPRINT(KAL, DBG_ERROR,("[%s : %d] ATCASE_3RBD_ALLOW_LEN, 3BD test start\n",__func__,__LINE__ )); for (rbd1_allow_len = 124 ; rbd1_allow_len <= 132 ; rbd1_allow_len += 4) { for (rbd2_allow_len = 252 ; rbd2_allow_len <= 260 ; rbd2_allow_len += 4) { rbd3_allow_len = 2048 - rbd1_allow_len - rbd2_allow_len; @@ -4973,7 +4973,7 @@ rd2_allowlen_case2_err: rgpd_format.rbd_allow_len[1] = rbd2_allow_len; rgpd_format.rbd_allow_len[2] = rbd3_allow_len; KAL_DBGPRINT(KAL, DBG_ERROR,("[%s : %d] ATCASE_3RBD_ALLOW_LEN, 1BD test BD1=%d, BD2=%d, BD3=%d\n", - __FUNCTION__,__LINE__ ,rbd1_allow_len, rbd2_allow_len, rbd3_allow_len)); + __func__,__LINE__ ,rbd1_allow_len, rbd2_allow_len, rbd3_allow_len)); for (que_no = 0 ; que_no < HIF_MAX_ULQ_NUM ; que_no ++) { do { @@ -5001,7 +5001,7 @@ rd2_allowlen_case2_err: } } } - KAL_DBGPRINT(KAL, DBG_ERROR,("[%s : %d] ATCASE_3RBD_ALLOW_LEN, 3BD test passed\n",__FUNCTION__,__LINE__ )); + KAL_DBGPRINT(KAL, DBG_ERROR,("[%s : %d] ATCASE_3RBD_ALLOW_LEN, 3BD test passed\n",__func__,__LINE__ )); rd3_allowlen_case1_err: break; @@ -5012,7 +5012,7 @@ rd3_allowlen_case1_err: rgpd_format.rgpd_allow_len = 0; rgpd_format.rbd_num = 3; - KAL_DBGPRINT(KAL, DBG_ERROR,("[%s : %d] ATCASE_3RBD_ALLOW_LEN, 3BD test start\n",__FUNCTION__,__LINE__ )); + KAL_DBGPRINT(KAL, DBG_ERROR,("[%s : %d] ATCASE_3RBD_ALLOW_LEN, 3BD test start\n",__func__,__LINE__ )); for (rbd1_allow_len = 500 ; rbd1_allow_len <= 520 ; rbd1_allow_len += 4) { for (rbd2_allow_len = 1000 ; rbd2_allow_len <= 1048 ; rbd2_allow_len += 4) { rbd3_allow_len = 2048 - rbd1_allow_len - rbd2_allow_len; @@ -5020,7 +5020,7 @@ rd3_allowlen_case1_err: rgpd_format.rbd_allow_len[1] = rbd2_allow_len; rgpd_format.rbd_allow_len[2] = rbd3_allow_len; KAL_DBGPRINT(KAL, DBG_ERROR,("[%s : %d] ATCASE_3RBD_ALLOW_LEN, 1BD test BD1=%d, BD2=%d, BD3=%d\n", - __FUNCTION__,__LINE__ ,rbd1_allow_len, rbd2_allow_len, rbd3_allow_len)); + __func__,__LINE__ ,rbd1_allow_len, rbd2_allow_len, rbd3_allow_len)); for (que_no = 0 ; que_no < HIF_MAX_ULQ_NUM ; que_no ++) { do { @@ -5048,7 +5048,7 @@ rd3_allowlen_case1_err: } } } - KAL_DBGPRINT(KAL, DBG_ERROR,("[%s : %d] ATCASE_3RBD_ALLOW_LEN, 3BD test passed\n",__FUNCTION__,__LINE__ )); + KAL_DBGPRINT(KAL, DBG_ERROR,("[%s : %d] ATCASE_3RBD_ALLOW_LEN, 3BD test passed\n",__func__,__LINE__ )); rd3_allowlen_case2_err: break; @@ -5060,7 +5060,7 @@ rd3_allowlen_case2_err: rgpd_format.rgpd_allow_len = 0; rgpd_format.rbd_num = 2; - KAL_DBGPRINT(KAL, DBG_ERROR,("[%s : %d] ATCASE_2RBD_ALLOW_LEN_STRESS, 2BD test start\n",__FUNCTION__,__LINE__ )); + KAL_DBGPRINT(KAL, DBG_ERROR,("[%s : %d] ATCASE_2RBD_ALLOW_LEN_STRESS, 2BD test start\n",__func__,__LINE__ )); tmp = 0; while (loop) { tmp += 4; @@ -5068,7 +5068,7 @@ rd3_allowlen_case2_err: rbd2_allow_len = 2048 - rbd1_allow_len; // 2044~4 rgpd_format.rbd_allow_len[0] = rbd1_allow_len; rgpd_format.rbd_allow_len[1] = rbd2_allow_len; - KAL_DBGPRINT(KAL, DBG_ERROR,("[%s : %d] ATCASE_2RBD_ALLOW_LEN_STRESS,loop=%d, 1BD test BD1=%d, BD2=%d\n",__FUNCTION__,__LINE__ ,loop,rbd1_allow_len, rbd2_allow_len)); + KAL_DBGPRINT(KAL, DBG_ERROR,("[%s : %d] ATCASE_2RBD_ALLOW_LEN_STRESS,loop=%d, 1BD test BD1=%d, BD2=%d\n",__func__,__LINE__ ,loop,rbd1_allow_len, rbd2_allow_len)); for (que_no = 0 ; que_no < HIF_MAX_ULQ_NUM ; que_no ++) { do { if (ret = f_ul_rgpd_allow_len_tst(que_no ,&rgpd_format, sizeof(AT_PKT_HEADER), 20) != RET_SUCCESS) @@ -5098,7 +5098,7 @@ rd3_allowlen_case2_err: loop --; } - KAL_DBGPRINT(KAL, DBG_ERROR,("[%s : %d] ATCASE_2RBD_ALLOW_LEN_STRESS, 2BD test passed\n",__FUNCTION__,__LINE__ )); + KAL_DBGPRINT(KAL, DBG_ERROR,("[%s : %d] ATCASE_2RBD_ALLOW_LEN_STRESS, 2BD test passed\n",__func__,__LINE__ )); break; default: @@ -5132,7 +5132,7 @@ static int t_dev_small_pkt_loopback(int argc, char** argv) for (idx = 1 ; idx < argc ; idx ++) { /*translate number string to value*/ arg[idx-1] = str_to_int(argv[idx]); - printk(KERN_ERR "[%s] param[%d] = %d\n",__FUNCTION__,idx-1, arg[idx-1]); + printk(KERN_ERR "[%s] param[%d] = %d\n",__func__,idx-1, arg[idx-1]); } mtlte_hif_sdio_enable_fw_own_back(0); @@ -5213,7 +5213,7 @@ static int t_dev_misalign_loopback(int argc, char** argv) for (idx = 1 ; idx < argc ; idx ++) { /*translate number string to value*/ arg[idx-1] = str_to_int(argv[idx]); - printk(KERN_ERR "[%s] param[%d] = %d\n",__FUNCTION__,idx-1, arg[idx-1]); + printk(KERN_ERR "[%s] param[%d] = %d\n",__func__,idx-1, arg[idx-1]); } mtlte_hif_sdio_enable_fw_own_back(0); @@ -5295,12 +5295,12 @@ static int t_dev_misalign_loopback(int argc, char** argv) for(pkt_num=10; pkt_num<=20; pkt_num++){ for (idx = 0 ; idx < pkt_num ; idx ++) { KAL_DBGPRINT(KAL, DBG_TRACE, ("[%s] sending in que=%d, pkt_size=%d, pkt_num=%d ...\n", \ - __FUNCTION__, test_que_no, pkt_sz, idx)); + __func__, test_que_no, pkt_sz, idx)); ret = sdio_send_pkt(test_que_no, pkt_sz, 0, 0); expect_num++; if (ret != RET_SUCCESS) { - KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] Tx basic test fail at sent pkt !\n",__FUNCTION__)); + KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] Tx basic test fail at sent pkt !\n",__func__)); /*send packet fail and retry*/ idx --; return ret; @@ -5394,7 +5394,7 @@ static int t_dev_network_loopback(int argc, char** argv) for (idx = 1 ; idx < argc ; idx ++) { /*translate number string to value*/ arg[idx-1] = str_to_int(argv[idx]); - printk(KERN_ERR "[%s] param[%d] = %d\n",__FUNCTION__,idx-1, arg[idx-1]); + printk(KERN_ERR "[%s] param[%d] = %d\n",__func__,idx-1, arg[idx-1]); } mtlte_hif_sdio_enable_fw_own_back(0); @@ -5463,12 +5463,12 @@ static int t_dev_network_loopback(int argc, char** argv) for(pkt_num=10; pkt_num<=20; pkt_num++){ for (idx = 0 ; idx < pkt_num ; idx ++) { KAL_DBGPRINT(KAL, DBG_TRACE, ("[%s] sending in que=%d, pkt_size=%d, pkt_num=%d ...\n", \ - __FUNCTION__, test_que_no, pkt_sz, idx)); + __func__, test_que_no, pkt_sz, idx)); ret = sdio_send_pkt(test_que_no, pkt_sz, 0, 0); expect_num++; if (ret != RET_SUCCESS) { - KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] Tx basic test fail at sent pkt !\n",__FUNCTION__)); + KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] Tx basic test fail at sent pkt !\n",__func__)); /*send packet fail and retry*/ idx --; return ret; @@ -5553,7 +5553,7 @@ static int t_dev_rand_enqueue_loopback(int argc, char** argv) for (idx = 1 ; idx < argc ; idx ++) { /*translate number string to value*/ arg[idx-1] = str_to_int(argv[idx]); - printk(KERN_ERR "[%s] param[%d] = %d\n",__FUNCTION__,idx-1, arg[idx-1]); + printk(KERN_ERR "[%s] param[%d] = %d\n",__func__,idx-1, arg[idx-1]); } mtlte_hif_sdio_enable_fw_own_back(0); @@ -5630,12 +5630,12 @@ static int t_dev_rand_enqueue_loopback(int argc, char** argv) for(pkt_num=10; pkt_num<=20; pkt_num++){ for (idx = 0 ; idx < pkt_num ; idx ++) { KAL_DBGPRINT(KAL, DBG_TRACE, ("[%s] sending in que=%d, pkt_size=%d, pkt_num=%d ...\n", \ - __FUNCTION__, test_que_no, pkt_sz, idx)); + __func__, test_que_no, pkt_sz, idx)); ret = sdio_send_pkt(test_que_no, pkt_sz, 0, 0); expect_num++; if (ret != RET_SUCCESS) { - KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] Tx basic test fail at sent pkt !\n",__FUNCTION__)); + KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] Tx basic test fail at sent pkt !\n",__func__)); /*send packet fail and retry*/ idx --; return ret; @@ -5717,7 +5717,7 @@ static int t_dev_tx_big_packet(int argc, char** argv) for (idx = 1 ; idx < argc ; idx ++) { /*translate number string to value*/ arg[idx-1] = str_to_int(argv[idx]); - printk(KERN_ERR "[%s] param[%d] = %d\n",__FUNCTION__,idx-1, arg[idx-1]); + printk(KERN_ERR "[%s] param[%d] = %d\n",__func__,idx-1, arg[idx-1]); } @@ -5784,7 +5784,7 @@ static int t_dev_tx_big_packet(int argc, char** argv) expect_num = 0; KAL_DBGPRINT(KAL, DBG_TRACE, ("[%s] sending in que=%d, pkt_size=%d, pkt_num=3 ...\n", \ - __FUNCTION__, test_que_no, pkt_sz)); + __func__, test_que_no, pkt_sz)); ret = sdio_send_pkt(test_que_no, pkt_sz, 0, 0); expect_num++; ret = sdio_send_pkt(test_que_no, pkt_sz, 0, 0); @@ -5793,7 +5793,7 @@ static int t_dev_tx_big_packet(int argc, char** argv) expect_num++; if (ret != RET_SUCCESS) { - KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] Tx basic test fail at sent pkt !\n",__FUNCTION__)); + KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] Tx basic test fail at sent pkt !\n",__func__)); /*send packet fail and retry*/ return ret; } @@ -5887,7 +5887,7 @@ static int t_dev_rx_big_packet(int argc, char** argv) for (idx = 1 ; idx < argc ; idx ++) { /*translate number string to value*/ arg[idx-1] = str_to_int(argv[idx]); - printk(KERN_ERR "[%s] param[%d] = %d\n",__FUNCTION__,idx-1, arg[idx-1]); + printk(KERN_ERR "[%s] param[%d] = %d\n",__func__,idx-1, arg[idx-1]); } @@ -6562,12 +6562,12 @@ static int t_dev_dl_fifolen_overflow_err(int argc, char** argv) if ( (device_int_st->DL0_INTR_Status & 0x1<<(24+test_que_no)) == 0 ) { KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s:%d] DL LENFIFO Overflow ERR interrupt check fail, q_num=%d !\n" - ,__FUNCTION__,__LINE__, test_que_no)); + ,__func__,__LINE__, test_que_no)); ret = RET_FAIL; return ret; } else { KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s:%d] DL LENFIFO Overflow interrupt check success, q_num=%d !\n" - ,__FUNCTION__,__LINE__, test_que_no)); + ,__func__,__LINE__, test_que_no)); } cmd.cmd = SDIO_AT_RESET_DL_QUEUE; @@ -6872,7 +6872,7 @@ static int t_dev_perf(int argc, char **argv) for (idx = 1 ; idx < argc ; idx ++) { /*translate number string to value*/ arg[idx-1] = str_to_int(argv[idx]); - printk(KERN_ERR "[%s] param[%d] = %d\n",__FUNCTION__,idx-1, arg[idx-1]); + printk(KERN_ERR "[%s] param[%d] = %d\n",__func__,idx-1, arg[idx-1]); } /*set default compare mode*/ @@ -7535,10 +7535,10 @@ static int t_dev_ulq_random_stop(int argc, char** argv) for(pkt_num=20; pkt_num<=20; pkt_num++){ for (idx = 0 ; idx < pkt_num ; idx ++) { KAL_DBGPRINT(KAL, DBG_TRACE, ("[%s] sending in que=%d, pkt_size=%d, pkt_num=%d ...\n", \ - __FUNCTION__, test_que_no, pkt_sz, idx)); + __func__, test_que_no, pkt_sz, idx)); ret = sdio_send_pkt(test_que_no, pkt_sz, 0, 0); if (ret != RET_SUCCESS) { - KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] Tx basic test fail at sent pkt !\n",__FUNCTION__)); + KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] Tx basic test fail at sent pkt !\n",__func__)); /*send packet fail and retry*/ idx --; return ret; @@ -7576,10 +7576,10 @@ static int t_dev_ulq_random_stop(int argc, char** argv) for(pkt_num=20; pkt_num<=20; pkt_num++){ for (idx = 0 ; idx < pkt_num ; idx ++) { KAL_DBGPRINT(KAL, DBG_TRACE, ("[%s] sending in que=%d, pkt_size=%d, pkt_num=%d ...\n", \ - __FUNCTION__, test_que_no, pkt_sz, idx)); + __func__, test_que_no, pkt_sz, idx)); ret = sdio_send_pkt(test_que_no, pkt_sz, 0, 0); if (ret != RET_SUCCESS) { - KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] Tx basic test fail at sent pkt !\n",__FUNCTION__)); + KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] Tx basic test fail at sent pkt !\n",__func__)); /*send packet fail and retry*/ idx --; return ret; @@ -7627,7 +7627,7 @@ static int t_dev_dlq_random_stop(int argc, char** argv) dl_cfg.tgpd_format.tbd_num = 0; ret = sdio_dl_npkt(&dl_cfg); if (ret != RET_SUCCESS) { - KAL_DBGPRINT(KAL, DBG_WARN,("[%s] receiving DL packet fail, the DLQ random stop test will not start !\n",__FUNCTION__)); + KAL_DBGPRINT(KAL, DBG_WARN,("[%s] receiving DL packet fail, the DLQ random stop test will not start !\n",__func__)); return RET_FAIL; } @@ -7654,7 +7654,7 @@ static int t_dev_dlq_random_stop(int argc, char** argv) dl_cfg.tgpd_format.tbd_num = 0; ret = sdio_dl_npkt(&dl_cfg); if (ret != RET_SUCCESS) { - KAL_DBGPRINT(KAL, DBG_WARN,("[%s] receiving DL packet fail during DLQ random stop test !!\n",__FUNCTION__)); + KAL_DBGPRINT(KAL, DBG_WARN,("[%s] receiving DL packet fail during DLQ random stop test !!\n",__func__)); return RET_FAIL; } @@ -7702,7 +7702,7 @@ static int t_dev_ul_allowlen_error(int argc, char** argv) for (idx = 1 ; idx < argc ; idx ++) { /*translate number string to value*/ arg[idx-1] = str_to_int(argv[idx]); - printk(KERN_ERR "[%s] param[%d] = %d\n",__FUNCTION__,idx-1, arg[idx-1]); + printk(KERN_ERR "[%s] param[%d] = %d\n",__func__,idx-1, arg[idx-1]); } cmd.cmd = ATHIF_CMD_SET_FWD_MD; @@ -7811,14 +7811,14 @@ static int t_dev_ul_allowlen_error(int argc, char** argv) ret = sdio_send_pkt(q_num, normal_sz , q_num, 0); if (ret != RET_SUCCESS) { - KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] Test fail at sent pkt !\n",__FUNCTION__)); + KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] Test fail at sent pkt !\n",__func__)); /*send packet fail and retry*/ idx --; return ret; } if (recv_th_rslt != RET_SUCCESS) { - KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] recv thread report fail\n", __FUNCTION__)); + KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] recv thread report fail\n", __func__)); ret = RET_FAIL; break; } @@ -7828,10 +7828,10 @@ static int t_dev_ul_allowlen_error(int argc, char** argv) /*wait loopback data*/ ret = f_wait_recv_pkt_cnt(normal_pkt_cnt , 10000); if (ret != RET_SUCCESS) { - KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] f_wait_recv_pkt_cnt timeout\n", __FUNCTION__)); + KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] f_wait_recv_pkt_cnt timeout\n", __func__)); } if (recv_th_rslt != RET_SUCCESS) { - KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] recv thread report fail\n", __FUNCTION__)); + KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] recv thread report fail\n", __func__)); ret = RET_FAIL; } recv_th_rslt = RET_SUCCESS; @@ -7851,7 +7851,7 @@ static int t_dev_ul_allowlen_error(int argc, char** argv) device_int_st = (hifsdio_isr_status_t *)athif_result_save_t->buf; if( (device_int_st->UL0_INTR_Status & 0xFFFFFF00) !=0){ - KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s:%d][ERR] UL INT has some error before test !!\n", __FUNCTION__,__LINE__)); + KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s:%d][ERR] UL INT has some error before test !!\n", __func__,__LINE__)); ret = RET_FAIL; return RET_FAIL; } @@ -7873,7 +7873,7 @@ static int t_dev_ul_allowlen_error(int argc, char** argv) device_int_st = (hifsdio_isr_status_t *)athif_result_save_t->buf; if( (device_int_st->UL0_INTR_Status & ORG_SDIO_TXQ_LEN_ERR(q_num) ) ==0){ - KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s:%d][ERR] UL LEN ERR INT has not occur at que%d test_idx=%d!!\n", __FUNCTION__,__LINE__, q_num, tst_idx)); + KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s:%d][ERR] UL LEN ERR INT has not occur at que%d test_idx=%d!!\n", __func__,__LINE__, q_num, tst_idx)); ret = RET_FAIL; return RET_FAIL; } @@ -7957,7 +7957,7 @@ static int t_dev_dl_len_error(int argc, char** argv) for (idx = 1 ; idx < argc ; idx ++) { /*translate number string to value*/ arg[idx-1] = str_to_int(argv[idx]); - printk(KERN_ERR "[%s] param[%d] = %d\n",__FUNCTION__,idx-1, arg[idx-1]); + printk(KERN_ERR "[%s] param[%d] = %d\n",__func__,idx-1, arg[idx-1]); } //for (tst_idx = 0 ; tst_idx < 8 ; tst_idx ++) { @@ -7996,7 +7996,7 @@ static int t_dev_dl_len_error(int argc, char** argv) device_int_st = (hifsdio_isr_status_t *)athif_result_save_t->buf; if( (device_int_st->DL1_INTR_Status & 0x0000FF00) !=0){ - KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s:%d][ERR] DL INT has some error before test !!\n", __FUNCTION__,__LINE__)); + KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s:%d][ERR] DL INT has some error before test !!\n", __func__,__LINE__)); ret = RET_FAIL; } @@ -8102,12 +8102,12 @@ static int t_dev_dl_len_error(int argc, char** argv) /*wait loopback data*/ ret = f_wait_recv_pkt_cnt(normal_pkt_cnt , 10000); if (ret != RET_SUCCESS) { - KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] f_wait_recv_pkt_cnt timeout\n", __FUNCTION__)); + KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] f_wait_recv_pkt_cnt timeout\n", __func__)); ret = RET_FAIL; return ret; } if (recv_th_rslt != RET_SUCCESS) { - KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] recv thread report fail\n", __FUNCTION__)); + KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] recv thread report fail\n", __func__)); ret = RET_FAIL; return ret; } @@ -8134,22 +8134,22 @@ static int t_dev_dl_len_error(int argc, char** argv) if (err_pkt) { if ( (device_int_st->DL1_INTR_Status & 0x1<<(8+q_num)) ==0 ) { KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s:%d] DL LEN ERR interrupt check fail, q_num=%d, tst_idx=%d !\n" - ,__FUNCTION__,__LINE__, q_num, tst_idx)); + ,__func__,__LINE__, q_num, tst_idx)); ret = RET_FAIL; return ret; } else { KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s:%d] DL LEN ERR interrupt check success, q_num=%d, tst_idx=%d !\n" - ,__FUNCTION__,__LINE__, q_num, tst_idx)); + ,__func__,__LINE__, q_num, tst_idx)); } }else { if ( (device_int_st->DL1_INTR_Status & 0x0000FF00) !=0) { KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s:%d] DL LEN ERR interrupt check fail, q_num=%d, tst_idx=%d !\n" - ,__FUNCTION__,__LINE__, q_num, tst_idx)); + ,__func__,__LINE__, q_num, tst_idx)); ret = RET_FAIL; return ret; } else { KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s:%d] DL LEN ERR interrupt check success, q_num=%d, tst_idx=%d !\n" - ,__FUNCTION__,__LINE__, q_num, tst_idx)); + ,__func__,__LINE__, q_num, tst_idx)); } } @@ -8270,7 +8270,7 @@ static int t_dev_bypass_lb(int argc , char **argv) for (idx = 1 ; idx < argc ; idx ++) { /*translate number string to value*/ arg[idx-1] = str_to_int(argv[idx]); - printk(KERN_ERR "[%s] param[%d] = %d\n",__FUNCTION__,idx-1, arg[idx-1]); + printk(KERN_ERR "[%s] param[%d] = %d\n",__func__,idx-1, arg[idx-1]); } for(test_que_no=0; test_que_no<HIF_MAX_ULQ_NUM; test_que_no++){ @@ -8278,12 +8278,12 @@ static int t_dev_bypass_lb(int argc , char **argv) for(pkt_num=arg[2]; pkt_num<=arg[3]; pkt_num++){ for (idx = 0 ; idx < pkt_num ; idx ++) { KAL_DBGPRINT(KAL, DBG_TRACE, ("[%s] sending in que=%d, pkt_size=%d, pkt_num=%d ...\n", \ - __FUNCTION__, test_que_no, pkt_sz, idx)); + __func__, test_que_no, pkt_sz, idx)); ret = sdio_send_pkt(test_que_no, pkt_sz, 0, 0); expect_num++; if (ret != RET_SUCCESS) { - KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] Tx basic test fail at sent pkt !\n",__FUNCTION__)); + KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] Tx basic test fail at sent pkt !\n",__func__)); /*send packet fail and retry*/ idx --; return ret; @@ -8293,7 +8293,7 @@ static int t_dev_bypass_lb(int argc , char **argv) } // test debug KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] Passe of que=%d, pkt_size=%d\n", \ - __FUNCTION__, test_que_no, pkt_sz)); + __func__, test_que_no, pkt_sz)); } } @@ -8372,7 +8372,7 @@ static int t_dev_txrx_bypass(int argc, char **argv) for (idx = 1 ; idx < argc ; idx ++) { /*translate number string to value*/ arg[idx-1] = str_to_int(argv[idx]); - printk(KERN_ERR "[%s] param[%d] = %d\n",__FUNCTION__,idx-1, arg[idx-1]); + printk(KERN_ERR "[%s] param[%d] = %d\n",__func__,idx-1, arg[idx-1]); } mtlte_hif_sdio_enable_fw_own_back(0); @@ -8475,7 +8475,7 @@ static int t_dev_txrx_cs_err(int argc , char **argv) for (idx = 1 ; idx < argc ; idx ++) { /*translate number string to value*/ arg[idx-1] = str_to_int(argv[idx]); - printk(KERN_ERR "[%s] param[%d] = %d\n",__FUNCTION__,idx-1, arg[idx-1]); + printk(KERN_ERR "[%s] param[%d] = %d\n",__func__,idx-1, arg[idx-1]); } mtlte_hif_sdio_enable_fw_own_back(0); @@ -8627,7 +8627,7 @@ static int t_dev_tcm_lb(int argc , char **argv) for (idx = 1 ; idx < argc ; idx ++) { /*translate number string to value*/ arg[idx-1] = str_to_int(argv[idx]); - printk(KERN_ERR "[%s] param[%d] = %d\n",__FUNCTION__,idx-1, arg[idx-1]); + printk(KERN_ERR "[%s] param[%d] = %d\n",__func__,idx-1, arg[idx-1]); } for(test_que_no=0; test_que_no<HIF_MAX_ULQ_NUM; test_que_no++){ @@ -8635,12 +8635,12 @@ static int t_dev_tcm_lb(int argc , char **argv) for(pkt_num=arg[2]; pkt_num<=arg[3]; pkt_num++){ for (idx = 0 ; idx < pkt_num ; idx ++) { KAL_DBGPRINT(KAL, DBG_TRACE, ("[%s] sending in que=%d, pkt_size=%d, pkt_num=%d ...\n", \ - __FUNCTION__, test_que_no, pkt_sz, idx)); + __func__, test_que_no, pkt_sz, idx)); ret = sdio_send_pkt(test_que_no, pkt_sz, 0, 0); expect_num++; if (ret != RET_SUCCESS) { - KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] Tx basic test fail at sent pkt !\n",__FUNCTION__)); + KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] Tx basic test fail at sent pkt !\n",__func__)); /*send packet fail and retry*/ idx --; return ret; @@ -8650,7 +8650,7 @@ static int t_dev_tcm_lb(int argc , char **argv) } // test debug KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] Passe of que=%d, pkt_size=%d\n", \ - __FUNCTION__, test_que_no, pkt_sz)); + __func__, test_que_no, pkt_sz)); } } @@ -8765,7 +8765,7 @@ static int t_dev_tcm_misalign_lb(int argc , char **argv) for (idx = 1 ; idx < argc ; idx ++) { /*translate number string to value*/ arg[idx-1] = str_to_int(argv[idx]); - printk(KERN_ERR "[%s] param[%d] = %d\n",__FUNCTION__,idx-1, arg[idx-1]); + printk(KERN_ERR "[%s] param[%d] = %d\n",__func__,idx-1, arg[idx-1]); } for(test_que_no=0; test_que_no<HIF_MAX_ULQ_NUM; test_que_no++){ @@ -8773,12 +8773,12 @@ static int t_dev_tcm_misalign_lb(int argc , char **argv) for(pkt_num=arg[2]; pkt_num<=arg[3]; pkt_num++){ for (idx = 0 ; idx < pkt_num ; idx ++) { KAL_DBGPRINT(KAL, DBG_TRACE, ("[%s] sending in que=%d, pkt_size=%d, pkt_num=%d ...\n", \ - __FUNCTION__, test_que_no, pkt_sz, idx)); + __func__, test_que_no, pkt_sz, idx)); ret = sdio_send_pkt(test_que_no, pkt_sz, 0, 0); expect_num++; if (ret != RET_SUCCESS) { - KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] Tx basic test fail at sent pkt !\n",__FUNCTION__)); + KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] Tx basic test fail at sent pkt !\n",__func__)); /*send packet fail and retry*/ idx --; return ret; @@ -8788,7 +8788,7 @@ static int t_dev_tcm_misalign_lb(int argc , char **argv) } // test debug KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] Passe of que=%d, pkt_size=%d\n", \ - __FUNCTION__, test_que_no, pkt_sz)); + __func__, test_que_no, pkt_sz)); } } @@ -8851,7 +8851,7 @@ static int t_dev_atcmd_data_interleave_lb(int argc , char **argv) for (idx = 1 ; idx < argc ; idx ++) { //translate number string to value arg[idx-1] = str_to_int(argv[idx]); - printk(KERN_ERR "[%s] param[%d] = %d\n",__FUNCTION__,idx-1, arg[idx-1]); + printk(KERN_ERR "[%s] param[%d] = %d\n",__func__,idx-1, arg[idx-1]); } @@ -8913,12 +8913,12 @@ static int t_dev_atcmd_data_interleave_lb(int argc , char **argv) for(pkt_num=arg[2]; pkt_num<=arg[3]; pkt_num++){ for (idx = 0 ; idx < pkt_num ; idx ++) { KAL_DBGPRINT(KAL, DBG_TRACE, ("[%s] sending in que=%d, pkt_size=%d, pkt_num=%d ...\n", \ - __FUNCTION__, test_que_no, pkt_sz, idx)); + __func__, test_que_no, pkt_sz, idx)); ret = sdio_send_pkt(test_que_no, pkt_sz, 0, 0); expect_num++; if (ret != RET_SUCCESS) { - KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] Tx basic test fail at sent pkt !\n",__FUNCTION__)); + KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] Tx basic test fail at sent pkt !\n",__func__)); //send packet fail and retry idx --; return ret; @@ -8950,7 +8950,7 @@ static int t_dev_atcmd_data_interleave_lb(int argc , char **argv) } // test debug KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] Passe of que=%d, pkt_size=%d\n", \ - __FUNCTION__, test_que_no, pkt_sz)); + __func__, test_que_no, pkt_sz)); } } @@ -9022,7 +9022,7 @@ static int t_dev_stress_random_lb(int argc , char **argv) for (idx = 1 ; idx < argc ; idx ++) { //translate number string to value arg[idx-1] = str_to_int(argv[idx]); - printk(KERN_ERR "[%s] param[%d] = %d\n",__FUNCTION__,idx-1, arg[idx-1]); + printk(KERN_ERR "[%s] param[%d] = %d\n",__func__,idx-1, arg[idx-1]); } @@ -9109,12 +9109,12 @@ static int t_dev_stress_random_lb(int argc , char **argv) now_size = (now_size % (target_size_max - target_size_min) ) + target_size_min; transferdata += now_size; - //KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] pkt size this time = %d !\n",__FUNCTION__, now_size)); + //KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] pkt size this time = %d !\n",__func__, now_size)); ret = sdio_send_pkt(test_que_no, now_size, 0, 0); expect_num++; if (ret != RET_SUCCESS) { - KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] Tx basic test fail at sent pkt !\n",__FUNCTION__)); + KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] Tx basic test fail at sent pkt !\n",__func__)); //send packet fail and retry idx --; return ret; @@ -9145,7 +9145,7 @@ static int t_dev_stress_random_lb(int argc , char **argv) } // test debug - //KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s]transfered pkt at que=%d, pkt_num=%d\n", __FUNCTION__, test_que_no, now_pktnum)); + //KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s]transfered pkt at que=%d, pkt_num=%d\n", __func__, test_que_no, now_pktnum)); } // exam the packet num which receive. @@ -9161,7 +9161,7 @@ static int t_dev_stress_random_lb(int argc , char **argv) } old_pkt_cnt = recv_total_pkt_cnt; - KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] loop %d is finished\n", __FUNCTION__, now_big_loop)); + KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] loop %d is finished\n", __func__, now_big_loop)); } jiffies_to_timespec(jiffies , &end_t); @@ -9170,9 +9170,9 @@ static int t_dev_stress_random_lb(int argc , char **argv) diff_ms += (diff_t.tv_nsec / 1000000); performance = ((unsigned int)transferdata / (unsigned int)diff_ms); - KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] performance = %d KBPS\n", __FUNCTION__, performance )); - KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] transfered data=%u\n", __FUNCTION__, transferdata)); - KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] diff_ms=%u\n", __FUNCTION__, diff_ms)); + KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] performance = %d KBPS\n", __func__, performance )); + KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] transfered data=%u\n", __func__, transferdata)); + KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] diff_ms=%u\n", __func__, diff_ms)); } @@ -9220,7 +9220,7 @@ static int t_dev_brom_sync_test(int argc , char **argv) timeout++; KAL_SLEEP_MSEC(1) ; if (timeout > 100){ - KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] brom sync timeout at step1 0x88887208!! \n", __FUNCTION__)); + KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] brom sync timeout at step1 0x88887208!! \n", __func__)); return RET_FAIL; } test_d2h_mailbox_rd(0, &rd_val); @@ -9234,7 +9234,7 @@ static int t_dev_brom_sync_test(int argc , char **argv) timeout++; KAL_SLEEP_MSEC(1) ; if (timeout > 100){ - KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] brom sync timeout step2 0x00000000!! \n", __FUNCTION__)); + KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] brom sync timeout step2 0x00000000!! \n", __func__)); return RET_FAIL; } test_d2h_mailbox_rd(0, &rd_val); @@ -9267,7 +9267,7 @@ static int t_dev_brom_sync_test_new(int argc , char **argv) timeout++; KAL_SLEEP_MSEC(1) ; if (timeout > 100){ - KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] brom sync timeout at step1 0x59474442!! \n", __FUNCTION__)); + KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] brom sync timeout at step1 0x59474442!! \n", __func__)); return RET_FAIL; } test_d2h_mailbox_rd(0, &rd_val); @@ -9281,7 +9281,7 @@ static int t_dev_brom_sync_test_new(int argc , char **argv) timeout++; KAL_SLEEP_MSEC(1) ; if (timeout > 100){ - KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] brom sync timeout step2 0x00000000!! \n", __FUNCTION__)); + KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] brom sync timeout step2 0x00000000!! \n", __func__)); return RET_FAIL; } test_d2h_mailbox_rd(0, &rd_val); @@ -9305,7 +9305,7 @@ static int t_dev_brom_sync_timeout_test(int argc , char **argv) for (idx = 1 ; idx < argc ; idx ++) { /*translate number string to value*/ arg[idx-1] = str_to_int(argv[idx]); - printk(KERN_ERR "[%s] param[%d] = %d\n",__FUNCTION__,idx-1, arg[idx-1]); + printk(KERN_ERR "[%s] param[%d] = %d\n",__func__,idx-1, arg[idx-1]); } mtlte_hif_sdio_enable_fw_own_back(0); @@ -9323,7 +9323,7 @@ static int t_dev_brom_sync_timeout_test(int argc , char **argv) timeout++; KAL_SLEEP_MSEC(1) ; if (timeout > 100){ - KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] brom sync timeout at step1 0x59474442!! \n", __FUNCTION__)); + KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] brom sync timeout at step1 0x59474442!! \n", __func__)); return RET_FAIL; } test_d2h_mailbox_rd(0, &rd_val); @@ -9352,7 +9352,7 @@ static int t_dev_brom_lb_test(int argc , char **argv) for (idx = 1 ; idx < argc ; idx ++) { /*translate number string to value*/ arg[idx-1] = str_to_int(argv[idx]); - printk(KERN_ERR "[%s] param[%d] = %d\n",__FUNCTION__,idx-1, arg[idx-1]); + printk(KERN_ERR "[%s] param[%d] = %d\n",__func__,idx-1, arg[idx-1]); } mtlte_hif_sdio_enable_fw_own_back(0); @@ -9407,7 +9407,7 @@ static int t_dev_brom_ioctl_test(int argc , char **argv) for (idx = 1 ; idx < argc ; idx ++) { /*translate number string to value*/ arg[idx-1] = str_to_int(argv[idx]); - printk(KERN_ERR "[%s] param[%d] = %d\n",__FUNCTION__,idx-1, arg[idx-1]); + printk(KERN_ERR "[%s] param[%d] = %d\n",__func__,idx-1, arg[idx-1]); } ret = RET_SUCCESS; @@ -9514,7 +9514,7 @@ static int t_dev_brom_ioctl_test(int argc , char **argv) ret = brom_write_pkt(BROM_ULQ, data_length, brom_io_buf); if (ret != data_length) { - KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] brom write pkt fail!! data_len=%d return=%d \n", __FUNCTION__, data_length, ret)); + KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] brom write pkt fail!! data_len=%d return=%d \n", __func__, data_length, ret)); return RET_FAIL; } @@ -9533,7 +9533,7 @@ static int t_dev_brom_ioctl_test(int argc , char **argv) KAL_SLEEP_MSEC(1) ; timeout++; if(timeout > 100){ - KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] brom read pkt timeout!! data_len=%d now len=%d \n", __FUNCTION__, data_length, total_read_len)); + KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] brom read pkt timeout!! data_len=%d now len=%d \n", __func__, data_length, total_read_len)); return RET_FAIL; } @@ -9594,7 +9594,7 @@ static int t_dev_brom_sync_test_xboot(int argc , char **argv) timeout++; KAL_SLEEP_MSEC(1) ; if (timeout > 100){ - KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] brom xboot sync timeout at step1 0x53444254!! \n", __FUNCTION__)); + KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] brom xboot sync timeout at step1 0x53444254!! \n", __func__)); return RET_FAIL; } test_d2h_mailbox_rd(0, &rd_val); @@ -9603,7 +9603,7 @@ static int t_dev_brom_sync_test_xboot(int argc , char **argv) timeout_for_device = 200; wr_val = SDIOMB_BOOT_ACK_MAGIC | timeout_for_device; test_h2d_mailbox_wr(0, &wr_val); - KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] brom xboot sync success!! \n", __FUNCTION__)); + KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] brom xboot sync success!! \n", __func__)); mtlte_hif_sdio_enable_fw_own_back(1); return RET_SUCCESS; @@ -9632,7 +9632,7 @@ static int brom_sync_xboot_no_timeout(void) wr_val = SDIOMB_BOOT_ACK_MAGIC | timeout_for_device; test_h2d_mailbox_wr(0, &wr_val); - KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] brom xboot sync success with upper call!! \n", __FUNCTION__)); + KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] brom xboot sync success with upper call!! \n", __func__)); mtlte_hif_sdio_enable_fw_own_back(1); return RET_SUCCESS; @@ -9699,7 +9699,7 @@ static int t_dev_brom_dl_timeout_test(int argc , char **argv) for (idx = 1 ; idx < argc ; idx ++) { /*translate number string to value*/ arg[idx-1] = str_to_int(argv[idx]); - printk(KERN_ERR "[%s] param[%d] = %d\n",__FUNCTION__,idx-1, arg[idx-1]); + printk(KERN_ERR "[%s] param[%d] = %d\n",__func__,idx-1, arg[idx-1]); } ret = RET_SUCCESS; @@ -9729,11 +9729,11 @@ static int t_dev_brom_dl_timeout_test(int argc , char **argv) ret = brom_write_pkt(BROM_ULQ, data_length, brom_io_buf); if (ret != data_length) { - KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] brom write pkt fail!! data_len=%d return=%d \n", __FUNCTION__, data_length, ret)); + KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] brom write pkt fail!! data_len=%d return=%d \n", __func__, data_length, ret)); return RET_FAIL; } - KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] Now wait and check whether device output error code of send timout? \n", __FUNCTION__)); + KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] Now wait and check whether device output error code of send timout? \n", __func__)); /*restore pattern mode*/ @@ -9821,7 +9821,7 @@ static int t_dev_rx_pkt_cnt_change_test(int argc , char **argv) for (idx = 1 ; idx < argc ; idx ++) { /*translate number string to value*/ arg[idx-1] = str_to_int(argv[idx]); - printk(KERN_ERR "[%s] param[%d] = %d\n",__FUNCTION__,idx-1, arg[idx-1]); + printk(KERN_ERR "[%s] param[%d] = %d\n",__func__,idx-1, arg[idx-1]); } sdio_func1_rd(SDIO_IP_WHCR, &orig_WHCR, 4); @@ -9876,12 +9876,12 @@ static int t_dev_rx_pkt_cnt_change_test(int argc , char **argv) for(test_que_no=0; test_que_no<HIF_MAX_ULQ_NUM; test_que_no++){ for (idx = 0 ; idx < pkt_num ; idx ++) { KAL_DBGPRINT(KAL, DBG_TRACE, ("[%s] sending in que=%d, pkt_size=%d, pkt_num=%d ...\n", \ - __FUNCTION__, test_que_no, pkt_sz, idx)); + __func__, test_que_no, pkt_sz, idx)); ret = sdio_send_pkt(test_que_no, pkt_sz, 0, 0); expect_num++; if (ret != RET_SUCCESS) { - KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] Tx basic test fail at sent pkt !\n",__FUNCTION__)); + KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] Tx basic test fail at sent pkt !\n",__func__)); /*send packet fail and retry*/ idx --; return ret; @@ -9893,7 +9893,7 @@ static int t_dev_rx_pkt_cnt_change_test(int argc , char **argv) // test debug KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] Passed of pkt_size=%d, pkt_num=%d \n", \ - __FUNCTION__, pkt_sz, pkt_num)); + __func__, pkt_sz, pkt_num)); } } @@ -10228,7 +10228,7 @@ static int t_dev_set_max_rx_pkt(int argc , char **argv) for (idx = 1 ; idx < argc ; idx ++) { /*translate number string to value*/ arg[idx-1] = str_to_int(argv[idx]); - printk(KERN_ERR "[%s] param[%d] = %d\n",__FUNCTION__,idx-1, arg[idx-1]); + printk(KERN_ERR "[%s] param[%d] = %d\n",__func__,idx-1, arg[idx-1]); } // temp set rx report length @@ -10351,7 +10351,7 @@ static int t_dev_max_rx_pkt_test(int argc , char **argv) for (idx = 1 ; idx < argc ; idx ++) { /*translate number string to value*/ arg[idx-1] = str_to_int(argv[idx]); - printk(KERN_ERR "[%s] param[%d] = %d\n",__FUNCTION__,idx-1, arg[idx-1]); + printk(KERN_ERR "[%s] param[%d] = %d\n",__func__,idx-1, arg[idx-1]); } sdio_func1_rd(SDIO_IP_WHCR, &orig_WHCR, 4); @@ -10421,12 +10421,12 @@ static int t_dev_max_rx_pkt_test(int argc , char **argv) for(test_que_no=0; test_que_no<HIF_MAX_ULQ_NUM; test_que_no++){ for (idx = 0 ; idx < pkt_num ; idx ++) { KAL_DBGPRINT(KAL, DBG_TRACE, ("[%s] sending in que=%d, pkt_size=%d, pkt_num=%d ...\n", \ - __FUNCTION__, test_que_no, pkt_sz, idx)); + __func__, test_que_no, pkt_sz, idx)); ret = sdio_send_pkt(test_que_no, pkt_sz, 0, 0); expect_num++; if (ret != RET_SUCCESS) { - KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] Tx basic test fail at sent pkt !\n",__FUNCTION__)); + KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] Tx basic test fail at sent pkt !\n",__func__)); /*send packet fail and retry*/ idx --; return ret; @@ -10438,7 +10438,7 @@ static int t_dev_max_rx_pkt_test(int argc , char **argv) // test debug KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] Passed of pkt_size=%d, pkt_num=%d \n", \ - __FUNCTION__, pkt_sz, pkt_num)); + __func__, pkt_sz, pkt_num)); } } @@ -10518,7 +10518,7 @@ static int t_dev_set_wd_reset(int argc , char **argv) for (idx = 1 ; idx < argc ; idx ++) { /*translate number string to value*/ arg[idx-1] = str_to_int(argv[idx]); - printk(KERN_ERR "[%s] param[%d] = %d\n",__FUNCTION__,idx-1, arg[idx-1]); + printk(KERN_ERR "[%s] param[%d] = %d\n",__func__,idx-1, arg[idx-1]); } cmd.cmd = SDIO_AT_WD_RESET; @@ -10558,7 +10558,7 @@ static int t_dev_device_self_sleep(int argc , char **argv) for (idx = 1 ; idx < argc ; idx ++) { /*translate number string to value*/ arg[idx-1] = str_to_int(argv[idx]); - printk(KERN_ERR "[%s] param[%d] = %d\n",__FUNCTION__,idx-1, arg[idx-1]); + printk(KERN_ERR "[%s] param[%d] = %d\n",__func__,idx-1, arg[idx-1]); } cmd.cmd = SDIO_AT_SELF_SLEEP; @@ -10590,7 +10590,7 @@ static int t_dev_device_wake_event_test(int argc , char **argv) for (idx = 1 ; idx < argc ; idx ++) { /*translate number string to value*/ arg[idx-1] = str_to_int(argv[idx]); - printk(KERN_ERR "[%s] param[%d] = %d\n",__FUNCTION__,idx-1, arg[idx-1]); + printk(KERN_ERR "[%s] param[%d] = %d\n",__func__,idx-1, arg[idx-1]); } if(0 == arg[0]){ @@ -10783,7 +10783,7 @@ static int t_dev_device_set_wake_eint(int argc , char **argv) for (idx = 1 ; idx < argc ; idx ++) { /*translate number string to value*/ arg[idx-1] = str_to_int(argv[idx]); - printk(KERN_ERR "[%s] param[%d] = %d\n",__FUNCTION__,idx-1, arg[idx-1]); + printk(KERN_ERR "[%s] param[%d] = %d\n",__func__,idx-1, arg[idx-1]); } cmd.cmd = SDIO_AT_SET_WAKEUP_EINT; @@ -10805,7 +10805,7 @@ static int t_dev_kal_msec_sleep(int argc , char **argv) for (idx = 1 ; idx < argc ; idx ++) { /*translate number string to value*/ arg[idx-1] = str_to_int(argv[idx]); - printk(KERN_ERR "[%s] param[%d] = %d\n",__FUNCTION__,idx-1, arg[idx-1]); + printk(KERN_ERR "[%s] param[%d] = %d\n",__func__,idx-1, arg[idx-1]); } KAL_SLEEP_MSEC(arg[0]); @@ -10828,7 +10828,7 @@ static int t_dev_enable_auto_sleep(int argc , char **argv) for (idx = 1 ; idx < argc ; idx ++) { /*translate number string to value*/ arg[idx-1] = str_to_int(argv[idx]); - printk(KERN_ERR "[%s] param[%d] = %d\n",__FUNCTION__,idx-1, arg[idx-1]); + printk(KERN_ERR "[%s] param[%d] = %d\n",__func__,idx-1, arg[idx-1]); } @@ -10867,33 +10867,33 @@ void test_exception_callback(KAL_UINT32 msgid) { //sdio_test_option.auto_receive_pkt = false; KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] Exception phase %d !! Packet received right now = %d \n", \ - __FUNCTION__, msgid, recv_total_pkt_cnt)); + __func__, msgid, recv_total_pkt_cnt)); recv_total_pkt_cnt = 0; } else if(msgid == EX_DHL_DL_RDY) { KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] Exception phase %d !! \n", \ - __FUNCTION__, msgid)); + __func__, msgid)); if(0 != recv_total_pkt_cnt) { KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] Error !! DL Packet transfer to upper layer at Exception phase %d \n", \ - __FUNCTION__, EX_DHL_DL_RDY)); + __func__, EX_DHL_DL_RDY)); } //sdio_test_option.auto_receive_pkt = true; } else if(msgid == EX_INIT_DONE) { KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] Exception phase %d !! Packet received duing phase 1 = %d \n", \ - __FUNCTION__, msgid, recv_total_pkt_cnt)); + __func__, msgid, recv_total_pkt_cnt)); recv_total_pkt_cnt = 0; } else { KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] Exception phase ERROR !! now phase = %d \n", \ - __FUNCTION__, msgid)); + __func__, msgid)); } test_exception_msgid = msgid; @@ -10925,7 +10925,7 @@ static int t_dev_exception_dump_test(int argc , char **argv) for (idx = 1 ; idx < argc ; idx ++) { /*translate number string to value*/ arg[idx-1] = str_to_int(argv[idx]); - printk(KERN_ERR "[%s] param[%d] = %d\n",__FUNCTION__,idx-1, arg[idx-1]); + printk(KERN_ERR "[%s] param[%d] = %d\n",__func__,idx-1, arg[idx-1]); } non_stopq = arg[0]; @@ -10982,12 +10982,12 @@ static int t_dev_exception_dump_test(int argc , char **argv) for(pkt_num=10; pkt_num<=10; pkt_num++){ for (idx = 0 ; idx < pkt_num ; idx ++) { KAL_DBGPRINT(KAL, DBG_TRACE, ("[%s] sending in que=%d, pkt_size=%d, pkt_num=%d ...\n", \ - __FUNCTION__, test_que_no, pkt_sz, idx)); + __func__, test_que_no, pkt_sz, idx)); ret = sdio_send_pkt(test_que_no, pkt_sz, 0, 0); expect_num++; if (ret != RET_SUCCESS) { - KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] Tx basic test fail at sent pkt !\n",__FUNCTION__)); + KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] Tx basic test fail at sent pkt !\n",__func__)); /*send packet fail and retry*/ idx --; return ret; @@ -10996,12 +10996,12 @@ static int t_dev_exception_dump_test(int argc , char **argv) } // test debug //KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] Passe of que=%d, pkt_size=%d\n", \ - // __FUNCTION__, test_que_no, pkt_sz)); + // __func__, test_que_no, pkt_sz)); } } KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] Each que sent %d packets, Total sent packet number before exception = %d\n", \ - __FUNCTION__, expect_num/HIF_MAX_ULQ_NUM, expect_num)); + __func__, expect_num/HIF_MAX_ULQ_NUM, expect_num)); if(KAL_SUCCESS != sdio_func1_rd(SDIO_IP_WHIER, &int_temp_mask, 4)) return RET_FAIL; @@ -11051,12 +11051,12 @@ static int t_dev_exception_dump_test(int argc , char **argv) { KAL_DBGPRINT(KAL, DBG_TRACE, ("[%s] sending in que=%d, pkt_size=%d, pkt_num=%d ...\n", \ - __FUNCTION__, test_que_no, pkt_sz, idx)); + __func__, test_que_no, pkt_sz, idx)); ret = sdio_send_pkt(test_que_no, pkt_sz, 0, 0); expect_num++; if (ret != RET_SUCCESS) { - KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] Tx basic test fail at sent pkt !\n",__FUNCTION__)); + KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] Tx basic test fail at sent pkt !\n",__func__)); /*send packet fail and retry*/ return ret; } @@ -11101,7 +11101,7 @@ static int t_dev_set_abnormal_stall(int argc , char **argv) for (idx = 1 ; idx < argc ; idx ++) { arg[idx-1] = str_to_int(argv[idx]); - printk(KERN_ERR "[%s] param[%d] = %d\n",__FUNCTION__,idx-1, arg[idx-1]); + printk(KERN_ERR "[%s] param[%d] = %d\n",__func__,idx-1, arg[idx-1]); } if(1 == arg[0]){ diff --git a/drivers/misc/mediatek/eemcs/lte_dev_test_lib.c b/drivers/misc/mediatek/eemcs/lte_dev_test_lib.c index 7c46bdddd..5c982d4ac 100644 --- a/drivers/misc/mediatek/eemcs/lte_dev_test_lib.c +++ b/drivers/misc/mediatek/eemcs/lte_dev_test_lib.c @@ -459,7 +459,7 @@ int f_compare_fragment_pattern(struct sk_buff *dl_skb, unsigned int que_num) buf = dl_skb->data; pkt_len = dl_skb->len; - KAL_DBGPRINT(KAL, DBG_TRACE,("[TRACE][%s:%d] recv one packet que_num=%d, len=%d!!\n",__FUNCTION__,__LINE__,que_num,pkt_len)); + KAL_DBGPRINT(KAL, DBG_TRACE,("[TRACE][%s:%d] recv one packet que_num=%d, len=%d!!\n",__func__,__LINE__,que_num,pkt_len)); /*start packet of this fragment transfer, assume 1st packet contain whole packet header*/ @@ -477,8 +477,8 @@ int f_compare_fragment_pattern(struct sk_buff *dl_skb, unsigned int que_num) p_frag_ctrl->xfered_len = 0; return RET_FAIL; } - KAL_DBGPRINT(KAL, DBG_TRACE,("[TRACE][%s:%d] auto-test transfer start!!\n",__FUNCTION__,__LINE__)); - KAL_DBGPRINT(KAL, DBG_TRACE,("[TRACE][%s:%d] expect_len=%d, cur_len=%d, cur_pkt_cnt=%d!!\n",__FUNCTION__,__LINE__ + KAL_DBGPRINT(KAL, DBG_TRACE,("[TRACE][%s:%d] auto-test transfer start!!\n",__func__,__LINE__)); + KAL_DBGPRINT(KAL, DBG_TRACE,("[TRACE][%s:%d] expect_len=%d, cur_len=%d, cur_pkt_cnt=%d!!\n",__func__,__LINE__ ,p_frag_ctrl->expected_xfer_len,p_frag_ctrl->xfered_len, p_frag_ctrl->xfered_pkt_idx)); data_char = pAtHeader->RndSeed; @@ -501,8 +501,8 @@ int f_compare_fragment_pattern(struct sk_buff *dl_skb, unsigned int que_num) first_gpd_of_pkt = true; } else { - KAL_DBGPRINT(KAL, DBG_TRACE,("[TRACE][%s:%d] auto-test in progress!!\n",__FUNCTION__,__LINE__)); - KAL_DBGPRINT(KAL, DBG_TRACE,("[TRACE][%s:%d] expect_len=%d, cur_len=%d, cur_pkt_cnt=%d!!\n",__FUNCTION__,__LINE__ + KAL_DBGPRINT(KAL, DBG_TRACE,("[TRACE][%s:%d] auto-test in progress!!\n",__func__,__LINE__)); + KAL_DBGPRINT(KAL, DBG_TRACE,("[TRACE][%s:%d] expect_len=%d, cur_len=%d, cur_pkt_cnt=%d!!\n",__func__,__LINE__ ,p_frag_ctrl->expected_xfer_len,p_frag_ctrl->xfered_len, p_frag_ctrl->xfered_pkt_idx)); p_frag_ctrl->xfered_len += dl_skb->len; p_frag_ctrl->xfered_pkt_idx ++; @@ -523,18 +523,18 @@ int f_compare_fragment_pattern(struct sk_buff *dl_skb, unsigned int que_num) if (pkt_len == 0) { - KAL_DBGPRINT(KAL, DBG_ERROR,("[ERR][%s:%d] Zero Pkt received que_num=%d , pkt_len=%d!!\n",__FUNCTION__,__LINE__, que_num , pkt_len)); + KAL_DBGPRINT(KAL, DBG_ERROR,("[ERR][%s:%d] Zero Pkt received que_num=%d , pkt_len=%d!!\n",__func__,__LINE__, que_num , pkt_len)); return RET_FAIL; } /*means latest fragment packet of this auto-test transfer*/ if (p_frag_ctrl->xfered_len == p_frag_ctrl->expected_xfer_len) { - KAL_DBGPRINT(KAL, DBG_TRACE,( "[TRACE][%s:%d] auto-test end!!\n",__FUNCTION__,__LINE__)); - KAL_DBGPRINT(KAL, DBG_TRACE,("[TRACE][%s:%d] expect_len=%d, cur_len=%d, cur_pkt_cnt=%d!!\n",__FUNCTION__,__LINE__ + KAL_DBGPRINT(KAL, DBG_TRACE,( "[TRACE][%s:%d] auto-test end!!\n",__func__,__LINE__)); + KAL_DBGPRINT(KAL, DBG_TRACE,("[TRACE][%s:%d] expect_len=%d, cur_len=%d, cur_pkt_cnt=%d!!\n",__func__,__LINE__ ,p_frag_ctrl->expected_xfer_len,p_frag_ctrl->xfered_len, p_frag_ctrl->xfered_pkt_idx)); if (p_frag_ctrl->xfered_len < sizeof(AT_PKT_HEADER)) { - KAL_DBGPRINT(KAL, DBG_WARN,("[WARN][%s:%d] que_num=%d , pkt_len=%d length less than header!!\n",__FUNCTION__,__LINE__, que_num , pkt_len)); + KAL_DBGPRINT(KAL, DBG_WARN,("[WARN][%s:%d] que_num=%d , pkt_len=%d length less than header!!\n",__func__,__LINE__, que_num , pkt_len)); ret = RET_SUCCESS; } /*set xfered_len as 0 to start another auto-test transfer*/ @@ -548,7 +548,7 @@ int f_compare_fragment_pattern(struct sk_buff *dl_skb, unsigned int que_num) // TODO: Remove this [else if] when Tx header can be auto removed by HW if (dl_skb->len != (recv_frag_ctrl[que_idx].max_frag_unit_sz - 4) ) { KAL_DBGPRINT(KAL, DBG_ERROR,("[ERR][%s:%d] fragment length error , recv_len=%d, expected allow_len=(%d-4) (Because Tx Header)!!\n", - __FUNCTION__,__LINE__,dl_skb->len,recv_frag_ctrl[que_idx].max_frag_unit_sz)); + __func__,__LINE__,dl_skb->len,recv_frag_ctrl[que_idx].max_frag_unit_sz)); ret = RET_FAIL; } first_gpd_of_pkt = false; @@ -557,7 +557,7 @@ int f_compare_fragment_pattern(struct sk_buff *dl_skb, unsigned int que_num) else { /*if not the end of the fragment transfer, the usb transfer size should be == rgpd/bd allow length*/ if (dl_skb->len != recv_frag_ctrl[que_idx].max_frag_unit_sz) { KAL_DBGPRINT(KAL, DBG_ERROR,("[ERR][%s:%d] fragment length error , recv_len=%d, expected allow_len=%d!!\n", - __FUNCTION__,__LINE__,dl_skb->len,recv_frag_ctrl[que_idx].max_frag_unit_sz)); + __func__,__LINE__,dl_skb->len,recv_frag_ctrl[que_idx].max_frag_unit_sz)); ret = RET_FAIL; } } @@ -692,7 +692,7 @@ int f_wait_recv_pkt_cnt(unsigned int expect_num , unsigned int timeout_ms) } } if (recv_th_rslt != RET_SUCCESS) { - KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s:%d] f_wait_recv_pkt_cnt compare fail\n", __FUNCTION__, __LINE__)); + KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s:%d] f_wait_recv_pkt_cnt compare fail\n", __func__, __LINE__)); return RET_FAIL; } KAL_SLEEP_MSEC(1) ; @@ -700,12 +700,12 @@ int f_wait_recv_pkt_cnt(unsigned int expect_num , unsigned int timeout_ms) if (msg_delay > 1000) { msg_delay = 0; KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s:%d] f_wait_recv_pkt_cnt waiting for %d ms, expect=%d pkts , cur=%d pkts \n", - __FUNCTION__, __LINE__, idx, expect_num,cur_pkt_num )); + __func__, __LINE__, idx, expect_num,cur_pkt_num )); } } if (idx >= timeout_ms) { - KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s:%d] f_wait_recv_pkt_cnt timeout\n", __FUNCTION__, __LINE__)); + KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s:%d] f_wait_recv_pkt_cnt timeout\n", __func__, __LINE__)); ret = RET_FAIL; } @@ -764,7 +764,7 @@ int f_ul_rgpd_allow_len_tst(unsigned int txq_no ,athif_ul_rgpd_format_t *p_rgpd_ total_allow_len = p_rgpd_format->rgpd_allow_len; } if (total_allow_len == 0) { - KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s : %d] RGPD allow length configure err\n",__FUNCTION__ ,__LINE__)); + KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s : %d] RGPD allow length configure err\n",__func__ ,__LINE__)); return RET_FAIL; } @@ -799,7 +799,7 @@ int f_ul_rgpd_allow_len_tst(unsigned int txq_no ,athif_ul_rgpd_format_t *p_rgpd_ break; } if (recv_th_rslt != RET_SUCCESS) { - KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] recv thread report fail\n", __FUNCTION__)); + KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] recv thread report fail\n", __func__)); ret = RET_FAIL; break; } @@ -809,10 +809,10 @@ int f_ul_rgpd_allow_len_tst(unsigned int txq_no ,athif_ul_rgpd_format_t *p_rgpd_ /*wait loopback data*/ ret = f_wait_recv_pkt_cnt(pkt_cnt, 10000); if (ret != RET_SUCCESS) { - KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] f_wait_recv_pkt_cnt timeout\n", __FUNCTION__)); + KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] f_wait_recv_pkt_cnt timeout\n", __func__)); } if (recv_th_rslt != RET_SUCCESS) { - KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] recv thread report fail\n", __FUNCTION__)); + KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] recv thread report fail\n", __func__)); ret = RET_FAIL; } recv_th_rslt = RET_SUCCESS; @@ -887,7 +887,7 @@ int f_small_pkt_lb(lb_data_pattern_e pattern) break; } if (recv_th_rslt != RET_SUCCESS) { - KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] recv thread report fail\n", __FUNCTION__)); + KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] recv thread report fail\n", __func__)); ret = RET_FAIL; break; } @@ -896,11 +896,11 @@ int f_small_pkt_lb(lb_data_pattern_e pattern) /*wait loopback data*/ ret = f_wait_recv_pkt_cnt(max_size-min_size , 10000); if (ret != RET_SUCCESS) { - KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] f_wait_recv_pkt_cnt timeout\n", __FUNCTION__)); + KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] f_wait_recv_pkt_cnt timeout\n", __func__)); break; } if (recv_th_rslt != RET_SUCCESS) { - KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] recv thread report fail\n", __FUNCTION__)); + KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] recv thread report fail\n", __func__)); ret = RET_FAIL; break; } @@ -1021,11 +1021,11 @@ int f_tx_rx_ep0_perf_lb(unsigned int loop, unsigned int offset, unsigned int pkt if (pktSize > MAX_UL_PKT_SIZE) { pktSize = MAX_UL_PKT_SIZE; - KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] pktSize error len=%d \n", __FUNCTION__,pktSize)); + KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] pktSize error len=%d \n", __func__,pktSize)); } if (pktSize == 0) { pktSize = 100; - KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] pktSize error len=%d \n", __FUNCTION__,pktSize)); + KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] pktSize error len=%d \n", __func__,pktSize)); } transferdata+=pktSize; @@ -1038,7 +1038,7 @@ int f_tx_rx_ep0_perf_lb(unsigned int loop, unsigned int offset, unsigned int pkt break; } if (recv_th_rslt != RET_SUCCESS) { - KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] recv thread report fail\n", __FUNCTION__)); + KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] recv thread report fail\n", __func__)); ret = RET_FAIL; break; } @@ -1048,23 +1048,23 @@ int f_tx_rx_ep0_perf_lb(unsigned int loop, unsigned int offset, unsigned int pkt if (chk_payload) { ret = f_wait_recv_pkt_cnt(packetnum , 100000); if (ret != RET_SUCCESS) { - KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] f_wait_recv_pkt_cnt timeout\n", __FUNCTION__)); + KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] f_wait_recv_pkt_cnt timeout\n", __func__)); break; } if (recv_th_rslt != RET_SUCCESS) { - KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] recv thread report fail\n", __FUNCTION__)); + KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] recv thread report fail\n", __func__)); ret = RET_FAIL; break; } if (cmp_pattern == ATCASE_LB_DATA_FRAGMENT) { if (packetnum != recv_total_pkt_cnt_agg) { - KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] recv fragment pattern pkt number mismatch expect=%d, recv=%d\n", __FUNCTION__,packetnum , recv_total_pkt_cnt_agg)); + KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] recv fragment pattern pkt number mismatch expect=%d, recv=%d\n", __func__,packetnum , recv_total_pkt_cnt_agg)); ret = RET_FAIL; break; } } else { if (packetnum != recv_total_pkt_cnt) { - KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] recv auto pattern pkt number mismatch expect=%d, recv=%d\n", __FUNCTION__,packetnum , recv_total_pkt_cnt)); + KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] recv auto pattern pkt number mismatch expect=%d, recv=%d\n", __func__,packetnum , recv_total_pkt_cnt)); ret = RET_FAIL; break; } @@ -1077,9 +1077,9 @@ int f_tx_rx_ep0_perf_lb(unsigned int loop, unsigned int offset, unsigned int pkt diff_ms += (diff_t.tv_nsec / 1000000); performance = ((unsigned int)transferdata / (unsigned int)diff_ms); - KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] performance = %d KBPS\n", __FUNCTION__, performance )); - KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] transfered data=%u\n", __FUNCTION__, transferdata)); - KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] diff_ms=%u\n", __FUNCTION__, diff_ms)); + KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] performance = %d KBPS\n", __func__, performance )); + KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] transfered data=%u\n", __func__, transferdata)); + KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] diff_ms=%u\n", __func__, diff_ms)); recv_total_pkt_cnt = 0; recv_total_pkt_cnt_agg = 0; @@ -1162,9 +1162,9 @@ int f_rx_perf_tst(unsigned int loop, unsigned int offset, unsigned int pkt_num, diff_ms = (1000 * diff_t.tv_sec) ; diff_ms += (diff_t.tv_nsec / 1000000); performance = ((unsigned int)recv_total_bytes_cnt / (unsigned int)diff_ms); - KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] performance = %d KBPS\n", __FUNCTION__, performance )); - KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] transfered data=%u\n", __FUNCTION__, recv_total_bytes_cnt)); - KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] diff_ms=%u\n", __FUNCTION__, diff_ms)); + KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] performance = %d KBPS\n", __func__, performance )); + KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] transfered data=%u\n", __func__, recv_total_bytes_cnt)); + KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] diff_ms=%u\n", __func__, diff_ms)); /*reset the profile variable*/ recv_total_pkt_cnt = 0; @@ -1193,14 +1193,14 @@ int f_rx_perf_tst(unsigned int loop, unsigned int offset, unsigned int pkt_num, diff_ms = (1000 * diff_t.tv_sec) ; diff_ms += (diff_t.tv_nsec / 1000000); if (diff_ms > 120*1000) { - KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] wait recv timeout %d ms , recv_cnt=%d\n", __FUNCTION__,diff_ms, recv_total_pkt_cnt)); + KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] wait recv timeout %d ms , recv_cnt=%d\n", __func__,diff_ms, recv_total_pkt_cnt)); ret = RET_FAIL; break; } KAL_SLEEP_MSEC(0); } if (ret != RET_SUCCESS) { - KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] fail , loop=%d, recv_cnt=%d\n", __FUNCTION__,loop , recv_total_pkt_cnt)); + KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] fail , loop=%d, recv_cnt=%d\n", __func__,loop , recv_total_pkt_cnt)); break; } @@ -1319,12 +1319,12 @@ int f_ul_cs_err_tst(unsigned int cs_len, unsigned int is_bd) if ((device_int_st->UL0_INTR_Status & 0xFFFFFF00) != 0) { KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s:%d] cs err intr cmp fail, is_bd=%d, cs_len=%d ,q_num=%d, ul_int=%x !\n" - ,__FUNCTION__,__LINE__,is_bd, cs_len, q_num, device_int_st->UL0_INTR_Status)); + ,__func__,__LINE__,is_bd, cs_len, q_num, device_int_st->UL0_INTR_Status)); ret = RET_FAIL; return ret; } else { KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s:%d] cs err intr cmp success, is_bd=%d, cs_len=%d ,q_num=%d !\n" - ,__FUNCTION__,__LINE__,is_bd, cs_len, q_num)); + ,__func__,__LINE__,is_bd, cs_len, q_num)); } } @@ -1346,12 +1346,12 @@ int f_ul_cs_err_tst(unsigned int cs_len, unsigned int is_bd) /*the rx/rx err interrupt info is bit-map*/ if ((device_int_st->UL0_INTR_Status & 0xFFFFFF00) != ORG_SDIO_TXQ_CHKSUM_ERR(q_num)){ KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s:%d] cs err intr cmp fail, is_bd=%d, cs_len=%d ,q_num=%d, ul_int=%x !\n" - ,__FUNCTION__,__LINE__,is_bd, cs_len, q_num, device_int_st->UL0_INTR_Status)); + ,__func__,__LINE__,is_bd, cs_len, q_num, device_int_st->UL0_INTR_Status)); ret = RET_FAIL; return ret; } else { KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s:%d] cs err intr cmp success, is_bd=%d, cs_len=%d ,q_num=%d !\n" - ,__FUNCTION__,__LINE__,is_bd, cs_len, q_num)); + ,__func__,__LINE__,is_bd, cs_len, q_num)); } } @@ -1366,9 +1366,9 @@ int f_ul_cs_err_tst(unsigned int cs_len, unsigned int is_bd) p_rgpd_rslt = (athif_local_rgpd_rslt_t *)athif_result_save_t->buf; //don't care fail count, because some GPD HWO=1 if ((p_rgpd_rslt->correct_cnt != cs_err_position) || (p_rgpd_rslt->free_cnt != expect_free_cnt)) { - KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s:%d] q_num=%d, local_rgpd_result fail !\n",__FUNCTION__,__LINE__, q_num)); + KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s:%d] q_num=%d, local_rgpd_result fail !\n",__func__,__LINE__, q_num)); KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s:%d] fail_cnt=%d, correct_cnt=%d, free_cnt=%d !\n", - __FUNCTION__,__LINE__, p_rgpd_rslt->fail_cnt, p_rgpd_rslt->correct_cnt, p_rgpd_rslt->free_cnt)); + __func__,__LINE__, p_rgpd_rslt->fail_cnt, p_rgpd_rslt->correct_cnt, p_rgpd_rslt->free_cnt)); ret = RET_FAIL; return ret; } @@ -1513,11 +1513,11 @@ int f_dl_cs_err_tst(unsigned int cs_len, unsigned int is_bd) /*wait expected received pkt count*/ if (ret = f_wait_recv_pkt_cnt(cs_err_position , 100000) == RET_FAIL) { - KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s:%d] wait recv pkt cnt timeout, expect %d pkts !\n",__FUNCTION__,__LINE__, valid_pkt_cnt)); + KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s:%d] wait recv pkt cnt timeout, expect %d pkts !\n",__func__,__LINE__, valid_pkt_cnt)); return ret; } else { if (recv_th_rslt != RET_SUCCESS) { - KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s:%d] recv packet payload compare fail !\n",__FUNCTION__,__LINE__)); + KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s:%d] recv packet payload compare fail !\n",__func__,__LINE__)); return RET_FAIL; } } @@ -1531,7 +1531,7 @@ int f_dl_cs_err_tst(unsigned int cs_len, unsigned int is_bd) else { //compare expected interrupt information p_tgpd_rslt = athif_result_save_t->buf; if ((p_tgpd_rslt->sent_cnt != cs_err_position) || (p_tgpd_rslt->free_cnt != expect_free_cnt)) { - KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s:%d] q_num=%d, local_rgpd_result fail !\n",__FUNCTION__,__LINE__, q_num)); + KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s:%d] q_num=%d, local_rgpd_result fail !\n",__func__,__LINE__, q_num)); ret = RET_FAIL; return ret; } @@ -1548,12 +1548,12 @@ int f_dl_cs_err_tst(unsigned int cs_len, unsigned int is_bd) if (device_int_st->DL0_INTR_Status & 0x00FF0000 != ORG_SDIO_RXQ_CHKSUM_ERR(q_num)) { KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s:%d] checksum test fail, cs_len=%d, is_bd=%d ,q_num=%d ,dl0_int=%x !\n" - ,__FUNCTION__,__LINE__, cs_len, is_bd, q_num, device_int_st->DL0_INTR_Status)); + ,__func__,__LINE__, cs_len, is_bd, q_num, device_int_st->DL0_INTR_Status)); ret = RET_FAIL; return ret; } else { KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s:%d] checksum test success, cs_len=%d, is_bd=%d ,q_num=%d !\n" - ,__FUNCTION__,__LINE__, cs_len, is_bd, q_num)); + ,__func__,__LINE__, cs_len, is_bd, q_num)); } } cmd.cmd = SDIO_AT_RESET_DL_QUEUE; @@ -1688,11 +1688,11 @@ int tx_perf_hw_limit(unsigned int loop, unsigned int offset, unsigned int pkt_md if (pktSize > MAX_UL_PKT_SIZE) { pktSize = MAX_UL_PKT_SIZE; - KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] pktSize error len=%d \n", __FUNCTION__,pktSize)); + KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] pktSize error len=%d \n", __func__,pktSize)); } if (pktSize == 0) { pktSize = 100; - KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] pktSize error len=%d \n", __FUNCTION__,pktSize)); + KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] pktSize error len=%d \n", __func__,pktSize)); } tx_header_temp = (sdio_tx_sdu_header *)buf_pt; @@ -1842,7 +1842,7 @@ int tx_perf_hw_limit(unsigned int loop, unsigned int offset, unsigned int pkt_md Tx_avail_GPD[tx_ep] -= pkt_no_thistime; if (recv_th_rslt != RET_SUCCESS) { - KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] recv thread report fail\n", __FUNCTION__)); + KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] recv thread report fail\n", __func__)); ret = RET_FAIL; break; } @@ -1857,9 +1857,9 @@ int tx_perf_hw_limit(unsigned int loop, unsigned int offset, unsigned int pkt_md diff_ms += (diff_t.tv_nsec / 1000000); performance = ((unsigned int)transferdata / (unsigned int)diff_ms); - KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] performance = %d KBPS\n", __FUNCTION__, performance )); - KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] transfered data=%u\n", __FUNCTION__, transferdata)); - KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] diff_ms=%u\n", __FUNCTION__, diff_ms)); + KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] performance = %d KBPS\n", __func__, performance )); + KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] transfered data=%u\n", __func__, transferdata)); + KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] diff_ms=%u\n", __func__, diff_ms)); recv_total_pkt_cnt = 0; recv_total_pkt_cnt_agg = 0; @@ -1914,7 +1914,7 @@ int f_brom_pkt_lb(lb_data_pattern_e pattern, unsigned int min_size, unsigned int break; } if (recv_th_rslt != RET_SUCCESS) { - KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] recv thread report fail\n", __FUNCTION__)); + KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] recv thread report fail\n", __func__)); ret = RET_FAIL; break; } @@ -1924,10 +1924,10 @@ int f_brom_pkt_lb(lb_data_pattern_e pattern, unsigned int min_size, unsigned int /*wait loopback data*/ ret = f_wait_recv_pkt_cnt(max_size-min_size , 10000); if (ret != RET_SUCCESS) { - KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] f_wait_recv_pkt_cnt timeout\n", __FUNCTION__)); + KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] f_wait_recv_pkt_cnt timeout\n", __func__)); } if (recv_th_rslt != RET_SUCCESS) { - KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] recv thread report fail\n", __FUNCTION__)); + KAL_DBGPRINT(KAL, DBG_ERROR, ("[%s] recv thread report fail\n", __func__)); ret = RET_FAIL; } recv_th_rslt = RET_SUCCESS; diff --git a/drivers/misc/mediatek/emd_ctl/ext_md_ctl_chr_dev.c b/drivers/misc/mediatek/emd_ctl/ext_md_ctl_chr_dev.c index 7079b8ffd..3b0a03f7a 100644 --- a/drivers/misc/mediatek/emd_ctl/ext_md_ctl_chr_dev.c +++ b/drivers/misc/mediatek/emd_ctl/ext_md_ctl_chr_dev.c @@ -108,9 +108,9 @@ do { \ printk("[ext-md-ctl]" fmt , ##args); \ } while(0) /*---------------------------------------------------------------------------*/ -#define EMD_FUNC_ENTER(f) EMD_DBG_MSG(FUNC, "%s ++\n", __FUNCTION__) +#define EMD_FUNC_ENTER(f) EMD_DBG_MSG(FUNC, "%s ++\n", __func__) #define EMD_PM_MSG(fmt, args...) EMD_DBG_MSG(MISC, fmt, ##args) -#define EMD_FUNC_EXIT(f) EMD_DBG_MSG(FUNC, "%s -- %d\n", __FUNCTION__, f) +#define EMD_FUNC_EXIT(f) EMD_DBG_MSG(FUNC, "%s -- %d\n", __func__, f) #define EMD_MISC_MSG(fmt, args...) EMD_DBG_MSG(MISC, fmt, ##args) /****************************************************************************************** diff --git a/drivers/misc/mediatek/exm/exm_dlmalloc.c b/drivers/misc/mediatek/exm/exm_dlmalloc.c index df1f14312..ac8a3592a 100644 --- a/drivers/misc/mediatek/exm/exm_dlmalloc.c +++ b/drivers/misc/mediatek/exm/exm_dlmalloc.c @@ -120,7 +120,7 @@ static void extmem_init(void) { extmem_printk("[EXT_MEM] extmem_phys_base:0x%p,extmem_mspace_size: 0x%zx,extmem_mspace:0x%p\n", (void *)extmem_phys_base, extmem_mspace_size, extmem_mspace); extmem_printk("[EXT_MEM] %s extmem current used: 0x%zx, peak used: 0x%zx\n", - __FUNCTION__, mspace_mem_used(extmem_mspace), mspace_mem_used_peak(extmem_mspace)); + __func__, mspace_mem_used(extmem_mspace), mspace_mem_used_peak(extmem_mspace)); } } #else @@ -159,9 +159,9 @@ void* extmem_malloc(size_t bytes) { void *mem = NULL; extmem_init(); mem = mspace_malloc(extmem_mspace, bytes); - extmem_printk("[EXT_MEM] %s mem:0x%p, size: 0x%zx\n", __FUNCTION__, mem, bytes); + extmem_printk("[EXT_MEM] %s mem:0x%p, size: 0x%zx\n", __func__, mem, bytes); extmem_printk("[EXT_MEM] %s extmem current used: 0x%zx, peak used: 0x%zx\n", - __FUNCTION__, mspace_mem_used(extmem_mspace), mspace_mem_used_peak(extmem_mspace)); + __func__, mspace_mem_used(extmem_mspace), mspace_mem_used_peak(extmem_mspace)); return mem; } EXPORT_SYMBOL(extmem_malloc); @@ -170,19 +170,19 @@ void* extmem_malloc_page_align(size_t bytes) { void *mem = NULL; extmem_init(); mem = mspace_memalign(extmem_mspace, 1<<PAGE_SHIFT, bytes); - extmem_printk("[EXT_MEM] %s mem:0x%p, size: 0x%zx\n", __FUNCTION__, mem, bytes); + extmem_printk("[EXT_MEM] %s mem:0x%p, size: 0x%zx\n", __func__, mem, bytes); extmem_printk("[EXT_MEM] %s extmem current used: 0x%zx, peak used: 0x%zx\n", - __FUNCTION__, mspace_mem_used(extmem_mspace), mspace_mem_used_peak(extmem_mspace)); + __func__, mspace_mem_used(extmem_mspace), mspace_mem_used_peak(extmem_mspace)); return mem; } EXPORT_SYMBOL(extmem_malloc_page_align); void extmem_free(void* mem) { - extmem_printk("[EXT_MEM] %s addr:0x%p\n", __FUNCTION__, mem); + extmem_printk("[EXT_MEM] %s addr:0x%p\n", __func__, mem); if (extmem_mspace != NULL) { mspace_free(extmem_mspace, mem); extmem_printk("[EXT_MEM] %s extmem current used: 0x%zx, peak used: 0x%zx\n", - __FUNCTION__, mspace_mem_used(extmem_mspace), mspace_mem_used_peak(extmem_mspace)); + __func__, mspace_mem_used(extmem_mspace), mspace_mem_used_peak(extmem_mspace)); } } EXPORT_SYMBOL(extmem_free); @@ -191,7 +191,7 @@ static unsigned long get_phys_from_mspace(unsigned long va) { #ifdef CONFIG_OF extmem_printk("[EXT_MEM] %s va: 0x%lx extmem_phys_base:0x%p extmem_mspace_base:0x%p\n", - __FUNCTION__, va, (void *)extmem_phys_base, extmem_mspace_base); + __func__, va, (void *)extmem_phys_base, extmem_mspace_base); return ( va - (unsigned long)extmem_mspace_base + extmem_phys_base); #else return ( va - (unsigned long)extmem_mspace_base + get_max_phys_addr()); @@ -202,7 +202,7 @@ unsigned long get_virt_from_mspace(unsigned long pa) { #ifdef CONFIG_OF extmem_printk("[EXT_MEM] %s pa:0x%lx extmem_phys_base:0x%p extmem_mspace_base:0x%p\n", - __FUNCTION__, pa, (void *)extmem_phys_base, extmem_mspace_base); + __func__, pa, (void *)extmem_phys_base, extmem_mspace_base); return ( pa - extmem_phys_base + (unsigned long)extmem_mspace_base); #else return ( pa - get_max_phys_addr() + (unsigned long)extmem_mspace_base); @@ -232,7 +232,7 @@ size_t extmem_get_mem_size(unsigned long pgoff) mchunkptr p = mem2chunk(va); size_t psize = chunksize(p) - TWO_SIZE_T_SIZES; - extmem_printk("[EXT_MEM] %s size: %zu\n", __FUNCTION__, psize); + extmem_printk("[EXT_MEM] %s size: %zu\n", __func__, psize); return psize; } EXPORT_SYMBOL(extmem_get_mem_size); @@ -253,7 +253,7 @@ static int mtk_mspace_mmap_physical(struct exm_info *info, struct vm_area_struct va = extmem_malloc_page_align(size); if (!va) { - printk(KERN_ERR "[EXT_MEM] %s failed...\n", __FUNCTION__); + printk(KERN_ERR "[EXT_MEM] %s failed...\n", __func__); return -ENOMEM; } @@ -277,7 +277,7 @@ static int mtk_mspace_mmap_physical(struct exm_info *info, struct vm_area_struct extmem_printk("[EXT_MEM] pa:0x%lx, va:0x%p, vma->vm_pgoff:0x%lx, vm_start:0x%lx, vm_end:0x%lx, vm_page_prot:0x%zx\n", pa, va, vma->vm_pgoff, vma->vm_start, vma->vm_end, (size_t)pgprot_val(vma->vm_page_prot)); if (ret) { - printk(KERN_ERR "[EXT_MEM] %s fail ret:%d\n", __FUNCTION__, ret); + printk(KERN_ERR "[EXT_MEM] %s fail ret:%d\n", __func__, ret); } return ret; @@ -352,7 +352,7 @@ static struct platform_driver mt_mspace_driver = { static int __init mt_mspace_init(void) { - extmem_printk("[EXT_MEM] %s\n", __FUNCTION__); + extmem_printk("[EXT_MEM] %s\n", __func__); return platform_driver_register(&mt_mspace_driver); } diff --git a/drivers/misc/mediatek/flashlight/src/mt6735/constant_flashlight/leds_strobe.c b/drivers/misc/mediatek/flashlight/src/mt6735/constant_flashlight/leds_strobe.c index d5305b4a9..9a12362e7 100644 --- a/drivers/misc/mediatek/flashlight/src/mt6735/constant_flashlight/leds_strobe.c +++ b/drivers/misc/mediatek/flashlight/src/mt6735/constant_flashlight/leds_strobe.c @@ -53,13 +53,13 @@ #define TAG_NAME "[leds_strobe.c]" #define PK_DBG_NONE(fmt, arg...) do {} while (0) -#define PK_DBG_FUNC(fmt, arg...) xlog_printk(ANDROID_LOG_DEBUG , TAG_NAME, KERN_INFO "%s: " fmt, __FUNCTION__ ,##arg) -#define PK_WARN(fmt, arg...) xlog_printk(ANDROID_LOG_WARNING, TAG_NAME, KERN_WARNING "%s: " fmt, __FUNCTION__ ,##arg) -#define PK_NOTICE(fmt, arg...) xlog_printk(ANDROID_LOG_DEBUG , TAG_NAME, KERN_NOTICE "%s: " fmt, __FUNCTION__ ,##arg) -#define PK_INFO(fmt, arg...) xlog_printk(ANDROID_LOG_INFO , TAG_NAME, KERN_INFO "%s: " fmt, __FUNCTION__ ,##arg) -#define PK_TRC_FUNC(f) xlog_printk(ANDROID_LOG_DEBUG , TAG_NAME, "<%s>\n", __FUNCTION__); +#define PK_DBG_FUNC(fmt, arg...) xlog_printk(ANDROID_LOG_DEBUG , TAG_NAME, KERN_INFO "%s: " fmt, __func__ ,##arg) +#define PK_WARN(fmt, arg...) xlog_printk(ANDROID_LOG_WARNING, TAG_NAME, KERN_WARNING "%s: " fmt, __func__ ,##arg) +#define PK_NOTICE(fmt, arg...) xlog_printk(ANDROID_LOG_DEBUG , TAG_NAME, KERN_NOTICE "%s: " fmt, __func__ ,##arg) +#define PK_INFO(fmt, arg...) xlog_printk(ANDROID_LOG_INFO , TAG_NAME, KERN_INFO "%s: " fmt, __func__ ,##arg) +#define PK_TRC_FUNC(f) xlog_printk(ANDROID_LOG_DEBUG , TAG_NAME, "<%s>\n", __func__); #define PK_TRC_VERBOSE(fmt, arg...) xlog_printk(ANDROID_LOG_VERBOSE, TAG_NAME, fmt, ##arg) -#define PK_ERROR(fmt, arg...) xlog_printk(ANDROID_LOG_ERROR , TAG_NAME, KERN_ERR "%s: " fmt, __FUNCTION__ ,##arg) +#define PK_ERROR(fmt, arg...) xlog_printk(ANDROID_LOG_ERROR , TAG_NAME, KERN_ERR "%s: " fmt, __func__ ,##arg) #define DEBUG_LEDS_STROBE diff --git a/drivers/misc/mediatek/flashlight/src/mt6735/dummy_flashlight/dummy_flashlight.c b/drivers/misc/mediatek/flashlight/src/mt6735/dummy_flashlight/dummy_flashlight.c index 60d92badf..b56e36285 100644 --- a/drivers/misc/mediatek/flashlight/src/mt6735/dummy_flashlight/dummy_flashlight.c +++ b/drivers/misc/mediatek/flashlight/src/mt6735/dummy_flashlight/dummy_flashlight.c @@ -36,13 +36,13 @@ ******************************************************************************/ #define TAG_NAME "[dummy_flashlight.c]" #define PK_DBG_NONE(fmt, arg...) do {} while (0) -#define PK_DBG_FUNC(fmt, arg...) pr_debug(ANDROID_LOG_DEBUG , TAG_NAME, KERN_INFO "%s: " fmt, __FUNCTION__ ,##arg) -#define PK_WARN(fmt, arg...) pr_debug(ANDROID_LOG_WARNING, TAG_NAME, KERN_WARNING "%s: " fmt, __FUNCTION__ ,##arg) -#define PK_NOTICE(fmt, arg...) pr_debug(ANDROID_LOG_DEBUG , TAG_NAME, KERN_NOTICE "%s: " fmt, __FUNCTION__ ,##arg) -#define PK_INFO(fmt, arg...) pr_debug(ANDROID_LOG_INFO , TAG_NAME, KERN_INFO "%s: " fmt, __FUNCTION__ ,##arg) -#define PK_TRC_FUNC(f) pr_debug(ANDROID_LOG_DEBUG , TAG_NAME, "<%s>\n", __FUNCTION__); +#define PK_DBG_FUNC(fmt, arg...) pr_debug(ANDROID_LOG_DEBUG , TAG_NAME, KERN_INFO "%s: " fmt, __func__ ,##arg) +#define PK_WARN(fmt, arg...) pr_debug(ANDROID_LOG_WARNING, TAG_NAME, KERN_WARNING "%s: " fmt, __func__ ,##arg) +#define PK_NOTICE(fmt, arg...) pr_debug(ANDROID_LOG_DEBUG , TAG_NAME, KERN_NOTICE "%s: " fmt, __func__ ,##arg) +#define PK_INFO(fmt, arg...) pr_debug(ANDROID_LOG_INFO , TAG_NAME, KERN_INFO "%s: " fmt, __func__ ,##arg) +#define PK_TRC_FUNC(f) pr_debug(ANDROID_LOG_DEBUG , TAG_NAME, "<%s>\n", __func__); #define PK_TRC_VERBOSE(fmt, arg...) pr_debug(ANDROID_LOG_VERBOSE, TAG_NAME, fmt, ##arg) -#define PK_ERROR(fmt, arg...) pr_debug(ANDROID_LOG_ERROR , TAG_NAME, KERN_ERR "%s: " fmt, __FUNCTION__ ,##arg) +#define PK_ERROR(fmt, arg...) pr_debug(ANDROID_LOG_ERROR , TAG_NAME, KERN_ERR "%s: " fmt, __func__ ,##arg) //#define DEBUG_LEDS_STROBE diff --git a/drivers/misc/mediatek/flashlight/src/mt6735/kd_flashlightlist.c b/drivers/misc/mediatek/flashlight/src/mt6735/kd_flashlightlist.c index 595511314..6cb095e33 100644 --- a/drivers/misc/mediatek/flashlight/src/mt6735/kd_flashlightlist.c +++ b/drivers/misc/mediatek/flashlight/src/mt6735/kd_flashlightlist.c @@ -68,18 +68,18 @@ MUINT32 strobeInit_sub_sid2_part2(FLASHLIGHT_FUNCTION_STRUCT **pfFunc); #else #define PFX "[KD_CAMERA_FLASHLIGHT]" #define PK_DBG_NONE(fmt, arg...) do {} while (0) - #define PK_DBG_FUNC(fmt, arg...) printk(KERN_INFO PFX "%s: " fmt, __FUNCTION__ ,##arg) + #define PK_DBG_FUNC(fmt, arg...) printk(KERN_INFO PFX "%s: " fmt, __func__ ,##arg) - #define PK_WARN(fmt, arg...) printk(KERN_WARNING PFX "%s: " fmt, __FUNCTION__ ,##arg) - #define PK_NOTICE(fmt, arg...) printk(KERN_NOTICE PFX "%s: " fmt, __FUNCTION__ ,##arg) - #define PK_INFO(fmt, arg...) printk(KERN_INFO PFX "%s: " fmt, __FUNCTION__ ,##arg) - #define PK_TRC_FUNC(f) printk(PFX "<%s>\n", __FUNCTION__); + #define PK_WARN(fmt, arg...) printk(KERN_WARNING PFX "%s: " fmt, __func__ ,##arg) + #define PK_NOTICE(fmt, arg...) printk(KERN_NOTICE PFX "%s: " fmt, __func__ ,##arg) + #define PK_INFO(fmt, arg...) printk(KERN_INFO PFX "%s: " fmt, __func__ ,##arg) + #define PK_TRC_FUNC(f) printk(PFX "<%s>\n", __func__); #define PK_TRC_VERBOSE(fmt, arg...) printk(PFX fmt, ##arg) #define DEBUG_KD_STROBE #ifdef DEBUG_KD_STROBE #define logI PK_DBG_FUNC - #define logE(fmt, arg...) printk(KERN_ERR PFX "%s: " fmt, __FUNCTION__ ,##arg) + #define logE(fmt, arg...) printk(KERN_ERR PFX "%s: " fmt, __func__ ,##arg) #else #define logI(a,...) #define logE(a,...) diff --git a/drivers/misc/mediatek/flashlight/src/mt6735/strobe_main_sid1_part2.c b/drivers/misc/mediatek/flashlight/src/mt6735/strobe_main_sid1_part2.c index 32de1f934..9bd53a063 100644 --- a/drivers/misc/mediatek/flashlight/src/mt6735/strobe_main_sid1_part2.c +++ b/drivers/misc/mediatek/flashlight/src/mt6735/strobe_main_sid1_part2.c @@ -43,13 +43,13 @@ // ANDROID_LOG_VERBOSE #define TAG_NAME "[strobe_main_sid1_part2.c]" #define PK_DBG_NONE(fmt, arg...) do {} while (0) -#define PK_DBG_FUNC(fmt, arg...) pr_debug(TAG_NAME "%s: " fmt, __FUNCTION__ ,##arg) -#define PK_WARN(fmt, arg...) pr_warning(TAG_NAME "%s: " fmt, __FUNCTION__ ,##arg) -#define PK_NOTICE(fmt, arg...) pr_notice(TAG_NAME "%s: " fmt, __FUNCTION__ ,##arg) -#define PK_INFO(fmt, arg...) pr_info(TAG_NAME "%s: " fmt, __FUNCTION__ ,##arg) -#define PK_TRC_FUNC(f) pr_debug(TAG_NAME "<%s>\n", __FUNCTION__) +#define PK_DBG_FUNC(fmt, arg...) pr_debug(TAG_NAME "%s: " fmt, __func__ ,##arg) +#define PK_WARN(fmt, arg...) pr_warning(TAG_NAME "%s: " fmt, __func__ ,##arg) +#define PK_NOTICE(fmt, arg...) pr_notice(TAG_NAME "%s: " fmt, __func__ ,##arg) +#define PK_INFO(fmt, arg...) pr_info(TAG_NAME "%s: " fmt, __func__ ,##arg) +#define PK_TRC_FUNC(f) pr_debug(TAG_NAME "<%s>\n", __func__) #define PK_TRC_VERBOSE(fmt, arg...) pr_debug(TAG_NAME fmt, ##arg) -#define PK_ERROR(fmt, arg...) pr_err(TAG_NAME "%s: " fmt, __FUNCTION__ ,##arg) +#define PK_ERROR(fmt, arg...) pr_err(TAG_NAME "%s: " fmt, __func__ ,##arg) #define DEBUG_LEDS_STROBE #ifdef DEBUG_LEDS_STROBE diff --git a/drivers/misc/mediatek/flashlight/src/mt6735/strobe_main_sid2_part1.c b/drivers/misc/mediatek/flashlight/src/mt6735/strobe_main_sid2_part1.c index 4f20c09c8..c0c7e1bf1 100644 --- a/drivers/misc/mediatek/flashlight/src/mt6735/strobe_main_sid2_part1.c +++ b/drivers/misc/mediatek/flashlight/src/mt6735/strobe_main_sid2_part1.c @@ -44,13 +44,13 @@ // ANDROID_LOG_VERBOSE #define TAG_NAME "[strobe_main_sid2_part1.c]" #define PK_DBG_NONE(fmt, arg...) do {} while (0) -#define PK_DBG_FUNC(fmt, arg...) pr_debug(TAG_NAME "%s: " fmt, __FUNCTION__ ,##arg) -#define PK_WARN(fmt, arg...) pr_warning(TAG_NAME "%s: " fmt, __FUNCTION__ ,##arg) -#define PK_NOTICE(fmt, arg...) pr_notice(TAG_NAME "%s: " fmt, __FUNCTION__ ,##arg) -#define PK_INFO(fmt, arg...) pr_info(TAG_NAME "%s: " fmt, __FUNCTION__ ,##arg) -#define PK_TRC_FUNC(f) pr_debug(TAG_NAME "<%s>\n", __FUNCTION__) +#define PK_DBG_FUNC(fmt, arg...) pr_debug(TAG_NAME "%s: " fmt, __func__ ,##arg) +#define PK_WARN(fmt, arg...) pr_warning(TAG_NAME "%s: " fmt, __func__ ,##arg) +#define PK_NOTICE(fmt, arg...) pr_notice(TAG_NAME "%s: " fmt, __func__ ,##arg) +#define PK_INFO(fmt, arg...) pr_info(TAG_NAME "%s: " fmt, __func__ ,##arg) +#define PK_TRC_FUNC(f) pr_debug(TAG_NAME "<%s>\n", __func__) #define PK_TRC_VERBOSE(fmt, arg...) pr_debug(TAG_NAME fmt, ##arg) -#define PK_ERROR(fmt, arg...) pr_err(TAG_NAME "%s: " fmt, __FUNCTION__ ,##arg) +#define PK_ERROR(fmt, arg...) pr_err(TAG_NAME "%s: " fmt, __func__ ,##arg) #define DEBUG_LEDS_STROBE diff --git a/drivers/misc/mediatek/flashlight/src/mt6735/strobe_main_sid2_part2.c b/drivers/misc/mediatek/flashlight/src/mt6735/strobe_main_sid2_part2.c index 4738c1dfd..0b1e2849f 100644 --- a/drivers/misc/mediatek/flashlight/src/mt6735/strobe_main_sid2_part2.c +++ b/drivers/misc/mediatek/flashlight/src/mt6735/strobe_main_sid2_part2.c @@ -39,13 +39,13 @@ // ANDROID_LOG_VERBOSE #define TAG_NAME "[strobe_main_sid2_part2.c]" #define PK_DBG_NONE(fmt, arg...) do {} while (0) -#define PK_DBG_FUNC(fmt, arg...) pr_debug(TAG_NAME "%s: " fmt, __FUNCTION__ ,##arg) -#define PK_WARN(fmt, arg...) pr_warning(TAG_NAME "%s: " fmt, __FUNCTION__ ,##arg) -#define PK_NOTICE(fmt, arg...) pr_notice(TAG_NAME "%s: " fmt, __FUNCTION__ ,##arg) -#define PK_INFO(fmt, arg...) pr_info(TAG_NAME "%s: " fmt, __FUNCTION__ ,##arg) -#define PK_TRC_FUNC(f) pr_debug(TAG_NAME "<%s>\n", __FUNCTION__) +#define PK_DBG_FUNC(fmt, arg...) pr_debug(TAG_NAME "%s: " fmt, __func__ ,##arg) +#define PK_WARN(fmt, arg...) pr_warning(TAG_NAME "%s: " fmt, __func__ ,##arg) +#define PK_NOTICE(fmt, arg...) pr_notice(TAG_NAME "%s: " fmt, __func__ ,##arg) +#define PK_INFO(fmt, arg...) pr_info(TAG_NAME "%s: " fmt, __func__ ,##arg) +#define PK_TRC_FUNC(f) pr_debug(TAG_NAME "<%s>\n", __func__) #define PK_TRC_VERBOSE(fmt, arg...) pr_debug(TAG_NAME fmt, ##arg) -#define PK_ERROR(fmt, arg...) pr_err(TAG_NAME "%s: " fmt, __FUNCTION__ ,##arg) +#define PK_ERROR(fmt, arg...) pr_err(TAG_NAME "%s: " fmt, __func__ ,##arg) #define DEBUG_LEDS_STROBE diff --git a/drivers/misc/mediatek/flashlight/src/mt6735/strobe_sub_sid1_part2.c b/drivers/misc/mediatek/flashlight/src/mt6735/strobe_sub_sid1_part2.c index ba8f540bf..662239024 100644 --- a/drivers/misc/mediatek/flashlight/src/mt6735/strobe_sub_sid1_part2.c +++ b/drivers/misc/mediatek/flashlight/src/mt6735/strobe_sub_sid1_part2.c @@ -41,13 +41,13 @@ // ANDROID_LOG_VERBOSE #define TAG_NAME "[strobe_sub_sid1_part2.c]" #define PK_DBG_NONE(fmt, arg...) do {} while (0) -#define PK_DBG_FUNC(fmt, arg...) pr_debug(TAG_NAME "%s: " fmt, __FUNCTION__ ,##arg) -#define PK_WARN(fmt, arg...) pr_warning(TAG_NAME "%s: " fmt, __FUNCTION__ ,##arg) -#define PK_NOTICE(fmt, arg...) pr_notice(TAG_NAME "%s: " fmt, __FUNCTION__ ,##arg) -#define PK_INFO(fmt, arg...) pr_info(TAG_NAME "%s: " fmt, __FUNCTION__ ,##arg) -#define PK_TRC_FUNC(f) pr_debug(TAG_NAME "<%s>\n", __FUNCTION__) +#define PK_DBG_FUNC(fmt, arg...) pr_debug(TAG_NAME "%s: " fmt, __func__ ,##arg) +#define PK_WARN(fmt, arg...) pr_warning(TAG_NAME "%s: " fmt, __func__ ,##arg) +#define PK_NOTICE(fmt, arg...) pr_notice(TAG_NAME "%s: " fmt, __func__ ,##arg) +#define PK_INFO(fmt, arg...) pr_info(TAG_NAME "%s: " fmt, __func__ ,##arg) +#define PK_TRC_FUNC(f) pr_debug(TAG_NAME "<%s>\n", __func__) #define PK_TRC_VERBOSE(fmt, arg...) pr_debug(TAG_NAME fmt, ##arg) -#define PK_ERROR(fmt, arg...) pr_err(TAG_NAME "%s: " fmt, __FUNCTION__ ,##arg) +#define PK_ERROR(fmt, arg...) pr_err(TAG_NAME "%s: " fmt, __func__ ,##arg) #define DEBUG_LEDS_STROBE #ifdef DEBUG_LEDS_STROBE diff --git a/drivers/misc/mediatek/flashlight/src/mt6735/strobe_sub_sid2_part1.c b/drivers/misc/mediatek/flashlight/src/mt6735/strobe_sub_sid2_part1.c index 4cb706687..8e026ecc4 100644 --- a/drivers/misc/mediatek/flashlight/src/mt6735/strobe_sub_sid2_part1.c +++ b/drivers/misc/mediatek/flashlight/src/mt6735/strobe_sub_sid2_part1.c @@ -41,13 +41,13 @@ // ANDROID_LOG_VERBOSE #define TAG_NAME "[strobe_sub_sid2_part1.c]" #define PK_DBG_NONE(fmt, arg...) do {} while (0) -#define PK_DBG_FUNC(fmt, arg...) pr_debug(TAG_NAME "%s: " fmt, __FUNCTION__ ,##arg) -#define PK_WARN(fmt, arg...) pr_warning(TAG_NAME "%s: " fmt, __FUNCTION__ ,##arg) -#define PK_NOTICE(fmt, arg...) pr_notice(TAG_NAME "%s: " fmt, __FUNCTION__ ,##arg) -#define PK_INFO(fmt, arg...) pr_info(TAG_NAME "%s: " fmt, __FUNCTION__ ,##arg) -#define PK_TRC_FUNC(f) pr_debug(TAG_NAME "<%s>\n", __FUNCTION__) +#define PK_DBG_FUNC(fmt, arg...) pr_debug(TAG_NAME "%s: " fmt, __func__ ,##arg) +#define PK_WARN(fmt, arg...) pr_warning(TAG_NAME "%s: " fmt, __func__ ,##arg) +#define PK_NOTICE(fmt, arg...) pr_notice(TAG_NAME "%s: " fmt, __func__ ,##arg) +#define PK_INFO(fmt, arg...) pr_info(TAG_NAME "%s: " fmt, __func__ ,##arg) +#define PK_TRC_FUNC(f) pr_debug(TAG_NAME "<%s>\n", __func__) #define PK_TRC_VERBOSE(fmt, arg...) pr_debug(TAG_NAME fmt, ##arg) -#define PK_ERROR(fmt, arg...) pr_err(TAG_NAME "%s: " fmt, __FUNCTION__ ,##arg) +#define PK_ERROR(fmt, arg...) pr_err(TAG_NAME "%s: " fmt, __func__ ,##arg) #define DEBUG_LEDS_STROBE diff --git a/drivers/misc/mediatek/flashlight/src/mt6735/strobe_sub_sid2_part2.c b/drivers/misc/mediatek/flashlight/src/mt6735/strobe_sub_sid2_part2.c index a5a7d9000..d0d8c1fd8 100644 --- a/drivers/misc/mediatek/flashlight/src/mt6735/strobe_sub_sid2_part2.c +++ b/drivers/misc/mediatek/flashlight/src/mt6735/strobe_sub_sid2_part2.c @@ -40,13 +40,13 @@ // ANDROID_LOG_VERBOSE #define TAG_NAME "[strobe_sub_sid2_part2.c]" #define PK_DBG_NONE(fmt, arg...) do {} while (0) -#define PK_DBG_FUNC(fmt, arg...) pr_debug(TAG_NAME "%s: " fmt, __FUNCTION__ ,##arg) -#define PK_WARN(fmt, arg...) pr_warning(TAG_NAME "%s: " fmt, __FUNCTION__ ,##arg) -#define PK_NOTICE(fmt, arg...) pr_notice(TAG_NAME "%s: " fmt, __FUNCTION__ ,##arg) -#define PK_INFO(fmt, arg...) pr_info(TAG_NAME "%s: " fmt, __FUNCTION__ ,##arg) -#define PK_TRC_FUNC(f) pr_debug(TAG_NAME "<%s>\n", __FUNCTION__) +#define PK_DBG_FUNC(fmt, arg...) pr_debug(TAG_NAME "%s: " fmt, __func__ ,##arg) +#define PK_WARN(fmt, arg...) pr_warning(TAG_NAME "%s: " fmt, __func__ ,##arg) +#define PK_NOTICE(fmt, arg...) pr_notice(TAG_NAME "%s: " fmt, __func__ ,##arg) +#define PK_INFO(fmt, arg...) pr_info(TAG_NAME "%s: " fmt, __func__ ,##arg) +#define PK_TRC_FUNC(f) pr_debug(TAG_NAME "<%s>\n", __func__) #define PK_TRC_VERBOSE(fmt, arg...) pr_debug(TAG_NAME fmt, ##arg) -#define PK_ERROR(fmt, arg...) pr_err(TAG_NAME "%s: " fmt, __FUNCTION__ ,##arg) +#define PK_ERROR(fmt, arg...) pr_err(TAG_NAME "%s: " fmt, __func__ ,##arg) #define DEBUG_LEDS_STROBE #ifdef DEBUG_LEDS_STROBE diff --git a/drivers/misc/mediatek/flashlight/src/mt6735/sub_strobe.c b/drivers/misc/mediatek/flashlight/src/mt6735/sub_strobe.c index efe8011dc..ecaac71d2 100644 --- a/drivers/misc/mediatek/flashlight/src/mt6735/sub_strobe.c +++ b/drivers/misc/mediatek/flashlight/src/mt6735/sub_strobe.c @@ -40,13 +40,13 @@ // ANDROID_LOG_VERBOSE #define TAG_NAME "[sub_strobe.c]" #define PK_DBG_NONE(fmt, arg...) do {} while (0) -#define PK_DBG_FUNC(fmt, arg...) pr_debug(TAG_NAME "%s: " fmt, __FUNCTION__ ,##arg) -#define PK_WARN(fmt, arg...) pr_warning(TAG_NAME "%s: " fmt, __FUNCTION__ ,##arg) -#define PK_NOTICE(fmt, arg...) pr_notice(TAG_NAME "%s: " fmt, __FUNCTION__ ,##arg) -#define PK_INFO(fmt, arg...) pr_info(TAG_NAME "%s: " fmt, __FUNCTION__ ,##arg) -#define PK_TRC_FUNC(f) pr_debug(TAG_NAME "<%s>\n", __FUNCTION__) +#define PK_DBG_FUNC(fmt, arg...) pr_debug(TAG_NAME "%s: " fmt, __func__ ,##arg) +#define PK_WARN(fmt, arg...) pr_warning(TAG_NAME "%s: " fmt, __func__ ,##arg) +#define PK_NOTICE(fmt, arg...) pr_notice(TAG_NAME "%s: " fmt, __func__ ,##arg) +#define PK_INFO(fmt, arg...) pr_info(TAG_NAME "%s: " fmt, __func__ ,##arg) +#define PK_TRC_FUNC(f) pr_debug(TAG_NAME "<%s>\n", __func__) #define PK_TRC_VERBOSE(fmt, arg...) pr_debug(TAG_NAME fmt, ##arg) -#define PK_ERROR(fmt, arg...) pr_err(TAG_NAME "%s: " fmt, __FUNCTION__ ,##arg) +#define PK_ERROR(fmt, arg...) pr_err(TAG_NAME "%s: " fmt, __func__ ,##arg) #define DEBUG_LEDS_STROBE #ifdef DEBUG_LEDS_STROBE diff --git a/drivers/misc/mediatek/gpio/mt6735/mt_gpio_base.c b/drivers/misc/mediatek/gpio/mt6735/mt_gpio_base.c index b2f8a39ba..3a7f1e8ba 100644 --- a/drivers/misc/mediatek/gpio/mt6735/mt_gpio_base.c +++ b/drivers/misc/mediatek/gpio/mt6735/mt_gpio_base.c @@ -70,7 +70,7 @@ int mt_set_gpio_dir_base(unsigned long pin, unsigned long dir) GPIO_SET_BITS((1L << bit), DIR_addr[pin].addr+4); #endif - // GPIOERR("%s:pin:%ld, dir:%ld, value:0x%x\n",__FUNCTION__, pin, dir, GPIO_RD32(DIR_addr[pin].addr)); + // GPIOERR("%s:pin:%ld, dir:%ld, value:0x%x\n",__func__, pin, dir, GPIO_RD32(DIR_addr[pin].addr)); return RSUCCESS; } /*---------------------------------------------------------------------------*/ @@ -124,7 +124,7 @@ int mt_set_gpio_pull_enable_base(unsigned long pin, unsigned long enable) GPIO_SET_BITS((1L << (PULLEN_offset[pin].offset)), PULLEN_addr[pin].addr + 4); } #endif - //GPIOERR("%s:pin:%ld, enable:%ld, value:0x%x\n",__FUNCTION__, pin, enable, GPIO_RD32(PULLEN_addr[pin].addr)); + //GPIOERR("%s:pin:%ld, enable:%ld, value:0x%x\n",__func__, pin, enable, GPIO_RD32(PULLEN_addr[pin].addr)); return RSUCCESS; } @@ -191,7 +191,7 @@ int mt_set_gpio_smt_base(unsigned long pin, unsigned long enable) } #endif - //GPIOERR("%s:pin:%ld, enable:%ld, value:0x%x\n",__FUNCTION__, pin, enable, GPIO_RD32(SMT_addr[pin].addr)); + //GPIOERR("%s:pin:%ld, enable:%ld, value:0x%x\n",__func__, pin, enable, GPIO_RD32(SMT_addr[pin].addr)); return RSUCCESS; } @@ -365,7 +365,7 @@ int mt_set_gpio_pull_select_base(unsigned long pin, unsigned long select) } #endif -// GPIOERR("%s:pin:%ld, select:%ld, value:0x%x\n",__FUNCTION__, pin, select, GPIO_RD32(PULL_addr[pin].addr)); +// GPIOERR("%s:pin:%ld, select:%ld, value:0x%x\n",__func__, pin, select, GPIO_RD32(PULL_addr[pin].addr)); return RSUCCESS; } @@ -458,7 +458,7 @@ int mt_set_gpio_out_base(unsigned long pin, unsigned long output) GPIO_SET_BITS((1L << bit), DATAOUT_addr[pin].addr+4); #endif - //GPIOERR("%s:pin:%ld, output:%ld, value:0x%x\n",__FUNCTION__, pin, output, GPIO_RD32(DATAOUT_addr[pin].addr)); + //GPIOERR("%s:pin:%ld, output:%ld, value:0x%x\n",__func__, pin, output, GPIO_RD32(DATAOUT_addr[pin].addr)); return RSUCCESS; } @@ -540,7 +540,7 @@ int mt_set_gpio_mode_base(unsigned long pin, unsigned long mode) #endif - GPIOERR("%s:pin:%ld, mode:%ld, value:0x%x\n",__FUNCTION__, pin, mode, GPIO_RD32(MODE_addr[pin].addr)); + GPIOERR("%s:pin:%ld, mode:%ld, value:0x%x\n",__func__, pin, mode, GPIO_RD32(MODE_addr[pin].addr)); return RSUCCESS; } @@ -578,7 +578,7 @@ void get_gpio_vbase(struct device_node *node) //gpio_reg = (GPIO_REGS*)(GPIO_BASE); GPIOERR("GPIO base add is 0x%p\n",gpio_vbase.gpio_regs); } - GPIOERR("GPIO base addr is 0x%p, %s\n",gpio_vbase.gpio_regs, __FUNCTION__); + GPIOERR("GPIO base addr is 0x%p, %s\n",gpio_vbase.gpio_regs, __func__); } /*-----------------------User need GPIO APIs before GPIO probe------------------*/ extern struct device_node *get_gpio_np(void); @@ -596,7 +596,7 @@ static int __init get_gpio_vbase_early(void) return 0; } //gpio_reg = (GPIO_REGS*)(GPIO_BASE); - GPIOERR("GPIO base addr is 0x%p, %s\n",gpio_vbase.gpio_regs, __FUNCTION__); + GPIOERR("GPIO base addr is 0x%p, %s\n",gpio_vbase.gpio_regs, __func__); return 0; } postcore_initcall(get_gpio_vbase_early); diff --git a/drivers/misc/mediatek/gpu/mt6735/mali-EAC/drivers/gpu/arm/midgard/malisw/arm_cstd/arm_cstd_types_gcc.h b/drivers/misc/mediatek/gpu/mt6735/mali-EAC/drivers/gpu/arm/midgard/malisw/arm_cstd/arm_cstd_types_gcc.h index 679819655..7768d211c 100644 --- a/drivers/misc/mediatek/gpu/mt6735/mali-EAC/drivers/gpu/arm/midgard/malisw/arm_cstd/arm_cstd_types_gcc.h +++ b/drivers/misc/mediatek/gpu/mt6735/mali-EAC/drivers/gpu/arm/midgard/malisw/arm_cstd/arm_cstd_types_gcc.h @@ -86,7 +86,7 @@ typedef uint32_t bool_t; #if (0 == CSTD_TOOLCHAIN_RVCT_GCC_MODE) #define CSTD_FUNC __func__ #else - #define CSTD_FUNC __FUNCTION__ + #define CSTD_FUNC __func__ #endif #endif /* End (_ARM_CSTD_TYPES_GCC_H_) */ diff --git a/drivers/misc/mediatek/gpu/mt6735/mali-EAC/drivers/gpu/arm/midgard/malisw/arm_cstd/arm_cstd_types_rvct.h b/drivers/misc/mediatek/gpu/mt6735/mali-EAC/drivers/gpu/arm/midgard/malisw/arm_cstd/arm_cstd_types_rvct.h index a8efda004..680de5c77 100644 --- a/drivers/misc/mediatek/gpu/mt6735/mali-EAC/drivers/gpu/arm/midgard/malisw/arm_cstd/arm_cstd_types_rvct.h +++ b/drivers/misc/mediatek/gpu/mt6735/mali-EAC/drivers/gpu/arm/midgard/malisw/arm_cstd/arm_cstd_types_rvct.h @@ -183,7 +183,7 @@ typedef uint32_t bool_t; * larger string you must use a printf-like function with a @c @%s template * which is populated with @c CSTD_FUNC */ -#define CSTD_FUNC __FUNCTION__ +#define CSTD_FUNC __func__ /** * @} diff --git a/drivers/misc/mediatek/gpu/mt6735/mali/drivers/gpu/arm/midgard/malisw/arm_cstd/arm_cstd_types_gcc.h b/drivers/misc/mediatek/gpu/mt6735/mali/drivers/gpu/arm/midgard/malisw/arm_cstd/arm_cstd_types_gcc.h index 679819655..7768d211c 100644 --- a/drivers/misc/mediatek/gpu/mt6735/mali/drivers/gpu/arm/midgard/malisw/arm_cstd/arm_cstd_types_gcc.h +++ b/drivers/misc/mediatek/gpu/mt6735/mali/drivers/gpu/arm/midgard/malisw/arm_cstd/arm_cstd_types_gcc.h @@ -86,7 +86,7 @@ typedef uint32_t bool_t; #if (0 == CSTD_TOOLCHAIN_RVCT_GCC_MODE) #define CSTD_FUNC __func__ #else - #define CSTD_FUNC __FUNCTION__ + #define CSTD_FUNC __func__ #endif #endif /* End (_ARM_CSTD_TYPES_GCC_H_) */ diff --git a/drivers/misc/mediatek/gpu/mt6735/mali/drivers/gpu/arm/midgard/malisw/arm_cstd/arm_cstd_types_rvct.h b/drivers/misc/mediatek/gpu/mt6735/mali/drivers/gpu/arm/midgard/malisw/arm_cstd/arm_cstd_types_rvct.h index a8efda004..680de5c77 100644 --- a/drivers/misc/mediatek/gpu/mt6735/mali/drivers/gpu/arm/midgard/malisw/arm_cstd/arm_cstd_types_rvct.h +++ b/drivers/misc/mediatek/gpu/mt6735/mali/drivers/gpu/arm/midgard/malisw/arm_cstd/arm_cstd_types_rvct.h @@ -183,7 +183,7 @@ typedef uint32_t bool_t; * larger string you must use a printf-like function with a @c @%s template * which is populated with @c CSTD_FUNC */ -#define CSTD_FUNC __FUNCTION__ +#define CSTD_FUNC __func__ /** * @} diff --git a/drivers/misc/mediatek/gyroscope/ITG1010-new/ITG1010.c b/drivers/misc/mediatek/gyroscope/ITG1010-new/ITG1010.c index bf4f49f1a..fe63f0204 100644 --- a/drivers/misc/mediatek/gyroscope/ITG1010-new/ITG1010.c +++ b/drivers/misc/mediatek/gyroscope/ITG1010-new/ITG1010.c @@ -1254,7 +1254,7 @@ static ssize_t show_chip_orientation(struct device_driver *ddri, char *buf) ssize_t _tLength = 0; struct gyro_hw *_ptAccelHw = hw; - GYRO_LOG("[%s] default direction: %d\n", __FUNCTION__, _ptAccelHw->direction); + GYRO_LOG("[%s] default direction: %d\n", __func__, _ptAccelHw->direction); _tLength = snprintf(buf, PAGE_SIZE, "default direction = %d\n", _ptAccelHw->direction); @@ -1275,7 +1275,7 @@ static ssize_t store_chip_orientation(struct device_driver *ddri, const char *bu GYRO_ERR("ERR: fail to set direction\n"); } - GYRO_LOG("[%s] set direction: %d\n", __FUNCTION__, _nDirection); + GYRO_LOG("[%s] set direction: %d\n", __func__, _nDirection); return (tCount); } @@ -1819,7 +1819,7 @@ static long ITG1010_compat_ioctl(struct file *file, unsigned int cmd, unsigned l 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; } diff --git a/drivers/misc/mediatek/gyroscope/l3g4200d/l3g4200d.c b/drivers/misc/mediatek/gyroscope/l3g4200d/l3g4200d.c index 51819d2d7..9ff55c090 100644 --- a/drivers/misc/mediatek/gyroscope/l3g4200d/l3g4200d.c +++ b/drivers/misc/mediatek/gyroscope/l3g4200d/l3g4200d.c @@ -157,8 +157,8 @@ static bool sensor_power = false; /*----------------------------------------------------------------------------*/ #define GYRO_TAG "[Gyroscope] " -#define GYRO_FUN(f) printk(KERN_INFO GYRO_TAG"%s\n", __FUNCTION__) -#define GYRO_ERR(fmt, args...) printk(KERN_ERR GYRO_TAG"%s %d : "fmt, __FUNCTION__, __LINE__, ##args) +#define GYRO_FUN(f) printk(KERN_INFO GYRO_TAG"%s\n", __func__) +#define GYRO_ERR(fmt, args...) printk(KERN_ERR GYRO_TAG"%s %d : "fmt, __func__, __LINE__, ##args) #define GYRO_LOG(fmt, args...) printk(KERN_INFO GYRO_TAG fmt, ##args) /*----------------------------------------------------------------------------*/ diff --git a/drivers/misc/mediatek/gyroscope/l3gd20/l3gd20.c b/drivers/misc/mediatek/gyroscope/l3gd20/l3gd20.c index f36c849d0..763860a7b 100644 --- a/drivers/misc/mediatek/gyroscope/l3gd20/l3gd20.c +++ b/drivers/misc/mediatek/gyroscope/l3gd20/l3gd20.c @@ -214,13 +214,13 @@ static bool sensor_power = false; /*----------------------------------------------------------------------------*/ #define GYRO_TAG "[Gyroscope] " -//#define GYRO_FUN(f) printk(KERN_INFO GYRO_TAG"%s\n", __FUNCTION__) -//#define GYRO_ERR(fmt, args...) printk(KERN_ERR GYRO_TAG"%s %d : "fmt, __FUNCTION__, __LINE__, ##args) +//#define GYRO_FUN(f) printk(KERN_INFO GYRO_TAG"%s\n", __func__) +//#define GYRO_ERR(fmt, args...) printk(KERN_ERR GYRO_TAG"%s %d : "fmt, __func__, __LINE__, ##args) //#define GYRO_LOG(fmt, args...) printk(KERN_INFO GYRO_TAG fmt, ##args) -#define GYRO_FUN(f) printk(GYRO_TAG"%s\n", __FUNCTION__) -#define GYRO_ERR(fmt, args...) printk(KERN_ERR GYRO_TAG"%s %d : "fmt, __FUNCTION__, __LINE__, ##args) +#define GYRO_FUN(f) printk(GYRO_TAG"%s\n", __func__) +#define GYRO_ERR(fmt, args...) printk(KERN_ERR GYRO_TAG"%s %d : "fmt, __func__, __LINE__, ##args) #define GYRO_LOG(fmt, args...) printk(GYRO_TAG fmt, ##args) /*----------------------------------------------------------------------------*/ diff --git a/drivers/misc/mediatek/gyroscope/lsm6ds0/lsm6ds0.c b/drivers/misc/mediatek/gyroscope/lsm6ds0/lsm6ds0.c index 2187ba8f9..71386b3b9 100644 --- a/drivers/misc/mediatek/gyroscope/lsm6ds0/lsm6ds0.c +++ b/drivers/misc/mediatek/gyroscope/lsm6ds0/lsm6ds0.c @@ -160,13 +160,13 @@ static bool sensor_power = false; /*----------------------------------------------------------------------------*/ #define GYRO_TAG "[Gyroscope] " -//#define GYRO_FUN(f) printk(KERN_INFO GYRO_TAG"%s\n", __FUNCTION__) -//#define GYRO_ERR(fmt, args...) printk(KERN_ERR GYRO_TAG"%s %d : "fmt, __FUNCTION__, __LINE__, ##args) +//#define GYRO_FUN(f) printk(KERN_INFO GYRO_TAG"%s\n", __func__) +//#define GYRO_ERR(fmt, args...) printk(KERN_ERR GYRO_TAG"%s %d : "fmt, __func__, __LINE__, ##args) //#define GYRO_LOG(fmt, args...) printk(KERN_INFO GYRO_TAG fmt, ##args) -#define GYRO_FUN(f) printk(GYRO_TAG"%s\n", __FUNCTION__) -#define GYRO_ERR(fmt, args...) printk(KERN_ERR GYRO_TAG"%s %d : "fmt, __FUNCTION__, __LINE__, ##args) +#define GYRO_FUN(f) printk(GYRO_TAG"%s\n", __func__) +#define GYRO_ERR(fmt, args...) printk(KERN_ERR GYRO_TAG"%s %d : "fmt, __func__, __LINE__, ##args) #define GYRO_LOG(fmt, args...) printk(GYRO_TAG fmt, ##args) /*----------------------------------------------------------------------------*/ diff --git a/drivers/misc/mediatek/gyroscope/lsm6ds3gy/lsm6ds3_gy.c b/drivers/misc/mediatek/gyroscope/lsm6ds3gy/lsm6ds3_gy.c index 6f301418c..b8137b166 100644 --- a/drivers/misc/mediatek/gyroscope/lsm6ds3gy/lsm6ds3_gy.c +++ b/drivers/misc/mediatek/gyroscope/lsm6ds3gy/lsm6ds3_gy.c @@ -179,8 +179,8 @@ static bool enable_status = false; #define GYRO_TAG "[Gyroscope] " -#define GYRO_FUN(f) printk(KERN_INFO GYRO_TAG"%s\n", __FUNCTION__) -#define GYRO_ERR(fmt, args...) printk(KERN_ERR GYRO_TAG"%s %d : "fmt, __FUNCTION__, __LINE__, ##args) +#define GYRO_FUN(f) printk(KERN_INFO GYRO_TAG"%s\n", __func__) +#define GYRO_ERR(fmt, args...) printk(KERN_ERR GYRO_TAG"%s %d : "fmt, __func__, __LINE__, ##args) #define GYRO_LOG(fmt, args...) printk(KERN_INFO GYRO_TAG fmt, ##args) @@ -750,7 +750,7 @@ static int LSM6DS3_gyro_init_client(struct i2c_client *client, bool enable) struct lsm6ds3_gyro_i2c_data *obj = i2c_get_clientdata(client); int res = 0; - GYRO_LOG("%s lsm6ds3 addr %x!\n", __FUNCTION__, client->addr); + GYRO_LOG("%s lsm6ds3 addr %x!\n", __func__, client->addr); res = LSM6DS3_CheckDeviceID(client); if(res != LSM6DS3_SUCCESS) @@ -867,7 +867,7 @@ static int lsm6ds3_gyro_get_data(int* x ,int* y,int* z, int* status) } if(atomic_read(&priv->trace) & GYRO_TRC_DATA) { - GYRO_LOG("%s (%d), \n",__FUNCTION__,__LINE__); + GYRO_LOG("%s (%d), \n",__func__,__LINE__); } memset(buff, 0, sizeof(buff)); LSM6DS3_ReadGyroData(priv->client, buff, LSM6DS3_BUFSIZE); @@ -1075,7 +1075,7 @@ static long lsm6ds3_gyro_compat_ioctl(struct file *file, unsigned int cmd, unsig 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; } @@ -1560,7 +1560,7 @@ static int lsm6ds3_gyro_local_init(void) } if(lsm6ds3_gyro_init_flag == -1) { - GYRO_ERR("%s init failed!\n", __FUNCTION__); + GYRO_ERR("%s init failed!\n", __func__); return -1; } return 0; diff --git a/drivers/misc/mediatek/gyroscope/mpu3000-new/mpu3000.c b/drivers/misc/mediatek/gyroscope/mpu3000-new/mpu3000.c index 435190436..3babd0179 100644 --- a/drivers/misc/mediatek/gyroscope/mpu3000-new/mpu3000.c +++ b/drivers/misc/mediatek/gyroscope/mpu3000-new/mpu3000.c @@ -164,8 +164,8 @@ static bool sensor_power = false; /*----------------------------------------------------------------------------*/ #if 0 #define GYRO_TAG "[Mpu3000] " -#define GYRO_FUN(f) printk(KERN_INFO GYRO_TAG"%s\n", __FUNCTION__) -#define GYRO_ERR(fmt, args...) printk(KERN_ERR GYRO_TAG"%s %d : "fmt, __FUNCTION__, __LINE__, ##args) +#define GYRO_FUN(f) printk(KERN_INFO GYRO_TAG"%s\n", __func__) +#define GYRO_ERR(fmt, args...) printk(KERN_ERR GYRO_TAG"%s %d : "fmt, __func__, __LINE__, ##args) #define GYRO_LOG(fmt, args...) printk(KERN_ERR GYRO_TAG fmt, ##args) #endif /*----------------------------------------------------------------------------*/ diff --git a/drivers/misc/mediatek/gyroscope/mpu3000/mpu3000.c b/drivers/misc/mediatek/gyroscope/mpu3000/mpu3000.c index caed7d600..0b1f90de0 100644 --- a/drivers/misc/mediatek/gyroscope/mpu3000/mpu3000.c +++ b/drivers/misc/mediatek/gyroscope/mpu3000/mpu3000.c @@ -157,8 +157,8 @@ static bool sensor_power = false; /*----------------------------------------------------------------------------*/ #define GYRO_TAG "[Gyroscope] " -#define GYRO_FUN(f) printk(KERN_INFO GYRO_TAG"%s\n", __FUNCTION__) -#define GYRO_ERR(fmt, args...) printk(KERN_ERR GYRO_TAG"%s %d : "fmt, __FUNCTION__, __LINE__, ##args) +#define GYRO_FUN(f) printk(KERN_INFO GYRO_TAG"%s\n", __func__) +#define GYRO_ERR(fmt, args...) printk(KERN_ERR GYRO_TAG"%s %d : "fmt, __func__, __LINE__, ##args) #define GYRO_LOG(fmt, args...) printk(KERN_ERR GYRO_TAG fmt, ##args) /*----------------------------------------------------------------------------*/ /* diff --git a/drivers/misc/mediatek/gyroscope/mpu3050c-new/mpu3050c.c b/drivers/misc/mediatek/gyroscope/mpu3050c-new/mpu3050c.c index 5424f7102..b079437bd 100644 --- a/drivers/misc/mediatek/gyroscope/mpu3050c-new/mpu3050c.c +++ b/drivers/misc/mediatek/gyroscope/mpu3050c-new/mpu3050c.c @@ -175,8 +175,8 @@ static struct gyro_init_info mpu3000_init_info = { /*----------------------------------------------------------------------------*/ #if 0 #define GYRO_TAG "[Gyroscope] " -#define GYRO_FUN(f) printk(KERN_INFO GYRO_TAG"%s\n", __FUNCTION__) -#define GYRO_ERR(fmt, args...) printk(KERN_ERR GYRO_TAG"%s %d : "fmt, __FUNCTION__, __LINE__, ##args) +#define GYRO_FUN(f) printk(KERN_INFO GYRO_TAG"%s\n", __func__) +#define GYRO_ERR(fmt, args...) printk(KERN_ERR GYRO_TAG"%s %d : "fmt, __func__, __LINE__, ##args) #define GYRO_LOG(fmt, args...) printk(KERN_INFO GYRO_TAG fmt, ##args) #endif /*----------------------------------------------------------------------------*/ diff --git a/drivers/misc/mediatek/gyroscope/mpu3050c/mpu3050c.c b/drivers/misc/mediatek/gyroscope/mpu3050c/mpu3050c.c index d10a40a0e..80f69b9e7 100644 --- a/drivers/misc/mediatek/gyroscope/mpu3050c/mpu3050c.c +++ b/drivers/misc/mediatek/gyroscope/mpu3050c/mpu3050c.c @@ -161,8 +161,8 @@ static bool sensor_data_ready = true; /*----------------------------------------------------------------------------*/ #define GYRO_TAG "[Gyroscope] " -#define GYRO_FUN(f) printk(KERN_INFO GYRO_TAG"%s\n", __FUNCTION__) -#define GYRO_ERR(fmt, args...) printk(KERN_ERR GYRO_TAG"%s %d : "fmt, __FUNCTION__, __LINE__, ##args) +#define GYRO_FUN(f) printk(KERN_INFO GYRO_TAG"%s\n", __func__) +#define GYRO_ERR(fmt, args...) printk(KERN_ERR GYRO_TAG"%s %d : "fmt, __func__, __LINE__, ##args) #define GYRO_LOG(fmt, args...) printk(KERN_INFO GYRO_TAG fmt, ##args) /*----------------------------------------------------------------------------*/ /* diff --git a/drivers/misc/mediatek/gyroscope/mpu6050c/mpu6050c.c b/drivers/misc/mediatek/gyroscope/mpu6050c/mpu6050c.c index 2c2978b77..01242552c 100644 --- a/drivers/misc/mediatek/gyroscope/mpu6050c/mpu6050c.c +++ b/drivers/misc/mediatek/gyroscope/mpu6050c/mpu6050c.c @@ -163,8 +163,8 @@ struct mpu6050c_gyro_i2c_data *mpu6050c_gyro_obj_i2c_data = NULL; /*----------------------------------------------------------------------------*/ #define GYRO_TAG "[Gyroscope] " -#define GYRO_FUN(f) printk(KERN_INFO GYRO_TAG"%s\n", __FUNCTION__) -#define GYRO_ERR(fmt, args...) printk(KERN_ERR GYRO_TAG"%s %d : "fmt, __FUNCTION__, __LINE__, ##args) +#define GYRO_FUN(f) printk(KERN_INFO GYRO_TAG"%s\n", __func__) +#define GYRO_ERR(fmt, args...) printk(KERN_ERR GYRO_TAG"%s %d : "fmt, __func__, __LINE__, ##args) #define GYRO_LOG(fmt, args...) printk(KERN_INFO GYRO_TAG fmt, ##args) /*----------------------------------------------------------------------------*/ /* diff --git a/drivers/misc/mediatek/gyroscope/mpu6050gy-new/mpu6050.c b/drivers/misc/mediatek/gyroscope/mpu6050gy-new/mpu6050.c index df195e76d..d64a9fbb3 100644 --- a/drivers/misc/mediatek/gyroscope/mpu6050gy-new/mpu6050.c +++ b/drivers/misc/mediatek/gyroscope/mpu6050gy-new/mpu6050.c @@ -170,8 +170,8 @@ static bool sensor_power = false; /*----------------------------------------------------------------------------*/ /* #define GYRO_TAG "[Gyroscope] " -#define GYRO_FUN(f) printk(KERN_INFO GYRO_TAG"%s\n", __FUNCTION__) -#define GYRO_ERR(fmt, args...) printk(KERN_ERR GYRO_TAG"%s %d : "fmt, __FUNCTION__, __LINE__, ##args) +#define GYRO_FUN(f) printk(KERN_INFO GYRO_TAG"%s\n", __func__) +#define GYRO_ERR(fmt, args...) printk(KERN_ERR GYRO_TAG"%s %d : "fmt, __func__, __LINE__, ##args) #define GYRO_LOG(fmt, args...) printk(KERN_INFO GYRO_TAG fmt, ##args) */ /*----------------------------------------------------------------------------*/ @@ -1764,7 +1764,7 @@ static long mpu6050_compat_ioctl(struct file *file, unsigned int cmd, unsigned l 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; } diff --git a/drivers/misc/mediatek/gyroscope/mpu6050gy/mpu6050.c b/drivers/misc/mediatek/gyroscope/mpu6050gy/mpu6050.c index c6442a00b..d858626da 100644 --- a/drivers/misc/mediatek/gyroscope/mpu6050gy/mpu6050.c +++ b/drivers/misc/mediatek/gyroscope/mpu6050gy/mpu6050.c @@ -160,8 +160,8 @@ static bool sensor_power = false; /*----------------------------------------------------------------------------*/ #define GYRO_TAG "[Gyroscope] " -#define GYRO_FUN(f) printk(KERN_INFO GYRO_TAG"%s\n", __FUNCTION__) -#define GYRO_ERR(fmt, args...) printk(KERN_ERR GYRO_TAG"%s %d : "fmt, __FUNCTION__, __LINE__, ##args) +#define GYRO_FUN(f) printk(KERN_INFO GYRO_TAG"%s\n", __func__) +#define GYRO_ERR(fmt, args...) printk(KERN_ERR GYRO_TAG"%s %d : "fmt, __func__, __LINE__, ##args) #define GYRO_LOG(fmt, args...) printk(KERN_INFO GYRO_TAG fmt, ##args) /*----------------------------------------------------------------------------*/ diff --git a/drivers/misc/mediatek/gyroscope/mpu6515/mpu6515.c b/drivers/misc/mediatek/gyroscope/mpu6515/mpu6515.c index 0dcc9449e..870b112fd 100644 --- a/drivers/misc/mediatek/gyroscope/mpu6515/mpu6515.c +++ b/drivers/misc/mediatek/gyroscope/mpu6515/mpu6515.c @@ -174,8 +174,8 @@ static struct gyro_init_info gyroscope_init_info = { /*----------------------------------------------------------------------------*/ #if 0 #define GYRO_TAG "[Gyroscope] " -#define GYRO_FUN(f) printk(KERN_INFO GYRO_TAG"%s\n", __FUNCTION__) -#define GYRO_ERR(fmt, args...) printk(KERN_ERR GYRO_TAG"%s %d : "fmt, __FUNCTION__, __LINE__, ##args) +#define GYRO_FUN(f) printk(KERN_INFO GYRO_TAG"%s\n", __func__) +#define GYRO_ERR(fmt, args...) printk(KERN_ERR GYRO_TAG"%s %d : "fmt, __func__, __LINE__, ##args) #define GYRO_LOG(fmt, args...) printk(KERN_INFO GYRO_TAG fmt, ##args) #endif /*----------------------------------------------------------------------------*/ diff --git a/drivers/misc/mediatek/hdmi/Sii8338/smartbook.c b/drivers/misc/mediatek/hdmi/Sii8338/smartbook.c index 15f4ecf00..d66f86014 100644 --- a/drivers/misc/mediatek/hdmi/Sii8338/smartbook.c +++ b/drivers/misc/mediatek/hdmi/Sii8338/smartbook.c @@ -689,7 +689,7 @@ static int __init smb_init(void) smb_dir = proc_mkdir("smb", NULL); if (!smb_dir) { - smb_print("[%s]: mkdir /proc/smb failed\n", __FUNCTION__); + smb_print("[%s]: mkdir /proc/smb failed\n", __func__); } else { diff --git a/drivers/misc/mediatek/hdmi/Sii8348/mhl_linux_tx.c b/drivers/misc/mediatek/hdmi/Sii8348/mhl_linux_tx.c index 0afc778aa..3a2d57b6e 100644 --- a/drivers/misc/mediatek/hdmi/Sii8348/mhl_linux_tx.c +++ b/drivers/misc/mediatek/hdmi/Sii8348/mhl_linux_tx.c @@ -1732,7 +1732,7 @@ int mhl_tx_init(struct mhl_drv_info const *drv_info, struct i2c_client *client) if (drv_info == NULL || client == NULL) { - pr_err("Null parameter passed to %s\n",__FUNCTION__); + pr_err("Null parameter passed to %s\n",__func__); return -EINVAL; } diff --git a/drivers/misc/mediatek/hdmi/Sii8348/platform.c b/drivers/misc/mediatek/hdmi/Sii8348/platform.c index 0935b2424..598f60b81 100644 --- a/drivers/misc/mediatek/hdmi/Sii8348/platform.c +++ b/drivers/misc/mediatek/hdmi/Sii8348/platform.c @@ -462,7 +462,7 @@ static inline int platform_read_i2c_block(struct i2c_adapter *i2c_bus I2C_ReadBlock(page, offset,values, count); ///printk("%s:%d I2c read page:0x%02x,offset:0x%02x,values:0x%02X,count:0x%02X\n" - /// ,__FUNCTION__,__LINE__, page, offset, values, count); + /// ,__func__,__LINE__, page, offset, values, count); return 2; } @@ -481,7 +481,7 @@ static inline int platform_write_i2c_block(struct i2c_adapter *i2c_bus buffer = kmalloc(count + 1, GFP_KERNEL); if (!buffer) { - printk("%s:%d buffer allocation failed\n",__FUNCTION__,__LINE__); + printk("%s:%d buffer allocation failed\n",__func__,__LINE__); return -ENOMEM; } @@ -499,7 +499,7 @@ static inline int platform_write_i2c_block(struct i2c_adapter *i2c_bus if (ret != 1) { printk("%s:%d I2c write failed 0x%02x:0x%02x\n" - ,__FUNCTION__,__LINE__, page, offset); + ,__func__,__LINE__, page, offset); ret = -EIO; } else { ret = 0; diff --git a/drivers/misc/mediatek/hdmi/Sii8348/platform.h b/drivers/misc/mediatek/hdmi/Sii8348/platform.h index 9c838d778..44a460f15 100644 --- a/drivers/misc/mediatek/hdmi/Sii8348/platform.h +++ b/drivers/misc/mediatek/hdmi/Sii8348/platform.h @@ -169,7 +169,7 @@ int is_interrupt_asserted(void); //#define GPIO_LED_ON 0 //#define GPIO_LED_OFF 1 //void set_pin_impl(void *dev_context, int pin_idx, int value,const char *function_name,int line_num); -//#define set_pin(dev_context,pin_idx,value) set_pin_impl(dev_context, pin_idx, value,__FUNCTION__,__LINE__) +//#define set_pin(dev_context,pin_idx,value) set_pin_impl(dev_context, pin_idx, value,__func__,__LINE__) /* typedef enum { diff --git a/drivers/misc/mediatek/hdmi/Sii8348/si_edid.h b/drivers/misc/mediatek/hdmi/Sii8348/si_edid.h index 6c6ec00da..fa1eaa188 100644 --- a/drivers/misc/mediatek/hdmi/Sii8348/si_edid.h +++ b/drivers/misc/mediatek/hdmi/Sii8348/si_edid.h @@ -799,7 +799,7 @@ typedef struct SI_PACK_THIS_STRUCT _HDMI_VIC_info_t #if 1//def ENABLE_EDID_DEBUG_PRINT //( void dump_EDID_block_impl(const char *pszFunction, int iLineNum,uint8_t override,uint8_t *pData,uint16_t length); void clear_EDID_block_impl(uint8_t *pData); -#define DUMP_EDID_BLOCK(override,pData,length) dump_EDID_block_impl(__FUNCTION__,__LINE__,override,(uint8_t *)pData,length); +#define DUMP_EDID_BLOCK(override,pData,length) dump_EDID_block_impl(__func__,__LINE__,override,(uint8_t *)pData,length); #define CLEAR_EDID_BLOCK(pData) clear_EDID_block_impl(pData); #else //)( #define DUMP_EDID_BLOCK(override,pData,length) /* nothing to do */ diff --git a/drivers/misc/mediatek/hdmi/Sii8348/si_mhl2_edid_3d.c b/drivers/misc/mediatek/hdmi/Sii8348/si_mhl2_edid_3d.c index 77540800d..9ee75d42d 100644 --- a/drivers/misc/mediatek/hdmi/Sii8348/si_mhl2_edid_3d.c +++ b/drivers/misc/mediatek/hdmi/Sii8348/si_mhl2_edid_3d.c @@ -782,7 +782,7 @@ static void si_mhl_tx_prune_edid(edid_3d_data_p mhl_edid_3d_data) pb_limit = (uint8_t *)(p_CEA_extension+1); MHL_TX_EDID_INFO(mhl_edid_3d_data->dev_context, - "mhl_tx: %s\n",__FUNCTION__); + "mhl_tx: %s\n",__func__); p_data_u.puc_data_block = (uint8_t *)p_CEA_extension + p_CEA_extension->byte_offset_to_18_byte_descriptors; DUMP_EDID_BLOCK(0,p_EDID_block_0,sizeof(*p_EDID_block_0)) /* no semicolon needed here */ diff --git a/drivers/misc/mediatek/hdmi/Sii8348/smartbook.c b/drivers/misc/mediatek/hdmi/Sii8348/smartbook.c index fe4480a39..71e573684 100644 --- a/drivers/misc/mediatek/hdmi/Sii8348/smartbook.c +++ b/drivers/misc/mediatek/hdmi/Sii8348/smartbook.c @@ -656,7 +656,7 @@ static int __init smb_init(void) smb_dir = proc_mkdir("smb", NULL); if (!smb_dir) { - smb_print("[%s]: mkdir /proc/smb failed\n", __FUNCTION__); + smb_print("[%s]: mkdir /proc/smb failed\n", __func__); } else { diff --git a/drivers/misc/mediatek/hwmon/sensor_dts/sensor_dts.c b/drivers/misc/mediatek/hwmon/sensor_dts/sensor_dts.c index 3d8a996d1..1bf7de4d7 100644 --- a/drivers/misc/mediatek/hwmon/sensor_dts/sensor_dts.c +++ b/drivers/misc/mediatek/hwmon/sensor_dts/sensor_dts.c @@ -21,7 +21,7 @@ #define SENSOR_TAG "[Device Tree] " -#define SENSOR_ERR(fmt, args...) printk(KERN_ERR SENSOR_TAG"%s %d : "fmt, __FUNCTION__, __LINE__, ##args) +#define SENSOR_ERR(fmt, args...) printk(KERN_ERR SENSOR_TAG"%s %d : "fmt, __func__, __LINE__, ##args) #define SENSOR_LOG(fmt, args...) printk(KERN_ERR SENSOR_TAG fmt, ##args) struct acc_hw * get_accel_dts_func(const char *name, struct acc_hw *hw) diff --git a/drivers/misc/mediatek/i2c/mt6735/mt_i2c.h b/drivers/misc/mediatek/i2c/mt6735/mt_i2c.h index ebd38ac54..61a68c4e1 100644 --- a/drivers/misc/mediatek/i2c/mt6735/mt_i2c.h +++ b/drivers/misc/mediatek/i2c/mt6735/mt_i2c.h @@ -6,7 +6,7 @@ #define I2CLOG(fmt, arg...) printk(KERN_ERR I2CTAG fmt, ##arg) #define I2CMSG(fmt, arg...) printk(fmt, ##arg) #define I2CERR(fmt, arg...) printk(KERN_ERR I2CTAG "ERROR,%d: "fmt, __LINE__, ##arg) -#define I2CFUC(fmt, arg...) printk(I2CTAG "%s\n", __FUNCTION__) +#define I2CFUC(fmt, arg...) printk(I2CTAG "%s\n", __func__) #define I2C_DRV_NAME "mt-i2c" #define I2C_NR 4 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 diff --git a/drivers/misc/mediatek/keypad/kpd.c b/drivers/misc/mediatek/keypad/kpd.c index 9790918e5..01b7ca10d 100644 --- a/drivers/misc/mediatek/keypad/kpd.c +++ b/drivers/misc/mediatek/keypad/kpd.c @@ -895,7 +895,7 @@ static int kpd_pdrv_probe(struct platform_device *pdev) kpd_delete_attr(&kpd_pdrv.driver); return err; } - pr_warn(KPD_SAY "%s Done\n", __FUNCTION__); + pr_warn(KPD_SAY "%s Done\n", __func__); return 0; } diff --git a/drivers/misc/mediatek/lcm/hx8394c_wxga_dsi_vdo/hx8394c_wxga_dsi_vdo.c b/drivers/misc/mediatek/lcm/hx8394c_wxga_dsi_vdo/hx8394c_wxga_dsi_vdo.c index be4b8dcb3..b026287b8 100644 --- a/drivers/misc/mediatek/lcm/hx8394c_wxga_dsi_vdo/hx8394c_wxga_dsi_vdo.c +++ b/drivers/misc/mediatek/lcm/hx8394c_wxga_dsi_vdo/hx8394c_wxga_dsi_vdo.c @@ -37,17 +37,17 @@ #define LCM_ALOGD(fmt, ...) \ do { \ - PRINT_FUN(LCM_LOG_LEVEL "<<-" LCM_PREFIX "-dbg-%s>> [%04d] [@%s] " fmt "\n", LCM_MODULE_PART, __LINE__, __FUNCTION__,##__VA_ARGS__); \ + PRINT_FUN(LCM_LOG_LEVEL "<<-" LCM_PREFIX "-dbg-%s>> [%04d] [@%s] " fmt "\n", LCM_MODULE_PART, __LINE__, __func__,##__VA_ARGS__); \ } while (0) #define LCM_ALOGE(fmt, ...) \ do { \ - PRINT_FUN(LCM_LOG_LEVEL "<<-" LCM_PREFIX "-err-%s>> [%04d] [@%s] " fmt "\n", LCM_MODULE_PART, __LINE__, __FUNCTION__,##__VA_ARGS__); \ + PRINT_FUN(LCM_LOG_LEVEL "<<-" LCM_PREFIX "-err-%s>> [%04d] [@%s] " fmt "\n", LCM_MODULE_PART, __LINE__, __func__,##__VA_ARGS__); \ } while (0) #define LCM_ALOGF() \ do { \ - PRINT_FUN(LCM_LOG_LEVEL "<<-" LCM_PREFIX "-fun-%s>> [%04d] [@%s] %s() is call!\n", LCM_MODULE_PART, __LINE__, __FUNCTION__, __FUNCTION__); \ + PRINT_FUN(LCM_LOG_LEVEL "<<-" LCM_PREFIX "-fun-%s>> [%04d] [@%s] %s() is call!\n", LCM_MODULE_PART, __LINE__, __func__, __func__); \ } while (0) #else @@ -56,7 +56,7 @@ #define LCM_ALOGD(fmt, ...) do {} while (0) #define LCM_ALOGE(fmt, ...) \ do { \ - PRINT_FUN(LCM_LOG_LEVEL "<<-" LCM_PREFIX "-err-%s>> [%04d] [@%s] " fmt "\n", LCM_MODULE_PART, __LINE__, __FUNCTION__,##__VA_ARGS__); \ + PRINT_FUN(LCM_LOG_LEVEL "<<-" LCM_PREFIX "-err-%s>> [%04d] [@%s] " fmt "\n", LCM_MODULE_PART, __LINE__, __func__,##__VA_ARGS__); \ } while (0) #endif diff --git a/drivers/misc/mediatek/lcm/nt35510_dbi_18bit_gionee/nt35510_dbi_18bit_gionee.c b/drivers/misc/mediatek/lcm/nt35510_dbi_18bit_gionee/nt35510_dbi_18bit_gionee.c index 19a2fdf96..a9003c63e 100644 --- a/drivers/misc/mediatek/lcm/nt35510_dbi_18bit_gionee/nt35510_dbi_18bit_gionee.c +++ b/drivers/misc/mediatek/lcm/nt35510_dbi_18bit_gionee/nt35510_dbi_18bit_gionee.c @@ -28,7 +28,7 @@ #define LCM_PRINT printk #endif -#define LCM_PRINT_FUNC() LCM_PRINT("LCM35510" "`%s:%d [%s] " "\n", __FILE__, __LINE__, __FUNCTION__) +#define LCM_PRINT_FUNC() LCM_PRINT("LCM35510" "`%s:%d [%s] " "\n", __FILE__, __LINE__, __func__) // --------------------------------------------------------------------------- // Local Variables diff --git a/drivers/misc/mediatek/lcm/r63315_fhd_dsi_vdo_truly/r63315_fhd_dsi_vdo_truly.c b/drivers/misc/mediatek/lcm/r63315_fhd_dsi_vdo_truly/r63315_fhd_dsi_vdo_truly.c index 759734273..99a762cfb 100644 --- a/drivers/misc/mediatek/lcm/r63315_fhd_dsi_vdo_truly/r63315_fhd_dsi_vdo_truly.c +++ b/drivers/misc/mediatek/lcm/r63315_fhd_dsi_vdo_truly/r63315_fhd_dsi_vdo_truly.c @@ -239,7 +239,7 @@ static unsigned int lcd_id; static void lcm_init(void) { #ifdef BUILD_LK - printf("%s, %d,r63315 id = 0x%x\n",__FUNCTION__,__LINE__,lcd_id); + printf("%s, %d,r63315 id = 0x%x\n",__func__,__LINE__,lcd_id); #endif lcm_util.set_gpio_mode(GPIO112, GPIO_MODE_00); @@ -347,7 +347,7 @@ static unsigned int lcm_esd_check(void) if(dummy_delay %2 == 0) { - //printk("%s return 1\n",__FUNCTION__); + //printk("%s return 1\n",__func__); data_array[0] = 0x00013700; dsi_set_cmdq(data_array, 1, 1); @@ -380,7 +380,7 @@ static unsigned int lcm_esd_check(void) static unsigned int lcm_esd_recover(void) { - //printk("%s \n",__FUNCTION__); + //printk("%s \n",__func__); lcm_resume(); lcm_init(); diff --git a/drivers/misc/mediatek/lens/common/ad5820af/AD5820AF.c b/drivers/misc/mediatek/lens/common/ad5820af/AD5820AF.c index 9d8736278..faac76938 100644 --- a/drivers/misc/mediatek/lens/common/ad5820af/AD5820AF.c +++ b/drivers/misc/mediatek/lens/common/ad5820af/AD5820AF.c @@ -31,7 +31,7 @@ static struct i2c_board_info __initdata kd_lens_dev={ I2C_BOARD_INFO(AF_DRVNAME, #define AF_DEBUG #ifdef AF_DEBUG -#define LOG_INF(format, args...) pr_debug(AF_DRVNAME " [%s] " format, __FUNCTION__, ##args) +#define LOG_INF(format, args...) pr_debug(AF_DRVNAME " [%s] " format, __func__, ##args) #else #define LOG_INF(format, args...) #endif diff --git a/drivers/misc/mediatek/lens/common/bu6429af/BU6429AF.c b/drivers/misc/mediatek/lens/common/bu6429af/BU6429AF.c index f018101b5..1faefc840 100644 --- a/drivers/misc/mediatek/lens/common/bu6429af/BU6429AF.c +++ b/drivers/misc/mediatek/lens/common/bu6429af/BU6429AF.c @@ -31,7 +31,7 @@ static struct i2c_board_info __initdata kd_lens_dev={ I2C_BOARD_INFO(AF_DRVNAME, #define AF_DEBUG #ifdef AF_DEBUG -#define LOG_INF(format, args...) pr_debug(AF_DRVNAME " [%s] " format, __FUNCTION__, ##args) +#define LOG_INF(format, args...) pr_debug(AF_DRVNAME " [%s] " format, __func__, ##args) #else #define LOG_INF(format, args...) #endif diff --git a/drivers/misc/mediatek/lens/common/bu64745gwzaf/BU64745GWZAF.c b/drivers/misc/mediatek/lens/common/bu64745gwzaf/BU64745GWZAF.c index e7f1a6c7e..8bd6193c0 100644 --- a/drivers/misc/mediatek/lens/common/bu64745gwzaf/BU64745GWZAF.c +++ b/drivers/misc/mediatek/lens/common/bu64745gwzaf/BU64745GWZAF.c @@ -31,7 +31,7 @@ static struct i2c_board_info __initdata kd_lens_dev={ I2C_BOARD_INFO(AF_DRVNAME, #define AF_DEBUG #ifdef AF_DEBUG -#define LOG_INF(format, args...) pr_debug(AF_DRVNAME " [%s] " format, __FUNCTION__, ##args) +#define LOG_INF(format, args...) pr_debug(AF_DRVNAME " [%s] " format, __func__, ##args) #else #define LOG_INF(format, args...) #endif diff --git a/drivers/misc/mediatek/lens/common/dw9714af/DW9714AF.c b/drivers/misc/mediatek/lens/common/dw9714af/DW9714AF.c index 82f09f00d..ff3b6665e 100644 --- a/drivers/misc/mediatek/lens/common/dw9714af/DW9714AF.c +++ b/drivers/misc/mediatek/lens/common/dw9714af/DW9714AF.c @@ -32,7 +32,7 @@ static struct i2c_board_info __initdata kd_lens_dev={ I2C_BOARD_INFO(AF_DRVNAME, #define AF_DEBUG #ifdef AF_DEBUG -#define LOG_INF(format, args...) pr_debug(AF_DRVNAME " [%s] " format, __FUNCTION__, ##args) +#define LOG_INF(format, args...) pr_debug(AF_DRVNAME " [%s] " format, __func__, ##args) #else #define LOG_INF(format, args...) #endif diff --git a/drivers/misc/mediatek/lens/common/fm50af/FM50AF.c b/drivers/misc/mediatek/lens/common/fm50af/FM50AF.c index b53420c1c..d3a01e6d5 100644 --- a/drivers/misc/mediatek/lens/common/fm50af/FM50AF.c +++ b/drivers/misc/mediatek/lens/common/fm50af/FM50AF.c @@ -31,7 +31,7 @@ static struct i2c_board_info __initdata kd_lens_dev={ I2C_BOARD_INFO(AF_DRVNAME, #define AF_DEBUG #ifdef AF_DEBUG -#define LOG_INF(format, args...) pr_debug(AF_DRVNAME " [%s] " format, __FUNCTION__, ##args) +#define LOG_INF(format, args...) pr_debug(AF_DRVNAME " [%s] " format, __func__, ##args) #else #define LOG_INF(format, args...) #endif diff --git a/drivers/misc/mediatek/lens/common/lc898212af/LC898212AF.c b/drivers/misc/mediatek/lens/common/lc898212af/LC898212AF.c index f4bff661e..cccfe5c1b 100644 --- a/drivers/misc/mediatek/lens/common/lc898212af/LC898212AF.c +++ b/drivers/misc/mediatek/lens/common/lc898212af/LC898212AF.c @@ -30,7 +30,7 @@ static struct i2c_board_info __initdata kd_lens_dev={ I2C_BOARD_INFO(AF_DRVNAME, #define AF_DEBUG #ifdef AF_DEBUG -#define LOG_INF(format, args...) pr_debug(AF_DRVNAME " [%s] " format, __FUNCTION__, ##args) +#define LOG_INF(format, args...) pr_debug(AF_DRVNAME " [%s] " format, __func__, ##args) #else #define LOG_INF(format, args...) #endif diff --git a/drivers/misc/mediatek/lens/mt6735/ad5820af/AD5820AF.c b/drivers/misc/mediatek/lens/mt6735/ad5820af/AD5820AF.c index a2fdfcc22..12fe957cf 100644 --- a/drivers/misc/mediatek/lens/mt6735/ad5820af/AD5820AF.c +++ b/drivers/misc/mediatek/lens/mt6735/ad5820af/AD5820AF.c @@ -32,7 +32,7 @@ static struct i2c_board_info __initdata kd_lens_dev={ I2C_BOARD_INFO(AF_DRVNAME, #define AF_DEBUG #ifdef AF_DEBUG -#define LOG_INF(format, args...) pr_debug(AF_DRVNAME " [%s] " format, __FUNCTION__, ##args) +#define LOG_INF(format, args...) pr_debug(AF_DRVNAME " [%s] " format, __func__, ##args) #else #define LOG_INF(format, args...) #endif diff --git a/drivers/misc/mediatek/lens/mt6735/ak7345af/ak7345af.c b/drivers/misc/mediatek/lens/mt6735/ak7345af/ak7345af.c index 818cbead1..ad31f069d 100644 --- a/drivers/misc/mediatek/lens/mt6735/ak7345af/ak7345af.c +++ b/drivers/misc/mediatek/lens/mt6735/ak7345af/ak7345af.c @@ -30,7 +30,7 @@ static struct i2c_board_info __initdata kd_lens_dev={ I2C_BOARD_INFO(AF_DRVNAME, #define AF_DEBUG #ifdef AF_DEBUG -#define LOG_INF(format, args...) pr_debug(AF_DRVNAME " [%s] " format, __FUNCTION__, ##args) +#define LOG_INF(format, args...) pr_debug(AF_DRVNAME " [%s] " format, __func__, ##args) #else #define LOG_INF(format, args...) #endif diff --git a/drivers/misc/mediatek/lens/mt6735/bu6429af/BU6429AF.c b/drivers/misc/mediatek/lens/mt6735/bu6429af/BU6429AF.c index d7bd050f2..a0ac91f7d 100644 --- a/drivers/misc/mediatek/lens/mt6735/bu6429af/BU6429AF.c +++ b/drivers/misc/mediatek/lens/mt6735/bu6429af/BU6429AF.c @@ -31,7 +31,7 @@ static struct i2c_board_info __initdata kd_lens_dev={ I2C_BOARD_INFO(AF_DRVNAME, #define AF_DEBUG #ifdef AF_DEBUG -#define LOG_INF(format, args...) pr_debug(AF_DRVNAME " [%s] " format, __FUNCTION__, ##args) +#define LOG_INF(format, args...) pr_debug(AF_DRVNAME " [%s] " format, __func__, ##args) #else #define LOG_INF(format, args...) #endif diff --git a/drivers/misc/mediatek/lens/mt6735/bu64745gwzaf/BU64745GWZAF.c b/drivers/misc/mediatek/lens/mt6735/bu64745gwzaf/BU64745GWZAF.c index d347de73c..9f91adc80 100644 --- a/drivers/misc/mediatek/lens/mt6735/bu64745gwzaf/BU64745GWZAF.c +++ b/drivers/misc/mediatek/lens/mt6735/bu64745gwzaf/BU64745GWZAF.c @@ -31,7 +31,7 @@ static struct i2c_board_info __initdata kd_lens_dev={ I2C_BOARD_INFO(AF_DRVNAME, #define AF_DEBUG #ifdef AF_DEBUG -#define LOG_INF(format, args...) pr_debug(AF_DRVNAME " [%s] " format, __FUNCTION__, ##args) +#define LOG_INF(format, args...) pr_debug(AF_DRVNAME " [%s] " format, __func__, ##args) #else #define LOG_INF(format, args...) #endif diff --git a/drivers/misc/mediatek/lens/mt6735/dw9714af/DW9714AF.c b/drivers/misc/mediatek/lens/mt6735/dw9714af/DW9714AF.c index 6cbc09048..4ffeea2db 100644 --- a/drivers/misc/mediatek/lens/mt6735/dw9714af/DW9714AF.c +++ b/drivers/misc/mediatek/lens/mt6735/dw9714af/DW9714AF.c @@ -32,7 +32,7 @@ static struct i2c_board_info __initdata kd_lens_dev={ I2C_BOARD_INFO(AF_DRVNAME, #define AF_DEBUG #ifdef AF_DEBUG -#define LOG_INF(format, args...) pr_debug(AF_DRVNAME " [%s] " format, __FUNCTION__, ##args) +#define LOG_INF(format, args...) pr_debug(AF_DRVNAME " [%s] " format, __func__, ##args) #else #define LOG_INF(format, args...) #endif diff --git a/drivers/misc/mediatek/lens/mt6735/fm50af/FM50AF.c b/drivers/misc/mediatek/lens/mt6735/fm50af/FM50AF.c index 479ce4921..9c28ae78a 100644 --- a/drivers/misc/mediatek/lens/mt6735/fm50af/FM50AF.c +++ b/drivers/misc/mediatek/lens/mt6735/fm50af/FM50AF.c @@ -31,7 +31,7 @@ static struct i2c_board_info __initdata kd_lens_dev={ I2C_BOARD_INFO(AF_DRVNAME, #define AF_DEBUG #ifdef AF_DEBUG -#define LOG_INF(format, args...) pr_debug(AF_DRVNAME " [%s] " format, __FUNCTION__, ##args) +#define LOG_INF(format, args...) pr_debug(AF_DRVNAME " [%s] " format, __func__, ##args) #else #define LOG_INF(format, args...) #endif diff --git a/drivers/misc/mediatek/lens/mt6735/lc898212af/LC898212AF.c b/drivers/misc/mediatek/lens/mt6735/lc898212af/LC898212AF.c index d111a4b07..af0bfe03d 100644 --- a/drivers/misc/mediatek/lens/mt6735/lc898212af/LC898212AF.c +++ b/drivers/misc/mediatek/lens/mt6735/lc898212af/LC898212AF.c @@ -30,7 +30,7 @@ static struct i2c_board_info __initdata kd_lens_dev={ I2C_BOARD_INFO(AF_DRVNAME, #define AF_DEBUG #ifdef AF_DEBUG -#define LOG_INF(format, args...) pr_debug(AF_DRVNAME " [%s] " format, __FUNCTION__, ##args) +#define LOG_INF(format, args...) pr_debug(AF_DRVNAME " [%s] " format, __func__, ##args) #else #define LOG_INF(format, args...) #endif diff --git a/drivers/misc/mediatek/mach/mt6735/camera_fdvt_D1.c b/drivers/misc/mediatek/mach/mt6735/camera_fdvt_D1.c index 1f039175c..d213de426 100644 --- a/drivers/misc/mediatek/mach/mt6735/camera_fdvt_D1.c +++ b/drivers/misc/mediatek/mach/mt6735/camera_fdvt_D1.c @@ -54,7 +54,7 @@ #define MT6573FDVT_PARM #ifdef MT6573FDVT_PARM -#define LOG_DBG(fmt,arg...) printk("[CAMERAFDVT]" "%s() - " fmt, __FUNCTION__ ,##arg) +#define LOG_DBG(fmt,arg...) printk("[CAMERAFDVT]" "%s() - " fmt, __func__ ,##arg) #else #define LOG_DBG(fmt,arg...) #endif diff --git a/drivers/misc/mediatek/mach/mt6735/camera_isp_D1.c b/drivers/misc/mediatek/mach/mt6735/camera_isp_D1.c index cd123cde6..815f2a3d1 100644 --- a/drivers/misc/mediatek/mach/mt6735/camera_isp_D1.c +++ b/drivers/misc/mediatek/mach/mt6735/camera_isp_D1.c @@ -76,10 +76,10 @@ typedef bool MBOOL; #define MFALSE 0 #endif /* ---------------------------------------------------------------------------- */ -/* #define LOG_MSG(fmt, arg...) printk(KERN_ERR "[ISP][%s]" fmt,__FUNCTION__, ##arg) */ -/* #define LOG_DBG(fmt, arg...) printk(KERN_ERR "[ISP][%s]" fmt,__FUNCTION__, ##arg) */ -/* #define LOG_WRN(fmt, arg...) printk(KERN_ERR "[ISP][%s]Warning" fmt,__FUNCTION__, ##arg) */ -/* #define LOG_ERR(fmt, arg...) printk(KERN_ERR "[ISP][%s]Err(%5d):" fmt, __FUNCTION__,__LINE__, ##arg) */ +/* #define LOG_MSG(fmt, arg...) printk(KERN_ERR "[ISP][%s]" fmt,__func__, ##arg) */ +/* #define LOG_DBG(fmt, arg...) printk(KERN_ERR "[ISP][%s]" fmt,__func__, ##arg) */ +/* #define LOG_WRN(fmt, arg...) printk(KERN_ERR "[ISP][%s]Warning" fmt,__func__, ##arg) */ +/* #define LOG_ERR(fmt, arg...) printk(KERN_ERR "[ISP][%s]Err(%5d):" fmt, __func__,__LINE__, ##arg) */ #define MyTag "ISP " @@ -940,7 +940,7 @@ static MUINT32 g_DmaErr_p1[nDMA_ERR] = {0}; } \ } while (0); #else -#define IRQ_LOG_KEEPER(irq, ppb, logT, fmt, ...) xlog_printk(ANDROID_LOG_DEBUG , "KEEPER", "[%s] " fmt, __FUNCTION__, ##__VA_ARGS__) +#define IRQ_LOG_KEEPER(irq, ppb, logT, fmt, ...) xlog_printk(ANDROID_LOG_DEBUG , "KEEPER", "[%s] " fmt, __func__, ##__VA_ARGS__) #endif #if 1 diff --git a/drivers/misc/mediatek/mach/mt6735/camera_isp_FrmB_D2.c b/drivers/misc/mediatek/mach/mt6735/camera_isp_FrmB_D2.c index 3cac606e9..f8692e404 100644 --- a/drivers/misc/mediatek/mach/mt6735/camera_isp_FrmB_D2.c +++ b/drivers/misc/mediatek/mach/mt6735/camera_isp_FrmB_D2.c @@ -516,7 +516,7 @@ static MUINT32 g_DmaErr_p1[nDMA_ERR] = {0}; } \ }while(0); #else -#define IRQ_LOG_KEEPER(irq,ppb,logT,fmt,...) pr_debug("KEEPER[%s] " fmt, __FUNCTION__, ##__VA_ARGS__) +#define IRQ_LOG_KEEPER(irq,ppb,logT,fmt,...) pr_debug("KEEPER[%s] " fmt, __func__, ##__VA_ARGS__) #endif #if 1 diff --git a/drivers/misc/mediatek/mach/mt6735/include/mach/camera_pipe_mgr_imp_D2.h b/drivers/misc/mediatek/mach/mt6735/include/mach/camera_pipe_mgr_imp_D2.h index 4694b3be7..2399515fc 100644 --- a/drivers/misc/mediatek/mach/mt6735/include/mach/camera_pipe_mgr_imp_D2.h +++ b/drivers/misc/mediatek/mach/mt6735/include/mach/camera_pipe_mgr_imp_D2.h @@ -27,9 +27,9 @@ typedef bool MBOOL; #define MFALSE false //----------------------------------------------------------------------------- #define LOG_TAG "CamPipeMgr" -#define LOG_MSG(fmt, arg...) pr_debug(LOG_TAG "[%s]" fmt "\r\n", __FUNCTION__, ##arg) -#define LOG_WRN(fmt, arg...) pr_warn (LOG_TAG "[%s]WRN(%5d):" fmt "\r\n", __FUNCTION__, __LINE__, ##arg) -#define LOG_ERR(fmt, arg...) pr_err (LOG_TAG "[%s]ERR(%5d):" fmt "\r\n", __FUNCTION__, __LINE__, ##arg) +#define LOG_MSG(fmt, arg...) pr_debug(LOG_TAG "[%s]" fmt "\r\n", __func__, ##arg) +#define LOG_WRN(fmt, arg...) pr_warn (LOG_TAG "[%s]WRN(%5d):" fmt "\r\n", __func__, __LINE__, ##arg) +#define LOG_ERR(fmt, arg...) pr_err (LOG_TAG "[%s]ERR(%5d):" fmt "\r\n", __func__, __LINE__, ##arg) #define LOG_DMP(fmt, arg...) pr_err (LOG_TAG "" fmt, ##arg) //----------------------------------------------------------------------------- #define CAM_PIPE_MGR_DEV_NUM (1) diff --git a/drivers/misc/mediatek/mach/mt6735/include/mach/camera_sysram_imp_D2.h b/drivers/misc/mediatek/mach/mt6735/include/mach/camera_sysram_imp_D2.h index 73732f926..13d0fba25 100644 --- a/drivers/misc/mediatek/mach/mt6735/include/mach/camera_sysram_imp_D2.h +++ b/drivers/misc/mediatek/mach/mt6735/include/mach/camera_sysram_imp_D2.h @@ -26,9 +26,9 @@ typedef bool MBOOL; #define MFALSE false //----------------------------------------------------------------------------- #define LOG_TAG "SYSRAM" -#define LOG_MSG(fmt, arg...) pr_debug(LOG_TAG "[%s]" fmt "\r\n", __FUNCTION__, ##arg) -#define LOG_WRN(fmt, arg...) pr_warn (LOG_TAG "[%s]WRN(%5d):" fmt "\r\n", __FUNCTION__, __LINE__, ##arg) -#define LOG_ERR(fmt, arg...) pr_err (LOG_TAG "[%s]ERR(%5d):" fmt "\r\n", __FUNCTION__, __LINE__, ##arg) +#define LOG_MSG(fmt, arg...) pr_debug(LOG_TAG "[%s]" fmt "\r\n", __func__, ##arg) +#define LOG_WRN(fmt, arg...) pr_warn (LOG_TAG "[%s]WRN(%5d):" fmt "\r\n", __func__, __LINE__, ##arg) +#define LOG_ERR(fmt, arg...) pr_err (LOG_TAG "[%s]ERR(%5d):" fmt "\r\n", __func__, __LINE__, ##arg) #define LOG_DMP(fmt, arg...) pr_err (LOG_TAG "" fmt, ##arg) //----------------------------------------------------------------------------- #define SYSRAM_DEBUG_DEFAULT (0xFFFFFFFF) diff --git a/drivers/misc/mediatek/mach/mt6735/include/mach/mt_freqhopping.h b/drivers/misc/mediatek/mach/mt6735/include/mach/mt_freqhopping.h index a406ec2f5..9d6d24128 100644 --- a/drivers/misc/mediatek/mach/mt6735/include/mach/mt_freqhopping.h +++ b/drivers/misc/mediatek/mach/mt6735/include/mach/mt_freqhopping.h @@ -13,7 +13,7 @@ #define FH_MSG(fmt, args...) \ do { \ printk( FHTAG""fmt" <- %s(): L<%d> PID<%s><%d>\n", \ - ##args ,__FUNCTION__,__LINE__,current->comm,current->pid);\ + ##args ,__func__,__LINE__,current->comm,current->pid);\ } while(0); #define FH_MSG_DEBUG FH_MSG diff --git a/drivers/misc/mediatek/mach/mt6735/include/mach/mtk_nand.h b/drivers/misc/mediatek/mach/mt6735/include/mach/mtk_nand.h index f8f90e1e0..078e31a49 100644 --- a/drivers/misc/mediatek/mach/mt6735/include/mach/mtk_nand.h +++ b/drivers/misc/mediatek/mach/mt6735/include/mach/mtk_nand.h @@ -415,7 +415,7 @@ do { \ } \ } while(0) -#define MSG_FUNC_ENTRY(f) MSG(FUC, "<FUN_ENT>: %s\n", __FUNCTION__) +#define MSG_FUNC_ENTRY(f) MSG(FUC, "<FUN_ENT>: %s\n", __func__) #else #define MSG(evt, fmt, args...) do{}while(0) #define MSG_FUNC_ENTRY(f) do{}while(0) diff --git a/drivers/misc/mediatek/mach/mt6735/include/mach/pmic.h b/drivers/misc/mediatek/mach/mt6735/include/mach/pmic.h index 05c9628ad..7e859117e 100644 --- a/drivers/misc/mediatek/mach/mt6735/include/mach/pmic.h +++ b/drivers/misc/mediatek/mach/mt6735/include/mach/pmic.h @@ -32,7 +32,7 @@ do { \ #define PMICTAG "[PMIC] " #ifdef PMIC_DEBUG #define PMICDEB(fmt, arg...) printk(PMICTAG "cpuid=%d," fmt,raw_smp_processor_id(), ##arg) - #define PMICFUC(fmt, arg...) printk(PMICTAG "cpuid=%d,%s\n", raw_smp_processor_id(), __FUNCTION__) + #define PMICFUC(fmt, arg...) printk(PMICTAG "cpuid=%d,%s\n", raw_smp_processor_id(), __func__) #endif #define PMICLOG(fmt, arg...) printk(PMICTAG fmt,##arg) #define PMICERR(fmt, arg...) printk(KERN_ERR PMICTAG "ERROR,line=%d " fmt, __LINE__, ##arg) diff --git a/drivers/misc/mediatek/mach/mt6735/mt_devs.c b/drivers/misc/mediatek/mach/mt6735/mt_devs.c index baf6a406e..c6b1cdc72 100644 --- a/drivers/misc/mediatek/mach/mt6735/mt_devs.c +++ b/drivers/misc/mediatek/mach/mt6735/mt_devs.c @@ -1284,7 +1284,7 @@ static void parse_dfo_tag(struct tag *t) int nr = ((t->hdr.size << 2) - sizeof(struct tag_header)) / sizeof(tag_dfo_boot); tag_dfo_boot *p = 0; p = &(t->u.dfo_data); - printk(KERN_ALERT"%s start\n", __FUNCTION__); + printk(KERN_ALERT"%s start\n", __func__); printk(KERN_ALERT"tag_header size: %d, tag_dfo_boot size: %d\n" "hdr.size: %d\n", sizeof(struct tag_header), sizeof(tag_dfo_boot), @@ -2901,7 +2901,7 @@ static void display_early_memory_info(void) void __weak mtk_wcn_consys_memory_reserve(void) { - printk(KERN_ERR"weak reserve function: %s", __FUNCTION__); + printk(KERN_ERR"weak reserve function: %s", __func__); } void mt_reserve(void) diff --git a/drivers/misc/mediatek/mach/mt6735/mt_golden_setting.c b/drivers/misc/mediatek/mach/mt6735/mt_golden_setting.c index 7645a5970..75160c665 100644 --- a/drivers/misc/mediatek/mach/mt6735/mt_golden_setting.c +++ b/drivers/misc/mediatek/mach/mt6735/mt_golden_setting.c @@ -113,8 +113,8 @@ #define FUNC_LV_MASK (FUNC_LV_API | FUNC_LV_LOCKED | FUNC_LV_BODY | FUNC_LV_OP | FUNC_LV_REG_ACCESS | FUNC_LV_DONT_CARE) #if defined(CONFIG_CLKMGR_SHOWLOG) -#define ENTER_FUNC(lv) do { if (lv & FUNC_LV_MASK) xlog_printk(ANDROID_LOG_WARN, TAG, ">> %s()\n", __FUNCTION__); } while(0) -#define EXIT_FUNC(lv) do { if (lv & FUNC_LV_MASK) xlog_printk(ANDROID_LOG_WARN, TAG, "<< %s():%d\n", __FUNCTION__, __LINE__); } while(0) +#define ENTER_FUNC(lv) do { if (lv & FUNC_LV_MASK) xlog_printk(ANDROID_LOG_WARN, TAG, ">> %s()\n", __func__); } while(0) +#define EXIT_FUNC(lv) do { if (lv & FUNC_LV_MASK) xlog_printk(ANDROID_LOG_WARN, TAG, "<< %s():%d\n", __func__, __LINE__); } while(0) #else #define ENTER_FUNC(lv) #define EXIT_FUNC(lv) @@ -129,30 +129,30 @@ #if defined(CONFIG_CLKMGR_EMULATION) // XXX: NOT ACCESS REGISTER #define clk_readl(addr) \ - ((FUNC_LV_REG_ACCESS & FUNC_LV_MASK) ? xlog_printk(ANDROID_LOG_WARN, TAG, "clk_readl("HEX_FMT") @ %s():%d\n", (addr), __FUNCTION__, __LINE__) : 0, 0) + ((FUNC_LV_REG_ACCESS & FUNC_LV_MASK) ? xlog_printk(ANDROID_LOG_WARN, TAG, "clk_readl("HEX_FMT") @ %s():%d\n", (addr), __func__, __LINE__) : 0, 0) #define clk_writel(addr, val) \ - do { if (FUNC_LV_REG_ACCESS & FUNC_LV_MASK) xlog_printk(ANDROID_LOG_WARN, TAG, "clk_writel("HEX_FMT", "HEX_FMT") @ %s():%d\n", (addr), (val), __FUNCTION__, __LINE__); } while(0) + do { if (FUNC_LV_REG_ACCESS & FUNC_LV_MASK) xlog_printk(ANDROID_LOG_WARN, TAG, "clk_writel("HEX_FMT", "HEX_FMT") @ %s():%d\n", (addr), (val), __func__, __LINE__); } while(0) #define clk_setl(addr, val) \ - do { if (FUNC_LV_REG_ACCESS & FUNC_LV_MASK) xlog_printk(ANDROID_LOG_WARN, TAG, "clk_setl("HEX_FMT", "HEX_FMT") @ %s():%d\n", (addr), (val), __FUNCTION__, __LINE__); } while(0) + do { if (FUNC_LV_REG_ACCESS & FUNC_LV_MASK) xlog_printk(ANDROID_LOG_WARN, TAG, "clk_setl("HEX_FMT", "HEX_FMT") @ %s():%d\n", (addr), (val), __func__, __LINE__); } while(0) #define clk_clrl(addr, val) \ - do { if (FUNC_LV_REG_ACCESS & FUNC_LV_MASK) xlog_printk(ANDROID_LOG_WARN, TAG, "clk_clrl("HEX_FMT", "HEX_FMT") @ %s():%d\n", (addr), (val), __FUNCTION__, __LINE__); } while(0) + do { if (FUNC_LV_REG_ACCESS & FUNC_LV_MASK) xlog_printk(ANDROID_LOG_WARN, TAG, "clk_clrl("HEX_FMT", "HEX_FMT") @ %s():%d\n", (addr), (val), __func__, __LINE__); } while(0) #else // XXX: ACCESS REGISTER #define clk_readl(addr) \ - ((FUNC_LV_REG_ACCESS & FUNC_LV_MASK) ? xlog_printk(ANDROID_LOG_WARN, TAG, "clk_readl("HEX_FMT") @ %s():%d\n", (addr), __FUNCTION__, __LINE__) : 0, DRV_Reg32(addr)) + ((FUNC_LV_REG_ACCESS & FUNC_LV_MASK) ? xlog_printk(ANDROID_LOG_WARN, TAG, "clk_readl("HEX_FMT") @ %s():%d\n", (addr), __func__, __LINE__) : 0, DRV_Reg32(addr)) #define clk_writel(addr, val) \ - do { unsigned int value; if (FUNC_LV_REG_ACCESS & FUNC_LV_MASK) xlog_printk(ANDROID_LOG_WARN, TAG, "clk_writel("HEX_FMT", "HEX_FMT") @ %s():%d\n", (addr), (value = val), __FUNCTION__, __LINE__); mt65xx_reg_sync_writel((value), (addr)); } while(0) + do { unsigned int value; if (FUNC_LV_REG_ACCESS & FUNC_LV_MASK) xlog_printk(ANDROID_LOG_WARN, TAG, "clk_writel("HEX_FMT", "HEX_FMT") @ %s():%d\n", (addr), (value = val), __func__, __LINE__); mt65xx_reg_sync_writel((value), (addr)); } while(0) #define clk_setl(addr, val) \ - do { if (FUNC_LV_REG_ACCESS & FUNC_LV_MASK) xlog_printk(ANDROID_LOG_WARN, TAG, "clk_setl("HEX_FMT", "HEX_FMT") @ %s():%d\n", (addr), (val), __FUNCTION__, __LINE__); mt65xx_reg_sync_writel(clk_readl(addr) | (val), (addr)); } while(0) + do { if (FUNC_LV_REG_ACCESS & FUNC_LV_MASK) xlog_printk(ANDROID_LOG_WARN, TAG, "clk_setl("HEX_FMT", "HEX_FMT") @ %s():%d\n", (addr), (val), __func__, __LINE__); mt65xx_reg_sync_writel(clk_readl(addr) | (val), (addr)); } while(0) #define clk_clrl(addr, val) \ - do { if (FUNC_LV_REG_ACCESS & FUNC_LV_MASK) xlog_printk(ANDROID_LOG_WARN, TAG, "clk_clrl("HEX_FMT", "HEX_FMT") @ %s():%d\n", (addr), (val), __FUNCTION__, __LINE__); mt65xx_reg_sync_writel(clk_readl(addr) & ~(val), (addr)); } while(0) + do { if (FUNC_LV_REG_ACCESS & FUNC_LV_MASK) xlog_printk(ANDROID_LOG_WARN, TAG, "clk_clrl("HEX_FMT", "HEX_FMT") @ %s():%d\n", (addr), (val), __func__, __LINE__); mt65xx_reg_sync_writel(clk_readl(addr) & ~(val), (addr)); } while(0) #endif // defined(CONFIG_CLKMGR_EMULATION) @@ -294,7 +294,7 @@ static void __iomem *_golden_io_phys_to_virt(unsigned int addr) unsigned int base = addr & (~(unsigned long)REMAP_SIZE_MASK); unsigned int offset = addr & (unsigned long)REMAP_SIZE_MASK; - //clk_dbg("%s: addr=0x%x, base=0x%x, offset=0x%x\n", __FUNCTION__, addr, base, offset); + //clk_dbg("%s: addr=0x%x, base=0x%x, offset=0x%x\n", __func__, addr, base, offset); if (!_golden.phy_base || _golden.phy_base != base) { @@ -676,8 +676,8 @@ static int golden_test_proc_show(struct seq_file *m, void *v) static struct snapshot *snapshot; if (0 == 0 // off // buf_golden_setting_idx - && !strcmp(_golden.func, __FUNCTION__) && (_golden.line == 0)) { - snapshot_golden_setting(__FUNCTION__, 0); + && !strcmp(_golden.func, __func__) && (_golden.line == 0)) { + snapshot_golden_setting(__func__, 0); } while ((0 != buf_golden_setting_idx) || (NULL != (snapshot = _snapshot_consume(&_golden)))) { diff --git a/drivers/misc/mediatek/mach/mt6735/mt_pm_init.c b/drivers/misc/mediatek/mach/mt6735/mt_pm_init.c index 1eccde4d4..f6cbdca13 100644 --- a/drivers/misc/mediatek/mach/mt6735/mt_pm_init.c +++ b/drivers/misc/mediatek/mach/mt6735/mt_pm_init.c @@ -595,7 +595,7 @@ static int __init mt_power_management_init(void) //pm_init_dir = proc_mkdir("pm_init", NULL); if (!pm_init_dir) { - pr_err("[%s]: mkdir /proc/pm_init failed\n", __FUNCTION__); + pr_err("[%s]: mkdir /proc/pm_init failed\n", __func__); } else { diff --git a/drivers/misc/mediatek/mach/mt6735/mt_pm_ldo.c b/drivers/misc/mediatek/mach/mt6735/mt_pm_ldo.c index 0ef6ea04e..58f69a242 100644 --- a/drivers/misc/mediatek/mach/mt6735/mt_pm_ldo.c +++ b/drivers/misc/mediatek/mach/mt6735/mt_pm_ldo.c @@ -38,7 +38,7 @@ do { \ } \ } while(0) -#define MSG_FUNC_ENTRY(f) MSG(ENTER, "<PMAPI FUNC>: %s\n", __FUNCTION__) +#define MSG_FUNC_ENTRY(f) MSG(ENTER, "<PMAPI FUNC>: %s\n", __func__) #else #define MSG(evt, fmt, args...) do{}while(0) #define MSG_FUNC_ENTRY(f) do{}while(0) @@ -81,7 +81,7 @@ bool hwPowerOn(MT65XX_POWER powerId, MT65XX_POWER_VOLTAGE powerVolt, char *mode_ if (!strcmp(g_MT_PMIC_BusHW.Power[powerId].mod_name[i], NON_OP)) { MSG(PMIC,"[%s] acquire powerId:%d index:%d mod_name: %s powerVolt:%d\r\n", - __FUNCTION__,powerId, i, mode_name,powerVolt); + __func__,powerId, i, mode_name,powerVolt); sprintf(g_MT_PMIC_BusHW.Power[powerId].mod_name[i] , "%s", mode_name); break ; } @@ -143,14 +143,14 @@ bool hwPowerDown(MT65XX_POWER powerId, char *mode_name) BOOL bFind = FALSE; if(powerId >= MT65XX_POWER_COUNT_END) { - MSG(PMIC,"%s:%s:%d powerId:%d is wrong\r\n",__FILE__,__FUNCTION__, + MSG(PMIC,"%s:%s:%d powerId:%d is wrong\r\n",__FILE__,__func__, __LINE__ , powerId); return FALSE; } if(g_MT_PMIC_BusHW.Power[powerId].dwPowerCount == 0) { MSG(PMIC,"%s:%s:%d powerId:%d (g_MT_PMIC_BusHW.dwPowerCount[powerId] = 0)\r\n", - __FILE__,__FUNCTION__,__LINE__ ,powerId); + __FILE__,__func__,__LINE__ ,powerId); return FALSE; } for (i = 0; i< MAX_DEVICE; i++) @@ -160,7 +160,7 @@ bool hwPowerDown(MT65XX_POWER powerId, char *mode_name) if (!strcmp(g_MT_PMIC_BusHW.Power[powerId].mod_name[i], mode_name)) { MSG(PMIC,"[%s] powerId:%d index:%d mod_name: %s\r\n", - __FUNCTION__,powerId, i, mode_name); + __func__,powerId, i, mode_name); sprintf(g_MT_PMIC_BusHW.Power[powerId].mod_name[i] , "%s", NON_OP); bFind = TRUE; break ; @@ -168,7 +168,7 @@ bool hwPowerDown(MT65XX_POWER powerId, char *mode_name) } if(!bFind) { - MSG(PMIC,"[%s] Cannot find [%d] master is [%s]\r\n",__FUNCTION__,powerId, mode_name); + MSG(PMIC,"[%s] Cannot find [%d] master is [%s]\r\n",__func__,powerId, mode_name); return TRUE; } g_MT_PMIC_BusHW.Power[powerId].dwPowerCount--; diff --git a/drivers/misc/mediatek/mach/mt6735/mt_sleep.c b/drivers/misc/mediatek/mach/mt6735/mt_sleep.c index 26ceac973..6113a7198 100644 --- a/drivers/misc/mediatek/mach/mt6735/mt_sleep.c +++ b/drivers/misc/mediatek/mach/mt6735/mt_sleep.c @@ -184,13 +184,13 @@ static int slp_suspend_ops_prepare(void) extern void mtkpasr_phaseone_ops(void); static int slp_suspend_ops_prepare_late(void) { - slp_notice("[%s]\n",__FUNCTION__); + slp_notice("[%s]\n",__func__); mtkpasr_phaseone_ops(); return 0; } static void slp_suspend_ops_wake(void) { - slp_notice("[%s]\n",__FUNCTION__); + slp_notice("[%s]\n",__func__); } /* PASR/DPD SW operations */ @@ -206,7 +206,7 @@ static int enter_pasrdpd(void) u32 sr = 0, dpd = 0; slp_notice("@@@@@@@@@@@@@@@@@@@@\n"); - slp_crit2("[%s]\n",__FUNCTION__); + slp_crit2("[%s]\n",__func__); slp_notice("@@@@@@@@@@@@@@@@@@@@\n"); /* Setup SPM wakeup event firstly */ @@ -223,22 +223,22 @@ static int enter_pasrdpd(void) /* Should configure SR */ if (mtkpasr_enable_sr == 0) { sr = 0x0; - slp_crit2("[%s][%d] No configuration on SR\n",__FUNCTION__,__LINE__); + slp_crit2("[%s][%d] No configuration on SR\n",__func__,__LINE__); } /* Configure PASR */ enter_pasr_dpd_config((sr & 0xFF), (sr >> 0x8)); //if (mrw_error) { - // printk(KERN_ERR "[%s][%d] PM: Failed to configure MRW PASR [%d]!\n",__FUNCTION__,__LINE__,mrw_error); + // printk(KERN_ERR "[%s][%d] PM: Failed to configure MRW PASR [%d]!\n",__func__,__LINE__,mrw_error); //} } - slp_crit2("Bye [%s]\n",__FUNCTION__); + slp_crit2("Bye [%s]\n",__func__); return error; } static void leave_pasrdpd(void) { slp_notice("@@@@@@@@@@@@@@@@@@@@\n"); - slp_crit2("[%s]\n",__FUNCTION__); + slp_crit2("[%s]\n",__func__); slp_notice("@@@@@@@@@@@@@@@@@@@@\n"); /* Disable PASR */ @@ -249,7 +249,7 @@ static void leave_pasrdpd(void) /* End PASR/DPD SW operations */ pasr_exit(); - slp_crit2("Bye [%s]\n",__FUNCTION__); + slp_crit2("Bye [%s]\n",__func__); } #endif diff --git a/drivers/misc/mediatek/magnetometer/af7133/af7133.c b/drivers/misc/mediatek/magnetometer/af7133/af7133.c index 157e391bc..ad6f21ced 100644 --- a/drivers/misc/mediatek/magnetometer/af7133/af7133.c +++ b/drivers/misc/mediatek/magnetometer/af7133/af7133.c @@ -64,8 +64,8 @@ #define AF7133_DEFAULT_DELAY 33 /*----------------------------------------------------------------------------*/ #define MSE_TAG "MSENSOR" -#define MSE_FUN(f) printk(KERN_INFO MSE_TAG" %s\r\n", __FUNCTION__) -#define MSE_ERR(fmt, args...) printk(KERN_ERR MSE_TAG" %s %d : \r\n"fmt, __FUNCTION__, __LINE__, ##args) +#define MSE_FUN(f) printk(KERN_INFO MSE_TAG" %s\r\n", __func__) +#define MSE_ERR(fmt, args...) printk(KERN_ERR MSE_TAG" %s %d : \r\n"fmt, __func__, __LINE__, ##args) #define MSE_LOG(fmt, args...) printk(KERN_INFO MSE_TAG fmt, ##args) #define MSE_VER(fmt, args...) ((void)0) static DECLARE_WAIT_QUEUE_HEAD(data_ready_wq); @@ -810,7 +810,7 @@ static long af7133_unlocked_ioctl(struct file *file, unsigned int cmd, break; default: - MSE_ERR("%s not supported = 0x%04x", __FUNCTION__, cmd); + MSE_ERR("%s not supported = 0x%04x", __func__, cmd); retval = -ENOIOCTLCMD; break; } diff --git a/drivers/misc/mediatek/magnetometer/akm09911-new/akm09911.c b/drivers/misc/mediatek/magnetometer/akm09911-new/akm09911.c index ceb731da3..839c28326 100644 --- a/drivers/misc/mediatek/magnetometer/akm09911-new/akm09911.c +++ b/drivers/misc/mediatek/magnetometer/akm09911-new/akm09911.c @@ -63,8 +63,8 @@ *********************/ #if AKM09911_DEBUG #define MAGN_TAG "[Msensor] " - #define MAGN_FUN(f) printk(KERN_INFO MAGN_TAG"%s\n", __FUNCTION__) - #define MAGN_ERR(fmt, args...) printk(KERN_ERR MAGN_TAG"%s %d : "fmt, __FUNCTION__, __LINE__, ##args) + #define MAGN_FUN(f) printk(KERN_INFO MAGN_TAG"%s\n", __func__) + #define MAGN_ERR(fmt, args...) printk(KERN_ERR MAGN_TAG"%s %d : "fmt, __func__, __LINE__, ##args) #define MAGN_LOG(fmt, args...) printk(KERN_NOTICE MAGN_TAG fmt, ##args) #else #define MAGN_TAG @@ -717,7 +717,7 @@ int FST_AK8963(void) // Set to PowerDown mode //if (AKECS_SetMode(AK8963_MODE_POWERDOWN) < 0) { - // MAGN_LOG("%s:%d Error.\n", __FUNCTION__, __LINE__); + // MAGN_LOG("%s:%d Error.\n", __func__, __LINE__); // return 0; //} AKECS_Reset(0); @@ -729,7 +729,7 @@ int FST_AK8963(void) i2cData[0] = AK8963_REG_I2CDIS; i2cData[1] = 0x1B; if (AKI2C_TxData(i2cData, 2) < 0) { - MAGN_LOG("%s:%d Error.\n", __FUNCTION__, __LINE__); + MAGN_LOG("%s:%d Error.\n", __func__, __LINE__); return 0; } } @@ -737,7 +737,7 @@ int FST_AK8963(void) // Read values from WIA to ASTC. i2cData[0] = AK8963_REG_WIA; if (AKI2C_RxData(i2cData, 7) < 0) { - MAGN_LOG("%s:%d Error.\n", __FUNCTION__, __LINE__); + MAGN_LOG("%s:%d Error.\n", __func__, __LINE__); return 0; } @@ -752,7 +752,7 @@ int FST_AK8963(void) // our i2c only most can read 8 byte at one time , i2cData[7]= AK8963_REG_HZL; if (AKI2C_RxData((i2cData+7), 6) < 0) { - MAGN_LOG("%s:%d Error.\n", __FUNCTION__, __LINE__); + MAGN_LOG("%s:%d Error.\n", __func__, __LINE__); return 0; } TEST_DATA(TLIMIT_NO_RST_HZL, TLIMIT_TN_RST_HZL, (int)i2cData[7], TLIMIT_LO_RST_HZL, TLIMIT_HI_RST_HZL, &pf_total); @@ -765,7 +765,7 @@ int FST_AK8963(void) // Read values from I2CDIS. i2cData[0] = AK8963_REG_I2CDIS; if (AKI2C_RxData(i2cData, 1) < 0 ) { - MAGN_LOG("%s:%d Error.\n", __FUNCTION__, __LINE__); + MAGN_LOG("%s:%d Error.\n", __func__, __LINE__); return 0; } if(CSPEC_SPI_USE == 1){ @@ -776,14 +776,14 @@ int FST_AK8963(void) // Set to FUSE ROM access mode if (AKECS_SetMode(AK8963_MODE_FUSE_ACCESS) < 0) { - MAGN_LOG("%s:%d Error.\n", __FUNCTION__, __LINE__); + MAGN_LOG("%s:%d Error.\n", __func__, __LINE__); return 0; } // Read values from ASAX to ASAZ i2cData[0] = AK8963_FUSE_ASAX; if (AKI2C_RxData(i2cData, 3) < 0) { - MAGN_LOG("%s:%d Error.\n", __FUNCTION__, __LINE__); + MAGN_LOG("%s:%d Error.\n", __func__, __LINE__); return 0; } asax = (int)i2cData[0]; @@ -798,13 +798,13 @@ int FST_AK8963(void) // Read values. CNTL i2cData[0] = AK8963_REG_CNTL1; if (AKI2C_RxData(i2cData, 1)< 0) { - MAGN_LOG("%s:%d Error.\n", __FUNCTION__, __LINE__); + MAGN_LOG("%s:%d Error.\n", __func__, __LINE__); return 0; } // Set to PowerDown mode if (AKECS_SetMode(AK8963_MODE_POWERDOWN) < 0) { - MAGN_LOG("%s:%d Error.\n", __FUNCTION__, __LINE__); + MAGN_LOG("%s:%d Error.\n", __func__, __LINE__); return 0; } @@ -818,7 +818,7 @@ int FST_AK8963(void) // Set to SNG measurement pattern (Set CNTL register) if (AKECS_SetMode(AK8963_MODE_SNG_MEASURE) < 0) { - MAGN_LOG("%s:%d Error.\n", __FUNCTION__, __LINE__); + MAGN_LOG("%s:%d Error.\n", __func__, __LINE__); return 0; } @@ -828,7 +828,7 @@ int FST_AK8963(void) // ST1 + (HXL + HXH) + (HYL + HYH) + (HZL + HZH) + ST2 // = 1 + (1 + 1) + (1 + 1) + (1 + 1) + 1 = 8 bytes if (AKECS_GetData(i2cData,SENSOR_DATA_SIZE) < 0) { - MAGN_LOG("%s:%d Error.\n", __FUNCTION__, __LINE__); + MAGN_LOG("%s:%d Error.\n", __func__, __LINE__); return 0; } @@ -852,13 +852,13 @@ int FST_AK8963(void) i2cData[0] = AK8963_REG_ASTC; i2cData[1] = 0x40; if (AKI2C_TxData(i2cData, 2) < 0) { - MAGN_LOG("%s:%d Error.\n", __FUNCTION__, __LINE__); + MAGN_LOG("%s:%d Error.\n", __func__, __LINE__); return 0; } // Set to Self-test mode (Set CNTL register) if (AKECS_SetMode(AK8963_MODE_SELF_TEST) < 0) { - MAGN_LOG("%s:%d Error.\n", __FUNCTION__, __LINE__); + MAGN_LOG("%s:%d Error.\n", __func__, __LINE__); return 0; } @@ -868,7 +868,7 @@ int FST_AK8963(void) // ST1 + (HXL + HXH) + (HYL + HYH) + (HZL + HZH) + ST2 // = 1 + (1 + 1) + (1 + 1) + (1 + 1) + 1 = 8Byte if (AKECS_GetData(i2cData,SENSOR_DATA_SIZE) < 0) { - MAGN_LOG("%s:%d Error.\n", __FUNCTION__, __LINE__); + MAGN_LOG("%s:%d Error.\n", __func__, __LINE__); return 0; } @@ -919,7 +919,7 @@ int FST_AK8963(void) i2cData[0] = AK8963_REG_ASTC; i2cData[1] = 0x00; if (AKI2C_TxData(i2cData, 2) < 0) { - MAGN_LOG("%s:%d Error.\n", __FUNCTION__, __LINE__); + MAGN_LOG("%s:%d Error.\n", __func__, __LINE__); return 0; } MAGN_LOG("pf_total = %d\n",pf_total ); @@ -954,14 +954,14 @@ int FST_AK09911(void) // Reset device. if (AKECS_Reset(0) < 0) { - MAGN_LOG("%s:%d Error.\n", __FUNCTION__, __LINE__); + MAGN_LOG("%s:%d Error.\n", __func__, __LINE__); return 0; } // Read values from WIA. i2cData[0] = AK09911_REG_WIA1; if (AKI2C_RxData(i2cData, 2) < 0) { - MAGN_LOG("%s:%d Error.\n", __FUNCTION__, __LINE__); + MAGN_LOG("%s:%d Error.\n", __func__, __LINE__); return 0; } @@ -971,14 +971,14 @@ int FST_AK09911(void) // Set to FUSE ROM access mode if (AKECS_SetMode(AK09911_MODE_FUSE_ACCESS) < 0) { - MAGN_LOG("%s:%d Error.\n", __FUNCTION__, __LINE__); + MAGN_LOG("%s:%d Error.\n", __func__, __LINE__); return 0; } // Read values from ASAX to ASAZ i2cData[0] = AK09911_FUSE_ASAX; if (AKI2C_RxData(i2cData, 3) < 0) { - MAGN_LOG("%s:%d Error.\n", __FUNCTION__, __LINE__); + MAGN_LOG("%s:%d Error.\n", __func__, __LINE__); return 0; } asax = (int)i2cData[0]; @@ -992,7 +992,7 @@ int FST_AK09911(void) // Set to PowerDown mode if (AKECS_SetMode(AK09911_MODE_POWERDOWN) < 0) { - MAGN_LOG("%s:%d Error.\n", __FUNCTION__, __LINE__); + MAGN_LOG("%s:%d Error.\n", __func__, __LINE__); return 0; } @@ -1002,7 +1002,7 @@ int FST_AK09911(void) // Set to SNG measurement pattern (Set CNTL register) if (AKECS_SetMode(AK09911_MODE_SNG_MEASURE) < 0) { - MAGN_LOG("%s:%d Error.\n", __FUNCTION__, __LINE__); + MAGN_LOG("%s:%d Error.\n", __func__, __LINE__); return 0; } @@ -1013,7 +1013,7 @@ int FST_AK09911(void) // = 1 + (1 + 1) + (1 + 1) + (1 + 1) + 1 + 1 = 9yte //if (AKD_GetMagneticData(i2cData) != AKD_SUCCESS) { if (AKECS_GetData(i2cData,SENSOR_DATA_SIZE) < 0) { - MAGN_LOG("%s:%d Error.\n", __FUNCTION__, __LINE__); + MAGN_LOG("%s:%d Error.\n", __func__, __LINE__); return 0; } @@ -1037,7 +1037,7 @@ int FST_AK09911(void) // Set to Self-test mode (Set CNTL register) if (AKECS_SetMode(AK09911_MODE_SELF_TEST) < 0) { - MAGN_LOG("%s:%d Error.\n", __FUNCTION__, __LINE__); + MAGN_LOG("%s:%d Error.\n", __func__, __LINE__); return 0; } @@ -1048,7 +1048,7 @@ int FST_AK09911(void) // = 1 + (1 + 1) + (1 + 1) + (1 + 1) + 1 + 1 = 9byte //if (AKD_GetMagneticData(i2cData) != AKD_SUCCESS) { if (AKECS_GetData(i2cData,SENSOR_DATA_SIZE) < 0) { - MAGN_LOG("%s:%d Error.\n", __FUNCTION__, __LINE__); + MAGN_LOG("%s:%d Error.\n", __func__, __LINE__); return 0; } @@ -1325,7 +1325,7 @@ static ssize_t show_chip_orientation(struct device_driver *ddri, char *buf) ssize_t _tLength = 0; struct mag_hw *_ptAccelHw = hw; - MAGN_LOG("[%s] default direction: %d\n", __FUNCTION__, _ptAccelHw->direction); + MAGN_LOG("[%s] default direction: %d\n", __func__, _ptAccelHw->direction); _tLength = snprintf(buf, PAGE_SIZE, "default direction = %d\n", _ptAccelHw->direction); @@ -1346,7 +1346,7 @@ static ssize_t store_chip_orientation(struct device_driver *ddri, const char *bu MAG_ERR("ERR: fail to set direction\n"); } - MAGN_LOG("[%s] set direction: %d\n", __FUNCTION__, _nDirection); + MAGN_LOG("[%s] set direction: %d\n", __func__, _nDirection); return (tCount); } @@ -1819,7 +1819,7 @@ static long akm09911_unlocked_ioctl(struct file *file, unsigned int cmd,unsigned break; default: - MAG_ERR( "%s not supported = 0x%04x", __FUNCTION__, cmd); + MAG_ERR( "%s not supported = 0x%04x", __func__, cmd); return -ENOIOCTLCMD; break; } @@ -2042,7 +2042,7 @@ static long akm09911_compat_ioctl(struct file *file, unsigned int cmd, unsigned 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; } @@ -2796,7 +2796,7 @@ static void akm09911_early_suspend(struct early_suspend *h) return; } if ((err = AKECS_SetMode(AK09911_MODE_POWERDOWN)) < 0) { - MAGN_LOG("%s:%d Error.\n", __FUNCTION__, __LINE__); + MAGN_LOG("%s:%d Error.\n", __func__, __LINE__); return; } @@ -2817,7 +2817,7 @@ static void akm09911_late_resume(struct early_suspend *h) akm09911_power(obj->hw, 1); if ((err = AKECS_SetMode(AK09911_MODE_SNG_MEASURE)) < 0) { - MAGN_LOG("%s:%d Error.\n", __FUNCTION__, __LINE__); + MAGN_LOG("%s:%d Error.\n", __func__, __LINE__); return; } } @@ -2842,7 +2842,7 @@ static int akm09911_m_enable(int en) atomic_set(&open_flag, 1); if ((err = AKECS_SetMode(AK09911_MODE_SNG_MEASURE)) < 0) { - MAG_ERR("%s:AKECS_SetMode Error.\n", __FUNCTION__); + MAG_ERR("%s:AKECS_SetMode Error.\n", __func__); return err; } } @@ -2853,7 +2853,7 @@ static int akm09911_m_enable(int en) { atomic_set(&open_flag, 0); if ((err = AKECS_SetMode(AK09911_MODE_POWERDOWN)) < 0) { - MAG_ERR("%s:AKECS_SetMode Error.\n", __FUNCTION__); + MAG_ERR("%s:AKECS_SetMode Error.\n", __func__); return err; } } @@ -2906,7 +2906,7 @@ static int akm09911_o_enable(int en) atomic_set(&o_flag, 1); atomic_set(&open_flag, 1); if ((err = AKECS_SetMode(AK09911_MODE_SNG_MEASURE)) < 0) { - MAG_ERR("%s:AKECS_SetMode Error.\n", __FUNCTION__); + MAG_ERR("%s:AKECS_SetMode Error.\n", __func__); return err; } } @@ -2917,7 +2917,7 @@ static int akm09911_o_enable(int en) { atomic_set(&open_flag, 0); if ((err = AKECS_SetMode(AK09911_MODE_POWERDOWN)) < 0) { - MAG_ERR("%s:AKECS_SetMode Error.\n", __FUNCTION__); + MAG_ERR("%s:AKECS_SetMode Error.\n", __func__); return err; } } diff --git a/drivers/misc/mediatek/magnetometer/akm09911/akm09911.c b/drivers/misc/mediatek/magnetometer/akm09911/akm09911.c index a74e80616..44135a39c 100644 --- a/drivers/misc/mediatek/magnetometer/akm09911/akm09911.c +++ b/drivers/misc/mediatek/magnetometer/akm09911/akm09911.c @@ -741,7 +741,7 @@ int FST_AK8963(void) // Set to PowerDown mode //if (AKECS_SetMode(AK8963_MODE_POWERDOWN) < 0) { - // AKMDBG("%s:%d Error.\n", __FUNCTION__, __LINE__); + // AKMDBG("%s:%d Error.\n", __func__, __LINE__); // return 0; //} AKECS_Reset(0); @@ -753,7 +753,7 @@ int FST_AK8963(void) i2cData[0] = AK8963_REG_I2CDIS; i2cData[1] = 0x1B; if (AKI2C_TxData(i2cData, 2) < 0) { - AKMDBG("%s:%d Error.\n", __FUNCTION__, __LINE__); + AKMDBG("%s:%d Error.\n", __func__, __LINE__); return 0; } } @@ -761,7 +761,7 @@ int FST_AK8963(void) // Read values from WIA to ASTC. i2cData[0] = AK8963_REG_WIA; if (AKI2C_RxData(i2cData, 7) < 0) { - AKMDBG("%s:%d Error.\n", __FUNCTION__, __LINE__); + AKMDBG("%s:%d Error.\n", __func__, __LINE__); return 0; } @@ -776,7 +776,7 @@ int FST_AK8963(void) // our i2c only most can read 8 byte at one time , i2cData[7]= AK8963_REG_HZL; if (AKI2C_RxData((i2cData+7), 6) < 0) { - AKMDBG("%s:%d Error.\n", __FUNCTION__, __LINE__); + AKMDBG("%s:%d Error.\n", __func__, __LINE__); return 0; } TEST_DATA(TLIMIT_NO_RST_HZL, TLIMIT_TN_RST_HZL, (int)i2cData[7], TLIMIT_LO_RST_HZL, TLIMIT_HI_RST_HZL, &pf_total); @@ -789,7 +789,7 @@ int FST_AK8963(void) // Read values from I2CDIS. i2cData[0] = AK8963_REG_I2CDIS; if (AKI2C_RxData(i2cData, 1) < 0 ) { - AKMDBG("%s:%d Error.\n", __FUNCTION__, __LINE__); + AKMDBG("%s:%d Error.\n", __func__, __LINE__); return 0; } if(CSPEC_SPI_USE == 1){ @@ -800,14 +800,14 @@ int FST_AK8963(void) // Set to FUSE ROM access mode if (AKECS_SetMode(AK8963_MODE_FUSE_ACCESS) < 0) { - AKMDBG("%s:%d Error.\n", __FUNCTION__, __LINE__); + AKMDBG("%s:%d Error.\n", __func__, __LINE__); return 0; } // Read values from ASAX to ASAZ i2cData[0] = AK8963_FUSE_ASAX; if (AKI2C_RxData(i2cData, 3) < 0) { - AKMDBG("%s:%d Error.\n", __FUNCTION__, __LINE__); + AKMDBG("%s:%d Error.\n", __func__, __LINE__); return 0; } asax = (int)i2cData[0]; @@ -822,13 +822,13 @@ int FST_AK8963(void) // Read values. CNTL i2cData[0] = AK8963_REG_CNTL1; if (AKI2C_RxData(i2cData, 1)< 0) { - AKMDBG("%s:%d Error.\n", __FUNCTION__, __LINE__); + AKMDBG("%s:%d Error.\n", __func__, __LINE__); return 0; } // Set to PowerDown mode if (AKECS_SetMode(AK8963_MODE_POWERDOWN) < 0) { - AKMDBG("%s:%d Error.\n", __FUNCTION__, __LINE__); + AKMDBG("%s:%d Error.\n", __func__, __LINE__); return 0; } @@ -842,7 +842,7 @@ int FST_AK8963(void) // Set to SNG measurement pattern (Set CNTL register) if (AKECS_SetMode(AK8963_MODE_SNG_MEASURE) < 0) { - AKMDBG("%s:%d Error.\n", __FUNCTION__, __LINE__); + AKMDBG("%s:%d Error.\n", __func__, __LINE__); return 0; } @@ -852,7 +852,7 @@ int FST_AK8963(void) // ST1 + (HXL + HXH) + (HYL + HYH) + (HZL + HZH) + ST2 // = 1 + (1 + 1) + (1 + 1) + (1 + 1) + 1 = 8 bytes if (AKECS_GetData(i2cData,SENSOR_DATA_SIZE) < 0) { - AKMDBG("%s:%d Error.\n", __FUNCTION__, __LINE__); + AKMDBG("%s:%d Error.\n", __func__, __LINE__); return 0; } @@ -876,13 +876,13 @@ int FST_AK8963(void) i2cData[0] = AK8963_REG_ASTC; i2cData[1] = 0x40; if (AKI2C_TxData(i2cData, 2) < 0) { - AKMDBG("%s:%d Error.\n", __FUNCTION__, __LINE__); + AKMDBG("%s:%d Error.\n", __func__, __LINE__); return 0; } // Set to Self-test mode (Set CNTL register) if (AKECS_SetMode(AK8963_MODE_SELF_TEST) < 0) { - AKMDBG("%s:%d Error.\n", __FUNCTION__, __LINE__); + AKMDBG("%s:%d Error.\n", __func__, __LINE__); return 0; } @@ -892,7 +892,7 @@ int FST_AK8963(void) // ST1 + (HXL + HXH) + (HYL + HYH) + (HZL + HZH) + ST2 // = 1 + (1 + 1) + (1 + 1) + (1 + 1) + 1 = 8Byte if (AKECS_GetData(i2cData,SENSOR_DATA_SIZE) < 0) { - AKMDBG("%s:%d Error.\n", __FUNCTION__, __LINE__); + AKMDBG("%s:%d Error.\n", __func__, __LINE__); return 0; } @@ -943,7 +943,7 @@ int FST_AK8963(void) i2cData[0] = AK8963_REG_ASTC; i2cData[1] = 0x00; if (AKI2C_TxData(i2cData, 2) < 0) { - AKMDBG("%s:%d Error.\n", __FUNCTION__, __LINE__); + AKMDBG("%s:%d Error.\n", __func__, __LINE__); return 0; } AKMDBG("pf_total = %d\n",pf_total ); @@ -978,14 +978,14 @@ int FST_AK09911(void) // Reset device. if (AKECS_Reset(0) < 0) { - AKMDBG("%s:%d Error.\n", __FUNCTION__, __LINE__); + AKMDBG("%s:%d Error.\n", __func__, __LINE__); return 0; } // Read values from WIA. i2cData[0] = AK09911_REG_WIA1; if (AKI2C_RxData(i2cData, 2) < 0) { - AKMDBG("%s:%d Error.\n", __FUNCTION__, __LINE__); + AKMDBG("%s:%d Error.\n", __func__, __LINE__); return 0; } @@ -995,14 +995,14 @@ int FST_AK09911(void) // Set to FUSE ROM access mode if (AKECS_SetMode(AK09911_MODE_FUSE_ACCESS) < 0) { - AKMDBG("%s:%d Error.\n", __FUNCTION__, __LINE__); + AKMDBG("%s:%d Error.\n", __func__, __LINE__); return 0; } // Read values from ASAX to ASAZ i2cData[0] = AK09911_FUSE_ASAX; if (AKI2C_RxData(i2cData, 3) < 0) { - AKMDBG("%s:%d Error.\n", __FUNCTION__, __LINE__); + AKMDBG("%s:%d Error.\n", __func__, __LINE__); return 0; } asax = (int)i2cData[0]; @@ -1016,7 +1016,7 @@ int FST_AK09911(void) // Set to PowerDown mode if (AKECS_SetMode(AK09911_MODE_POWERDOWN) < 0) { - AKMDBG("%s:%d Error.\n", __FUNCTION__, __LINE__); + AKMDBG("%s:%d Error.\n", __func__, __LINE__); return 0; } @@ -1026,7 +1026,7 @@ int FST_AK09911(void) // Set to SNG measurement pattern (Set CNTL register) if (AKECS_SetMode(AK09911_MODE_SNG_MEASURE) < 0) { - AKMDBG("%s:%d Error.\n", __FUNCTION__, __LINE__); + AKMDBG("%s:%d Error.\n", __func__, __LINE__); return 0; } @@ -1037,7 +1037,7 @@ int FST_AK09911(void) // = 1 + (1 + 1) + (1 + 1) + (1 + 1) + 1 + 1 = 9yte //if (AKD_GetMagneticData(i2cData) != AKD_SUCCESS) { if (AKECS_GetData(i2cData,SENSOR_DATA_SIZE) < 0) { - AKMDBG("%s:%d Error.\n", __FUNCTION__, __LINE__); + AKMDBG("%s:%d Error.\n", __func__, __LINE__); return 0; } @@ -1061,7 +1061,7 @@ int FST_AK09911(void) // Set to Self-test mode (Set CNTL register) if (AKECS_SetMode(AK09911_MODE_SELF_TEST) < 0) { - AKMDBG("%s:%d Error.\n", __FUNCTION__, __LINE__); + AKMDBG("%s:%d Error.\n", __func__, __LINE__); return 0; } @@ -1072,7 +1072,7 @@ int FST_AK09911(void) // = 1 + (1 + 1) + (1 + 1) + (1 + 1) + 1 + 1 = 9byte //if (AKD_GetMagneticData(i2cData) != AKD_SUCCESS) { if (AKECS_GetData(i2cData,SENSOR_DATA_SIZE) < 0) { - AKMDBG("%s:%d Error.\n", __FUNCTION__, __LINE__); + AKMDBG("%s:%d Error.\n", __func__, __LINE__); return 0; } @@ -1769,7 +1769,7 @@ static long akm09911_unlocked_ioctl(struct file *file, unsigned int cmd,unsigned 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; } @@ -2007,7 +2007,7 @@ static long akm09911_compat_ioctl(struct file *file, unsigned int cmd, unsigned 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; } @@ -2759,7 +2759,7 @@ static void akm09911_early_suspend(struct early_suspend *h) return; } if ((err = AKECS_SetMode(AK09911_MODE_POWERDOWN)) < 0) { - AKMDBG("%s:%d Error.\n", __FUNCTION__, __LINE__); + AKMDBG("%s:%d Error.\n", __func__, __LINE__); return; } @@ -2780,7 +2780,7 @@ static void akm09911_late_resume(struct early_suspend *h) akm09911_power(obj->hw, 1); if ((err = AKECS_SetMode(AK09911_MODE_SNG_MEASURE)) < 0) { - AKMDBG("%s:%d Error.\n", __FUNCTION__, __LINE__); + AKMDBG("%s:%d Error.\n", __func__, __LINE__); return; } } diff --git a/drivers/misc/mediatek/magnetometer/akm8963-new/akm8963.c b/drivers/misc/mediatek/magnetometer/akm8963-new/akm8963.c index 115c08a23..ea330952b 100644 --- a/drivers/misc/mediatek/magnetometer/akm8963-new/akm8963.c +++ b/drivers/misc/mediatek/magnetometer/akm8963-new/akm8963.c @@ -647,7 +647,7 @@ static int FctShipmntTestProcess_Body(void) // Set to PowerDown mode //if (AKECS_SetMode(AK8963_MODE_POWERDOWN) < 0) { - // AKMDBG("%s:%d Error.\n", __FUNCTION__, __LINE__); + // AKMDBG("%s:%d Error.\n", __func__, __LINE__); // return 0; //} AKECS_Reset(0); @@ -659,7 +659,7 @@ static int FctShipmntTestProcess_Body(void) i2cData[0] = AK8963_REG_I2CDIS; i2cData[1] = 0x1B; if (AKI2C_TxData(i2cData, 2) < 0) { - AKMDBG("%s:%d Error.\n", __FUNCTION__, __LINE__); + AKMDBG("%s:%d Error.\n", __func__, __LINE__); return 0; } } @@ -667,7 +667,7 @@ static int FctShipmntTestProcess_Body(void) // Read values from WIA to ASTC. i2cData[0] = AK8963_REG_WIA; if (AKI2C_RxData(i2cData, 7) < 0) { - AKMDBG("%s:%d Error.\n", __FUNCTION__, __LINE__); + AKMDBG("%s:%d Error.\n", __func__, __LINE__); return 0; } @@ -682,7 +682,7 @@ static int FctShipmntTestProcess_Body(void) // our i2c only most can read 8 byte at one time , i2cData[7]= AK8963_REG_HZL; if (AKI2C_RxData((i2cData+7), 6) < 0) { - AKMDBG("%s:%d Error.\n", __FUNCTION__, __LINE__); + AKMDBG("%s:%d Error.\n", __func__, __LINE__); return 0; } TEST_DATA(TLIMIT_NO_RST_HZL, TLIMIT_TN_RST_HZL, (int)i2cData[7], TLIMIT_LO_RST_HZL, TLIMIT_HI_RST_HZL, &pf_total); @@ -695,7 +695,7 @@ static int FctShipmntTestProcess_Body(void) // Read values from I2CDIS. i2cData[0] = AK8963_REG_I2CDIS; if (AKI2C_RxData(i2cData, 1) < 0 ) { - AKMDBG("%s:%d Error.\n", __FUNCTION__, __LINE__); + AKMDBG("%s:%d Error.\n", __func__, __LINE__); return 0; } if(CSPEC_SPI_USE == 1){ @@ -706,14 +706,14 @@ static int FctShipmntTestProcess_Body(void) // Set to FUSE ROM access mode if (AKECS_SetMode(AK8963_MODE_FUSE_ACCESS) < 0) { - AKMDBG("%s:%d Error.\n", __FUNCTION__, __LINE__); + AKMDBG("%s:%d Error.\n", __func__, __LINE__); return 0; } // Read values from ASAX to ASAZ i2cData[0] = AK8963_FUSE_ASAX; if (AKI2C_RxData(i2cData, 3) < 0) { - AKMDBG("%s:%d Error.\n", __FUNCTION__, __LINE__); + AKMDBG("%s:%d Error.\n", __func__, __LINE__); return 0; } asax = (int)i2cData[0]; @@ -735,13 +735,13 @@ static int FctShipmntTestProcess_Body(void) // Read values. CNTL i2cData[0] = AK8963_REG_CNTL1; if (AKI2C_RxData(i2cData, 1)< 0) { - AKMDBG("%s:%d Error.\n", __FUNCTION__, __LINE__); + AKMDBG("%s:%d Error.\n", __func__, __LINE__); return 0; } // Set to PowerDown mode if (AKECS_SetMode(AK8963_MODE_POWERDOWN) < 0) { - AKMDBG("%s:%d Error.\n", __FUNCTION__, __LINE__); + AKMDBG("%s:%d Error.\n", __func__, __LINE__); return 0; } @@ -755,7 +755,7 @@ static int FctShipmntTestProcess_Body(void) // Set to SNG measurement pattern (Set CNTL register) if (AKECS_SetMode(AK8963_MODE_SNG_MEASURE|1<<4) < 0) { - AKMDBG("%s:%d Error.\n", __FUNCTION__, __LINE__); + AKMDBG("%s:%d Error.\n", __func__, __LINE__); return 0; } @@ -765,7 +765,7 @@ static int FctShipmntTestProcess_Body(void) // ST1 + (HXL + HXH) + (HYL + HYH) + (HZL + HZH) + ST2 // = 1 + (1 + 1) + (1 + 1) + (1 + 1) + 1 = 8 bytes if (AKECS_GetData(i2cData,SENSOR_DATA_SIZE) < 0) { - AKMDBG("%s:%d Error.\n", __FUNCTION__, __LINE__); + AKMDBG("%s:%d Error.\n", __func__, __LINE__); return 0; } @@ -787,13 +787,13 @@ static int FctShipmntTestProcess_Body(void) i2cData[0] = AK8963_REG_ASTC; i2cData[1] = 0x40; if (AKI2C_TxData(i2cData, 2) < 0) { - AKMDBG("%s:%d Error.\n", __FUNCTION__, __LINE__); + AKMDBG("%s:%d Error.\n", __func__, __LINE__); return 0; } // Set to Self-test mode (Set CNTL register) if (AKECS_SetMode(AK8963_MODE_SELF_TEST|1<<4) < 0) { - AKMDBG("%s:%d Error.\n", __FUNCTION__, __LINE__); + AKMDBG("%s:%d Error.\n", __func__, __LINE__); return 0; } @@ -803,7 +803,7 @@ static int FctShipmntTestProcess_Body(void) // ST1 + (HXL + HXH) + (HYL + HYH) + (HZL + HZH) + ST2 // = 1 + (1 + 1) + (1 + 1) + (1 + 1) + 1 = 8Byte if (AKECS_GetData(i2cData,SENSOR_DATA_SIZE) < 0) { - AKMDBG("%s:%d Error.\n", __FUNCTION__, __LINE__); + AKMDBG("%s:%d Error.\n", __func__, __LINE__); return 0; } @@ -882,7 +882,7 @@ static int FctShipmntTestProcess_Body(void) i2cData[0] = AK8963_REG_ASTC; i2cData[1] = 0x00; if (AKI2C_TxData(i2cData, 2) < 0) { - AKMDBG("%s:%d Error.\n", __FUNCTION__, __LINE__); + AKMDBG("%s:%d Error.\n", __func__, __LINE__); return 0; } AKMDBG("pf_total = %d\n",pf_total ); @@ -1471,7 +1471,7 @@ static long akm8963_unlocked_ioctl(struct file *file, unsigned int cmd,unsigned 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; } @@ -1688,7 +1688,7 @@ static long akm8963_compat_ioctl(struct file *file, unsigned int cmd, unsigned l 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; } @@ -1941,7 +1941,7 @@ static int akm8963_suspend(struct i2c_client *client, pm_message_t msg) return -1; } if ((err = AKECS_SetMode(AK8963_MODE_POWERDOWN)) < 0) { - AKMDBG("%s:%d Error.\n", __FUNCTION__, __LINE__); + AKMDBG("%s:%d Error.\n", __func__, __LINE__); return err; } @@ -1963,7 +1963,7 @@ static int akm8963_resume(struct i2c_client *client) akm8963_power(obj->hw, 1); if ((err = AKECS_SetMode(AK8963_MODE_SNG_MEASURE)) < 0) { - AKMDBG("%s:%d Error.\n", __FUNCTION__, __LINE__); + AKMDBG("%s:%d Error.\n", __func__, __LINE__); return err; } @@ -1983,7 +1983,7 @@ static void akm8963_early_suspend(struct early_suspend *h) return; } if ((err = AKECS_SetMode(AK8963_MODE_POWERDOWN)) < 0) { - AKMDBG("%s:%d Error.\n", __FUNCTION__, __LINE__); + AKMDBG("%s:%d Error.\n", __func__, __LINE__); return; } @@ -2004,7 +2004,7 @@ static void akm8963_late_resume(struct early_suspend *h) akm8963_power(obj->hw, 1); if ((err = AKECS_SetMode(AK8963_MODE_SNG_MEASURE)) < 0) { - AKMDBG("%s:%d Error.\n", __FUNCTION__, __LINE__); + AKMDBG("%s:%d Error.\n", __func__, __LINE__); return; } } diff --git a/drivers/misc/mediatek/magnetometer/akm8963/akm8963.c b/drivers/misc/mediatek/magnetometer/akm8963/akm8963.c index f3d87f754..fde008d15 100644 --- a/drivers/misc/mediatek/magnetometer/akm8963/akm8963.c +++ b/drivers/misc/mediatek/magnetometer/akm8963/akm8963.c @@ -672,7 +672,7 @@ static int FctShipmntTestProcess_Body(void) // Set to PowerDown mode //if (AKECS_SetMode(AK8963_MODE_POWERDOWN) < 0) { - // AKMDBG("%s:%d Error.\n", __FUNCTION__, __LINE__); + // AKMDBG("%s:%d Error.\n", __func__, __LINE__); // return 0; //} AKECS_Reset(0); @@ -684,7 +684,7 @@ static int FctShipmntTestProcess_Body(void) i2cData[0] = AK8963_REG_I2CDIS; i2cData[1] = 0x1B; if (AKI2C_TxData(i2cData, 2) < 0) { - AKMDBG("%s:%d Error.\n", __FUNCTION__, __LINE__); + AKMDBG("%s:%d Error.\n", __func__, __LINE__); return 0; } } @@ -692,7 +692,7 @@ static int FctShipmntTestProcess_Body(void) // Read values from WIA to ASTC. i2cData[0] = AK8963_REG_WIA; if (AKI2C_RxData(i2cData, 7) < 0) { - AKMDBG("%s:%d Error.\n", __FUNCTION__, __LINE__); + AKMDBG("%s:%d Error.\n", __func__, __LINE__); return 0; } @@ -707,7 +707,7 @@ static int FctShipmntTestProcess_Body(void) // our i2c only most can read 8 byte at one time , i2cData[7]= AK8963_REG_HZL; if (AKI2C_RxData((i2cData+7), 6) < 0) { - AKMDBG("%s:%d Error.\n", __FUNCTION__, __LINE__); + AKMDBG("%s:%d Error.\n", __func__, __LINE__); return 0; } TEST_DATA(TLIMIT_NO_RST_HZL, TLIMIT_TN_RST_HZL, (int)i2cData[7], TLIMIT_LO_RST_HZL, TLIMIT_HI_RST_HZL, &pf_total); @@ -720,7 +720,7 @@ static int FctShipmntTestProcess_Body(void) // Read values from I2CDIS. i2cData[0] = AK8963_REG_I2CDIS; if (AKI2C_RxData(i2cData, 1) < 0 ) { - AKMDBG("%s:%d Error.\n", __FUNCTION__, __LINE__); + AKMDBG("%s:%d Error.\n", __func__, __LINE__); return 0; } if(CSPEC_SPI_USE == 1){ @@ -731,14 +731,14 @@ static int FctShipmntTestProcess_Body(void) // Set to FUSE ROM access mode if (AKECS_SetMode(AK8963_MODE_FUSE_ACCESS) < 0) { - AKMDBG("%s:%d Error.\n", __FUNCTION__, __LINE__); + AKMDBG("%s:%d Error.\n", __func__, __LINE__); return 0; } // Read values from ASAX to ASAZ i2cData[0] = AK8963_FUSE_ASAX; if (AKI2C_RxData(i2cData, 3) < 0) { - AKMDBG("%s:%d Error.\n", __FUNCTION__, __LINE__); + AKMDBG("%s:%d Error.\n", __func__, __LINE__); return 0; } asax = (int)i2cData[0]; @@ -760,13 +760,13 @@ static int FctShipmntTestProcess_Body(void) // Read values. CNTL i2cData[0] = AK8963_REG_CNTL1; if (AKI2C_RxData(i2cData, 1)< 0) { - AKMDBG("%s:%d Error.\n", __FUNCTION__, __LINE__); + AKMDBG("%s:%d Error.\n", __func__, __LINE__); return 0; } // Set to PowerDown mode if (AKECS_SetMode(AK8963_MODE_POWERDOWN) < 0) { - AKMDBG("%s:%d Error.\n", __FUNCTION__, __LINE__); + AKMDBG("%s:%d Error.\n", __func__, __LINE__); return 0; } @@ -780,7 +780,7 @@ static int FctShipmntTestProcess_Body(void) // Set to SNG measurement pattern (Set CNTL register) if (AKECS_SetMode(AK8963_MODE_SNG_MEASURE|1<<4) < 0) { - AKMDBG("%s:%d Error.\n", __FUNCTION__, __LINE__); + AKMDBG("%s:%d Error.\n", __func__, __LINE__); return 0; } @@ -790,7 +790,7 @@ static int FctShipmntTestProcess_Body(void) // ST1 + (HXL + HXH) + (HYL + HYH) + (HZL + HZH) + ST2 // = 1 + (1 + 1) + (1 + 1) + (1 + 1) + 1 = 8 bytes if (AKECS_GetData(i2cData,SENSOR_DATA_SIZE) < 0) { - AKMDBG("%s:%d Error.\n", __FUNCTION__, __LINE__); + AKMDBG("%s:%d Error.\n", __func__, __LINE__); return 0; } @@ -812,13 +812,13 @@ static int FctShipmntTestProcess_Body(void) i2cData[0] = AK8963_REG_ASTC; i2cData[1] = 0x40; if (AKI2C_TxData(i2cData, 2) < 0) { - AKMDBG("%s:%d Error.\n", __FUNCTION__, __LINE__); + AKMDBG("%s:%d Error.\n", __func__, __LINE__); return 0; } // Set to Self-test mode (Set CNTL register) if (AKECS_SetMode(AK8963_MODE_SELF_TEST|1<<4) < 0) { - AKMDBG("%s:%d Error.\n", __FUNCTION__, __LINE__); + AKMDBG("%s:%d Error.\n", __func__, __LINE__); return 0; } @@ -828,7 +828,7 @@ static int FctShipmntTestProcess_Body(void) // ST1 + (HXL + HXH) + (HYL + HYH) + (HZL + HZH) + ST2 // = 1 + (1 + 1) + (1 + 1) + (1 + 1) + 1 = 8Byte if (AKECS_GetData(i2cData,SENSOR_DATA_SIZE) < 0) { - AKMDBG("%s:%d Error.\n", __FUNCTION__, __LINE__); + AKMDBG("%s:%d Error.\n", __func__, __LINE__); return 0; } @@ -907,7 +907,7 @@ static int FctShipmntTestProcess_Body(void) i2cData[0] = AK8963_REG_ASTC; i2cData[1] = 0x00; if (AKI2C_TxData(i2cData, 2) < 0) { - AKMDBG("%s:%d Error.\n", __FUNCTION__, __LINE__); + AKMDBG("%s:%d Error.\n", __func__, __LINE__); return 0; } AKMDBG("pf_total = %d\n",pf_total ); @@ -1460,7 +1460,7 @@ static long akm8963_unlocked_ioctl(struct file *file, unsigned int cmd,unsigned 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; } @@ -1710,7 +1710,7 @@ static int akm8963_suspend(struct i2c_client *client, pm_message_t msg) return -1; } if ((err = AKECS_SetMode(AK8963_MODE_POWERDOWN)) < 0) { - AKMDBG("%s:%d Error.\n", __FUNCTION__, __LINE__); + AKMDBG("%s:%d Error.\n", __func__, __LINE__); return err; } @@ -1732,7 +1732,7 @@ static int akm8963_resume(struct i2c_client *client) akm8963_power(obj->hw, 1); if ((err = AKECS_SetMode(AK8963_MODE_SNG_MEASURE)) < 0) { - AKMDBG("%s:%d Error.\n", __FUNCTION__, __LINE__); + AKMDBG("%s:%d Error.\n", __func__, __LINE__); return err; } @@ -1752,7 +1752,7 @@ static void akm8963_early_suspend(struct early_suspend *h) return; } if ((err = AKECS_SetMode(AK8963_MODE_POWERDOWN)) < 0) { - AKMDBG("%s:%d Error.\n", __FUNCTION__, __LINE__); + AKMDBG("%s:%d Error.\n", __func__, __LINE__); return; } @@ -1773,7 +1773,7 @@ static void akm8963_late_resume(struct early_suspend *h) akm8963_power(obj->hw, 1); if ((err = AKECS_SetMode(AK8963_MODE_SNG_MEASURE)) < 0) { - AKMDBG("%s:%d Error.\n", __FUNCTION__, __LINE__); + AKMDBG("%s:%d Error.\n", __func__, __LINE__); return; } } diff --git a/drivers/misc/mediatek/magnetometer/akm8975/akm8975.c b/drivers/misc/mediatek/magnetometer/akm8975/akm8975.c index 2c3898ee9..0ca44ce7a 100644 --- a/drivers/misc/mediatek/magnetometer/akm8975/akm8975.c +++ b/drivers/misc/mediatek/magnetometer/akm8975/akm8975.c @@ -68,8 +68,8 @@ #endif #define MSE_TAG "[Msensor] " -#define MSE_FUN(f) printk(KERN_ERR MSE_TAG"%s\n", __FUNCTION__) -#define MSE_ERR(fmt, args...) printk(KERN_ERR MSE_TAG"%s %d : "fmt, __FUNCTION__, __LINE__, ##args) +#define MSE_FUN(f) printk(KERN_ERR MSE_TAG"%s\n", __func__) +#define MSE_ERR(fmt, args...) printk(KERN_ERR MSE_TAG"%s %d : "fmt, __func__, __LINE__, ##args) #define MSE_LOG(fmt, args...) printk(KERN_INFO MSE_TAG fmt, ##args) static struct i2c_client *this_client = NULL; @@ -630,7 +630,7 @@ static int FctShipmntTestProcess_Body(void) // Set to PowerDown mode if (AKECS_SetMode(AK8975_MODE_POWERDOWN) < 0) { - AKMDBG("%s:%d Error.\n", __FUNCTION__, __LINE__); + AKMDBG("%s:%d Error.\n", __func__, __LINE__); return 0; } @@ -640,7 +640,7 @@ static int FctShipmntTestProcess_Body(void) i2cData[0] = AK8975_REG_I2CDIS; i2cData[1] = 0x1B; if (AKI2C_TxData(i2cData, 2) < 0) { - AKMDBG("%s:%d Error.\n", __FUNCTION__, __LINE__); + AKMDBG("%s:%d Error.\n", __func__, __LINE__); return 0; } } @@ -648,7 +648,7 @@ static int FctShipmntTestProcess_Body(void) // Read values from WIA to ASTC. i2cData[0] = AK8975_REG_WIA; if (AKI2C_RxData(i2cData, 7) < 0) { - AKMDBG("%s:%d Error.\n", __FUNCTION__, __LINE__); + AKMDBG("%s:%d Error.\n", __func__, __LINE__); return 0; } @@ -663,7 +663,7 @@ static int FctShipmntTestProcess_Body(void) // our i2c only most can read 8 byte at one time , i2cData[7]= AK8975_REG_HZL; if (AKI2C_RxData((i2cData+7), 6) < 0) { - AKMDBG("%s:%d Error.\n", __FUNCTION__, __LINE__); + AKMDBG("%s:%d Error.\n", __func__, __LINE__); return 0; } TEST_DATA(TLIMIT_NO_RST_HZL, TLIMIT_TN_RST_HZL, (int)i2cData[7], TLIMIT_LO_RST_HZL, TLIMIT_HI_RST_HZL, &pf_total); @@ -676,7 +676,7 @@ static int FctShipmntTestProcess_Body(void) // Read values from I2CDIS. i2cData[0] = AK8975_REG_I2CDIS; if (AKI2C_RxData(i2cData, 1) < 0 ) { - AKMDBG("%s:%d Error.\n", __FUNCTION__, __LINE__); + AKMDBG("%s:%d Error.\n", __func__, __LINE__); return 0; } if(CSPEC_SPI_USE == 1){ @@ -687,14 +687,14 @@ static int FctShipmntTestProcess_Body(void) // Set to FUSE ROM access mode if (AKECS_SetMode(AK8975_MODE_FUSE_ACCESS) < 0) { - AKMDBG("%s:%d Error.\n", __FUNCTION__, __LINE__); + AKMDBG("%s:%d Error.\n", __func__, __LINE__); return 0; } // Read values from ASAX to ASAZ i2cData[0] = AK8975_FUSE_ASAX; if (AKI2C_RxData(i2cData, 3) < 0) { - AKMDBG("%s:%d Error.\n", __FUNCTION__, __LINE__); + AKMDBG("%s:%d Error.\n", __func__, __LINE__); return 0; } asax = (int)i2cData[0]; @@ -716,13 +716,13 @@ static int FctShipmntTestProcess_Body(void) // Read values. CNTL i2cData[0] = AK8975_REG_CNTL; if (AKI2C_RxData(i2cData, 1)< 0) { - AKMDBG("%s:%d Error.\n", __FUNCTION__, __LINE__); + AKMDBG("%s:%d Error.\n", __func__, __LINE__); return 0; } // Set to PowerDown mode if (AKECS_SetMode(AK8975_MODE_POWERDOWN) < 0) { - AKMDBG("%s:%d Error.\n", __FUNCTION__, __LINE__); + AKMDBG("%s:%d Error.\n", __func__, __LINE__); return 0; } @@ -736,7 +736,7 @@ static int FctShipmntTestProcess_Body(void) // Set to SNG measurement pattern (Set CNTL register) if (AKECS_SetMode(AK8975_MODE_SNG_MEASURE) < 0) { - AKMDBG("%s:%d Error.\n", __FUNCTION__, __LINE__); + AKMDBG("%s:%d Error.\n", __func__, __LINE__); return 0; } @@ -746,7 +746,7 @@ static int FctShipmntTestProcess_Body(void) // ST1 + (HXL + HXH) + (HYL + HYH) + (HZL + HZH) + ST2 // = 1 + (1 + 1) + (1 + 1) + (1 + 1) + 1 = 8 bytes if (AKECS_GetData(i2cData,SENSOR_DATA_SIZE) < 0) { - AKMDBG("%s:%d Error.\n", __FUNCTION__, __LINE__); + AKMDBG("%s:%d Error.\n", __func__, __LINE__); return 0; } @@ -768,13 +768,13 @@ static int FctShipmntTestProcess_Body(void) i2cData[0] = AK8975_REG_ASTC; i2cData[1] = 0x40; if (AKI2C_TxData(i2cData, 2) < 0) { - AKMDBG("%s:%d Error.\n", __FUNCTION__, __LINE__); + AKMDBG("%s:%d Error.\n", __func__, __LINE__); return 0; } // Set to Self-test mode (Set CNTL register) if (AKECS_SetMode(AK8975_MODE_SELF_TEST) < 0) { - AKMDBG("%s:%d Error.\n", __FUNCTION__, __LINE__); + AKMDBG("%s:%d Error.\n", __func__, __LINE__); return 0; } @@ -784,7 +784,7 @@ static int FctShipmntTestProcess_Body(void) // ST1 + (HXL + HXH) + (HYL + HYH) + (HZL + HZH) + ST2 // = 1 + (1 + 1) + (1 + 1) + (1 + 1) + 1 = 8Byte if (AKECS_GetData(i2cData,SENSOR_DATA_SIZE) < 0) { - AKMDBG("%s:%d Error.\n", __FUNCTION__, __LINE__); + AKMDBG("%s:%d Error.\n", __func__, __LINE__); return 0; } @@ -863,7 +863,7 @@ static int FctShipmntTestProcess_Body(void) i2cData[0] = AK8975_REG_ASTC; i2cData[1] = 0x00; if (AKI2C_TxData(i2cData, 2) < 0) { - AKMDBG("%s:%d Error.\n", __FUNCTION__, __LINE__); + AKMDBG("%s:%d Error.\n", __func__, __LINE__); return 0; } AKMDBG("pf_total = %d\n",pf_total ); @@ -1415,7 +1415,7 @@ static long akm8975_unlocked_ioctl(struct file *file, unsigned int cmd,unsigned 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; } diff --git a/drivers/misc/mediatek/magnetometer/akm8975_auto/akm8975.c b/drivers/misc/mediatek/magnetometer/akm8975_auto/akm8975.c index 7291423b8..2738e6a7a 100644 --- a/drivers/misc/mediatek/magnetometer/akm8975_auto/akm8975.c +++ b/drivers/misc/mediatek/magnetometer/akm8975_auto/akm8975.c @@ -603,7 +603,7 @@ static int FctShipmntTestProcess_Body() // Set to PowerDown mode if (AKECS_SetMode(AK8975_MODE_POWERDOWN) < 0) { - AKMDBG("%s:%d Error.\n", __FUNCTION__, __LINE__); + AKMDBG("%s:%d Error.\n", __func__, __LINE__); return 0; } @@ -613,7 +613,7 @@ static int FctShipmntTestProcess_Body() i2cData[0] = AK8975_REG_I2CDIS; i2cData[1] = 0x1B; if (AKI2C_TxData(i2cData, 2) < 0) { - DBGPRINT(DBG_LEVEL1, "%s:%d Error.\n", __FUNCTION__, __LINE__); + DBGPRINT(DBG_LEVEL1, "%s:%d Error.\n", __func__, __LINE__); return 0; } } @@ -621,7 +621,7 @@ static int FctShipmntTestProcess_Body() // Read values from WIA to ASTC. i2cData[0] = AK8975_REG_WIA; if (AKI2C_RxData(i2cData, 7) < 0) { - DBGPRINT(DBG_LEVEL1, "%s:%d Error.\n", __FUNCTION__, __LINE__); + DBGPRINT(DBG_LEVEL1, "%s:%d Error.\n", __func__, __LINE__); return 0; } @@ -636,7 +636,7 @@ static int FctShipmntTestProcess_Body() // our i2c only most can read 8 byte at one time , i2cData[7]= AK8975_REG_HZL; if (AKI2C_RxData((i2cData+7), 6) < 0) { - DBGPRINT(DBG_LEVEL1, "%s:%d Error.\n", __FUNCTION__, __LINE__); + DBGPRINT(DBG_LEVEL1, "%s:%d Error.\n", __func__, __LINE__); return 0; } TEST_DATA(TLIMIT_NO_RST_HZL, TLIMIT_TN_RST_HZL, (int)i2cData[7], TLIMIT_LO_RST_HZL, TLIMIT_HI_RST_HZL, &pf_total); @@ -649,7 +649,7 @@ static int FctShipmntTestProcess_Body() // Read values from I2CDIS. i2cData[0] = AK8975_REG_I2CDIS; if (AKI2C_RxData(i2cData, 1) < 0 ) { - DBGPRINT(DBG_LEVEL1, "%s:%d Error.\n", __FUNCTION__, __LINE__); + DBGPRINT(DBG_LEVEL1, "%s:%d Error.\n", __func__, __LINE__); return 0; } if(CSPEC_SPI_USE == 1){ @@ -660,14 +660,14 @@ static int FctShipmntTestProcess_Body() // Set to FUSE ROM access mode if (AKECS_SetMode(AK8975_MODE_FUSE_ACCESS) < 0) { - DBGPRINT(DBG_LEVEL1, "%s:%d Error.\n", __FUNCTION__, __LINE__); + DBGPRINT(DBG_LEVEL1, "%s:%d Error.\n", __func__, __LINE__); return 0; } // Read values from ASAX to ASAZ i2cData[0] = AK8975_FUSE_ASAX; if (AKI2C_RxData(i2cData, 3) < 0) { - DBGPRINT(DBG_LEVEL1, "%s:%d Error.\n", __FUNCTION__, __LINE__); + DBGPRINT(DBG_LEVEL1, "%s:%d Error.\n", __func__, __LINE__); return 0; } asax = (int)i2cData[0]; @@ -689,13 +689,13 @@ static int FctShipmntTestProcess_Body() // Read values. CNTL i2cData[0] = AK8975_REG_CNTL; if (AKI2C_RxData(i2cData, 1)< 0) { - DBGPRINT(DBG_LEVEL1, "%s:%d Error.\n", __FUNCTION__, __LINE__); + DBGPRINT(DBG_LEVEL1, "%s:%d Error.\n", __func__, __LINE__); return 0; } // Set to PowerDown mode if (AKECS_SetMode(AK8975_MODE_POWERDOWN) < 0) { - DBGPRINT(DBG_LEVEL1, "%s:%d Error.\n", __FUNCTION__, __LINE__); + DBGPRINT(DBG_LEVEL1, "%s:%d Error.\n", __func__, __LINE__); return 0; } @@ -709,7 +709,7 @@ static int FctShipmntTestProcess_Body() // Set to SNG measurement pattern (Set CNTL register) if (AKECS_SetMode(AK8975_MODE_SNG_MEASURE) < 0) { - DBGPRINT(DBG_LEVEL1, "%s:%d Error.\n", __FUNCTION__, __LINE__); + DBGPRINT(DBG_LEVEL1, "%s:%d Error.\n", __func__, __LINE__); return 0; } @@ -719,7 +719,7 @@ static int FctShipmntTestProcess_Body() // ST1 + (HXL + HXH) + (HYL + HYH) + (HZL + HZH) + ST2 // = 1 + (1 + 1) + (1 + 1) + (1 + 1) + 1 = 8 bytes if (AKECS_GetData(i2cData,SENSOR_DATA_SIZE) < 0) { - DBGPRINT(DBG_LEVEL1, "%s:%d Error.\n", __FUNCTION__, __LINE__); + DBGPRINT(DBG_LEVEL1, "%s:%d Error.\n", __func__, __LINE__); return 0; } @@ -741,13 +741,13 @@ static int FctShipmntTestProcess_Body() i2cData[0] = AK8975_REG_ASTC; i2cData[1] = 0x40; if (AKI2C_TxData(i2cData, 2) < 0) { - DBGPRINT(DBG_LEVEL1, "%s:%d Error.\n", __FUNCTION__, __LINE__); + DBGPRINT(DBG_LEVEL1, "%s:%d Error.\n", __func__, __LINE__); return 0; } // Set to Self-test mode (Set CNTL register) if (AKECS_SetMode(AK8975_MODE_SELF_TEST) < 0) { - DBGPRINT(DBG_LEVEL1, "%s:%d Error.\n", __FUNCTION__, __LINE__); + DBGPRINT(DBG_LEVEL1, "%s:%d Error.\n", __func__, __LINE__); return 0; } @@ -757,7 +757,7 @@ static int FctShipmntTestProcess_Body() // ST1 + (HXL + HXH) + (HYL + HYH) + (HZL + HZH) + ST2 // = 1 + (1 + 1) + (1 + 1) + (1 + 1) + 1 = 8Byte if (AKECS_GetData(i2cData,SENSOR_DATA_SIZE) < 0) { - DBGPRINT(DBG_LEVEL1, "%s:%d Error.\n", __FUNCTION__, __LINE__); + DBGPRINT(DBG_LEVEL1, "%s:%d Error.\n", __func__, __LINE__); return 0; } @@ -836,7 +836,7 @@ static int FctShipmntTestProcess_Body() i2cData[0] = AK8975_REG_ASTC; i2cData[1] = 0x00; if (AKI2C_TxData(i2cData, 2) < 0) { - DBGPRINT(DBG_LEVEL1, "%s:%d Error.\n", __FUNCTION__, __LINE__); + DBGPRINT(DBG_LEVEL1, "%s:%d Error.\n", __func__, __LINE__); return 0; } AKMDBG("pf_total = %d\n",pf_total ); @@ -1386,7 +1386,7 @@ static int akm8975_ioctl(struct inode *inode, struct file *file, unsigned int cm 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; } diff --git a/drivers/misc/mediatek/magnetometer/ami304/ami304.c b/drivers/misc/mediatek/magnetometer/ami304/ami304.c index 1a0fa342a..009c4701a 100644 --- a/drivers/misc/mediatek/magnetometer/ami304/ami304.c +++ b/drivers/misc/mediatek/magnetometer/ami304/ami304.c @@ -56,8 +56,8 @@ #define AMI304_AXES_NUM 3 /*----------------------------------------------------------------------------*/ #define MSE_TAG "MSENSOR" -#define MSE_FUN(f) printk(KERN_INFO MSE_TAG" %s\r\n", __FUNCTION__) -#define MSE_ERR(fmt, args...) printk(KERN_ERR MSE_TAG" %s %d : \r\n"fmt, __FUNCTION__, __LINE__, ##args) +#define MSE_FUN(f) printk(KERN_INFO MSE_TAG" %s\r\n", __func__) +#define MSE_ERR(fmt, args...) printk(KERN_ERR MSE_TAG" %s %d : \r\n"fmt, __func__, __LINE__, ##args) #define MSE_LOG(fmt, args...) printk(KERN_INFO MSE_TAG fmt, ##args) #define MSE_VER(fmt, args...) ((void)0) static DECLARE_WAIT_QUEUE_HEAD(data_ready_wq); @@ -960,7 +960,7 @@ static long ami304_unlocked_ioctl(struct file *file, unsigned int cmd, break; default: - MSE_ERR("%s not supported = 0x%04x", __FUNCTION__, cmd); + MSE_ERR("%s not supported = 0x%04x", __func__, cmd); retval = -ENOIOCTLCMD; break; } diff --git a/drivers/misc/mediatek/magnetometer/ami304_auto/ami304.c b/drivers/misc/mediatek/magnetometer/ami304_auto/ami304.c index 2694d7db7..0bf6b4ff6 100644 --- a/drivers/misc/mediatek/magnetometer/ami304_auto/ami304.c +++ b/drivers/misc/mediatek/magnetometer/ami304_auto/ami304.c @@ -59,8 +59,8 @@ #define AMI304_AXES_NUM 3 /*----------------------------------------------------------------------------*/ #define MSE_TAG "MSENSOR" -#define MSE_FUN(f) printk(KERN_INFO MSE_TAG" %s\r\n", __FUNCTION__) -#define MSE_ERR(fmt, args...) printk(KERN_ERR MSE_TAG" %s %d : \r\n"fmt, __FUNCTION__, __LINE__, ##args) +#define MSE_FUN(f) printk(KERN_INFO MSE_TAG" %s\r\n", __func__) +#define MSE_ERR(fmt, args...) printk(KERN_ERR MSE_TAG" %s %d : \r\n"fmt, __func__, __LINE__, ##args) #define MSE_LOG(fmt, args...) printk(KERN_INFO MSE_TAG fmt, ##args) #define MSE_VER(fmt, args...) ((void)0) @@ -974,7 +974,7 @@ static int ami304_ioctl(struct inode *inode, struct file *file, unsigned int cmd break; default: - MSE_ERR("%s not supported = 0x%04x", __FUNCTION__, cmd); + MSE_ERR("%s not supported = 0x%04x", __func__, cmd); retval = -ENOIOCTLCMD; break; } diff --git a/drivers/misc/mediatek/magnetometer/bmm050-new/bmm050.c b/drivers/misc/mediatek/magnetometer/bmm050-new/bmm050.c index c4d76425b..089f939d7 100644 --- a/drivers/misc/mediatek/magnetometer/bmm050-new/bmm050.c +++ b/drivers/misc/mediatek/magnetometer/bmm050-new/bmm050.c @@ -1523,8 +1523,8 @@ BMC050_S16 bmm050api_compensate_Z(BMC050_S16 mdata_z, BMC050_U16 data_R) #define BMM050_BUFSIZE 0x20 #define MSE_TAG "[Msensor] " -#define MSE_FUN(f) printk(KERN_ERR MSE_TAG"%s\n", __FUNCTION__) -#define MSE_ERR(fmt, args...) printk(KERN_ERR MSE_TAG"%s %d : "fmt, __FUNCTION__, __LINE__, ##args) +#define MSE_FUN(f) printk(KERN_ERR MSE_TAG"%s\n", __func__) +#define MSE_ERR(fmt, args...) printk(KERN_ERR MSE_TAG"%s %d : "fmt, __func__, __LINE__, ##args) #define MSE_LOG(fmt, args...) printk(KERN_INFO MSE_TAG fmt, ##args) static struct i2c_client *this_client = NULL; @@ -2366,7 +2366,7 @@ static long bmm050_unlocked_ioctl(struct file *file, unsigned int cmd, unsigned break; default: - MSE_ERR( "%s not supported = 0x%04x", __FUNCTION__, cmd); + MSE_ERR( "%s not supported = 0x%04x", __func__, cmd); return -ENOIOCTLCMD; break; } diff --git a/drivers/misc/mediatek/magnetometer/bmm050/bmm050.c b/drivers/misc/mediatek/magnetometer/bmm050/bmm050.c index 8ceae1f59..64e30f6c5 100644 --- a/drivers/misc/mediatek/magnetometer/bmm050/bmm050.c +++ b/drivers/misc/mediatek/magnetometer/bmm050/bmm050.c @@ -1511,8 +1511,8 @@ BMC050_S16 bmm050api_compensate_Z(BMC050_S16 mdata_z, BMC050_U16 data_R) #define BMM050_BUFSIZE 0x20 #define MSE_TAG "[Msensor] " -#define MSE_FUN(f) printk(KERN_ERR MSE_TAG"%s\n", __FUNCTION__) -#define MSE_ERR(fmt, args...) printk(KERN_ERR MSE_TAG"%s %d : "fmt, __FUNCTION__, __LINE__, ##args) +#define MSE_FUN(f) printk(KERN_ERR MSE_TAG"%s\n", __func__) +#define MSE_ERR(fmt, args...) printk(KERN_ERR MSE_TAG"%s %d : "fmt, __func__, __LINE__, ##args) #define MSE_LOG(fmt, args...) printk(KERN_INFO MSE_TAG fmt, ##args) static struct i2c_client *this_client = NULL; @@ -2354,7 +2354,7 @@ static long bmm050_unlocked_ioctl(struct file *file, unsigned int cmd, unsigned break; default: - MSE_ERR( "%s not supported = 0x%04x", __FUNCTION__, cmd); + MSE_ERR( "%s not supported = 0x%04x", __func__, cmd); return -ENOIOCTLCMD; break; } diff --git a/drivers/misc/mediatek/magnetometer/bmm056-new/bmm056.c b/drivers/misc/mediatek/magnetometer/bmm056-new/bmm056.c index 4a7459908..e00f221cf 100644 --- a/drivers/misc/mediatek/magnetometer/bmm056-new/bmm056.c +++ b/drivers/misc/mediatek/magnetometer/bmm056-new/bmm056.c @@ -1793,8 +1793,8 @@ BMM050_RETURN_FUNCTION_TYPE bmm050api_get_raw_xyz(struct bmm050api_mdata *mdata) #define BMM050_BUFSIZE 0x20 #define MSE_TAG "[Msensor] " -#define MSE_FUN(f) printk(MSE_TAG"%s\n", __FUNCTION__) -#define MSE_ERR(fmt, args...) printk(KERN_ERR MSE_TAG"%s %d : "fmt, __FUNCTION__, __LINE__, ##args) +#define MSE_FUN(f) printk(MSE_TAG"%s\n", __func__) +#define MSE_ERR(fmt, args...) printk(KERN_ERR MSE_TAG"%s %d : "fmt, __func__, __LINE__, ##args) #define MSE_LOG(fmt, args...) printk(MSE_TAG fmt, ##args) static struct i2c_client *this_client = NULL; @@ -2818,7 +2818,7 @@ static long bmm050_unlocked_ioctl(struct file *file, unsigned int cmd,unsigned l break; default: - MSE_ERR( "%s not supported = 0x%04x", __FUNCTION__, cmd); + MSE_ERR( "%s not supported = 0x%04x", __func__, cmd); return -ENOIOCTLCMD; break; } diff --git a/drivers/misc/mediatek/magnetometer/bmm056/bmm056.c b/drivers/misc/mediatek/magnetometer/bmm056/bmm056.c index 1f439bd8d..49aa34397 100644 --- a/drivers/misc/mediatek/magnetometer/bmm056/bmm056.c +++ b/drivers/misc/mediatek/magnetometer/bmm056/bmm056.c @@ -1793,8 +1793,8 @@ BMM050_RETURN_FUNCTION_TYPE bmm050api_get_raw_xyz(struct bmm050api_mdata *mdata) #define BMM050_BUFSIZE 0x20 #define MSE_TAG "[Msensor] " -#define MSE_FUN(f) printk(MSE_TAG"%s\n", __FUNCTION__) -#define MSE_ERR(fmt, args...) printk(KERN_ERR MSE_TAG"%s %d : "fmt, __FUNCTION__, __LINE__, ##args) +#define MSE_FUN(f) printk(MSE_TAG"%s\n", __func__) +#define MSE_ERR(fmt, args...) printk(KERN_ERR MSE_TAG"%s %d : "fmt, __func__, __LINE__, ##args) #define MSE_LOG(fmt, args...) printk(MSE_TAG fmt, ##args) static struct i2c_client *this_client = NULL; @@ -2814,7 +2814,7 @@ static long bmm050_unlocked_ioctl(struct file *file, unsigned int cmd,unsigned l break; default: - MSE_ERR( "%s not supported = 0x%04x", __FUNCTION__, cmd); + MSE_ERR( "%s not supported = 0x%04x", __func__, cmd); return -ENOIOCTLCMD; break; } diff --git a/drivers/misc/mediatek/magnetometer/bmm150/bmm150.c b/drivers/misc/mediatek/magnetometer/bmm150/bmm150.c index 3c22ef822..5e579f531 100644 --- a/drivers/misc/mediatek/magnetometer/bmm150/bmm150.c +++ b/drivers/misc/mediatek/magnetometer/bmm150/bmm150.c @@ -1821,8 +1821,8 @@ BMM150_RETURN_FUNCTION_TYPE bmm150api_get_raw_xyz(struct bmm150api_mdata *mdata) #define BMM150_BUFSIZE 0x20 #define MSE_TAG "[Msensor] " -#define MSE_FUN(f) printk(KERN_INFO MSE_TAG"%s\n", __FUNCTION__) -#define MSE_ERR(fmt, args...) printk(KERN_ERR MSE_TAG"%s %d : "fmt, __FUNCTION__, __LINE__, ##args) +#define MSE_FUN(f) printk(KERN_INFO MSE_TAG"%s\n", __func__) +#define MSE_ERR(fmt, args...) printk(KERN_ERR MSE_TAG"%s %d : "fmt, __func__, __LINE__, ##args) #define MSE_LOG(fmt, args...) printk(KERN_INFO MSE_TAG fmt, ##args) static struct i2c_client *this_client = NULL; @@ -2987,7 +2987,7 @@ static long bmm150_unlocked_ioctl(struct file *file, unsigned int cmd,unsigned l break; default: - MSE_ERR( "%s not supported = 0x%04x", __FUNCTION__, cmd); + MSE_ERR( "%s not supported = 0x%04x", __func__, cmd); return -ENOIOCTLCMD; break; } diff --git a/drivers/misc/mediatek/magnetometer/hscdtd006/hscdtd006.c b/drivers/misc/mediatek/magnetometer/hscdtd006/hscdtd006.c index 094f458e4..e124b3128 100644 --- a/drivers/misc/mediatek/magnetometer/hscdtd006/hscdtd006.c +++ b/drivers/misc/mediatek/magnetometer/hscdtd006/hscdtd006.c @@ -73,8 +73,8 @@ static int flgActivate = ACTIVE_SS_NUL; #endif #define MSE_TAG "MSENSOR" -#define MSE_FUN(f) printk(KERN_INFO MSE_TAG" %s\r\n", __FUNCTION__) -#define MSE_ERR(fmt, args...) printk(KERN_ERR MSE_TAG" %s %d : \r\n"fmt, __FUNCTION__, __LINE__, ##args) +#define MSE_FUN(f) printk(KERN_INFO MSE_TAG" %s\r\n", __func__) +#define MSE_ERR(fmt, args...) printk(KERN_ERR MSE_TAG" %s %d : \r\n"fmt, __func__, __LINE__, ##args) #define MSE_LOG(fmt, args...) printk(KERN_INFO MSE_TAG fmt, ##args) #define MSE_VER(fmt, args...) ((void)0) static DECLARE_WAIT_QUEUE_HEAD(data_ready_wq); @@ -1130,7 +1130,7 @@ static long hscdtd006_unlocked_ioctl(struct file *file, unsigned int cmd, break; default: - MSE_ERR("%s not supported = 0x%04x", __FUNCTION__, cmd); + MSE_ERR("%s not supported = 0x%04x", __func__, cmd); retval = -ENOIOCTLCMD; break; } diff --git a/drivers/misc/mediatek/magnetometer/hscdtd006_auto/hscdtd006_auto.c b/drivers/misc/mediatek/magnetometer/hscdtd006_auto/hscdtd006_auto.c index 6f6915b2b..01ec7a0dc 100644 --- a/drivers/misc/mediatek/magnetometer/hscdtd006_auto/hscdtd006_auto.c +++ b/drivers/misc/mediatek/magnetometer/hscdtd006_auto/hscdtd006_auto.c @@ -73,8 +73,8 @@ static int flgActivate = ACTIVE_SS_NUL; #endif #define MSE_TAG "MSENSOR" -#define MSE_FUN(f) printk(KERN_INFO MSE_TAG" %s\r\n", __FUNCTION__) -#define MSE_ERR(fmt, args...) printk(KERN_ERR MSE_TAG" %s %d : \r\n"fmt, __FUNCTION__, __LINE__, ##args) +#define MSE_FUN(f) printk(KERN_INFO MSE_TAG" %s\r\n", __func__) +#define MSE_ERR(fmt, args...) printk(KERN_ERR MSE_TAG" %s %d : \r\n"fmt, __func__, __LINE__, ##args) #define MSE_LOG(fmt, args...) printk(KERN_INFO MSE_TAG fmt, ##args) #define MSE_VER(fmt, args...) ((void)0) static DECLARE_WAIT_QUEUE_HEAD(data_ready_wq); @@ -1142,7 +1142,7 @@ static long hscdtd006_unlocked_ioctl(struct file *file, unsigned int cmd, break; default: - MSE_ERR("%s not supported = 0x%04x", __FUNCTION__, cmd); + MSE_ERR("%s not supported = 0x%04x", __func__, cmd); retval = -ENOIOCTLCMD; break; } diff --git a/drivers/misc/mediatek/magnetometer/ist8303-new/ist8303.c b/drivers/misc/mediatek/magnetometer/ist8303-new/ist8303.c index f64da1d2e..17059d5a3 100644 --- a/drivers/misc/mediatek/magnetometer/ist8303-new/ist8303.c +++ b/drivers/misc/mediatek/magnetometer/ist8303-new/ist8303.c @@ -76,8 +76,8 @@ /*----------------------------------------------------------------------------*/ #define MSE_TAG "MSENSOR" -#define MSE_FUN(f) printk(MSE_TAG" %s\r\n", __FUNCTION__) -#define MSE_ERR(fmt, args...) printk(KERN_ERR MSE_TAG" %s %d : \r\n"fmt, __FUNCTION__, __LINE__, ##args) +#define MSE_FUN(f) printk(MSE_TAG" %s\r\n", __func__) +#define MSE_ERR(fmt, args...) printk(KERN_ERR MSE_TAG" %s %d : \r\n"fmt, __func__, __LINE__, ##args) #define MSE_LOG(fmt, args...) printk(MSE_TAG fmt, ##args) #define MSE_VER(fmt, args...) ((void)0) static DECLARE_WAIT_QUEUE_HEAD(data_ready_wq); @@ -1433,7 +1433,7 @@ static long ist8303_unlocked_ioctl(struct file *file, unsigned int cmd, break; default: - MSE_ERR("%s not supported = 0x%04x", __FUNCTION__, cmd); + MSE_ERR("%s not supported = 0x%04x", __func__, cmd); retval = -ENOIOCTLCMD; break; } @@ -1577,7 +1577,7 @@ static long ist8303_compat_ioctl(struct file *file, unsigned int cmd, unsigned l break; default: - MSE_ERR("%s not supported = 0x%04x", __FUNCTION__, cmd); + MSE_ERR("%s not supported = 0x%04x", __func__, cmd); ret = -ENOIOCTLCMD; break; } diff --git a/drivers/misc/mediatek/magnetometer/lsm303c-new/lsm303c.c b/drivers/misc/mediatek/magnetometer/lsm303c-new/lsm303c.c index da0184f4f..9284e7a58 100644 --- a/drivers/misc/mediatek/magnetometer/lsm303c-new/lsm303c.c +++ b/drivers/misc/mediatek/magnetometer/lsm303c-new/lsm303c.c @@ -64,8 +64,8 @@ static atomic_t dev_open_count; /*----------------------------------------------------------------------------*/ #define MSE_TAG "MSENSOR" -#define MSE_FUN(f) //printk(MSE_TAG" %s\r\n", __FUNCTION__) -#define MSE_ERR(fmt, args...) //printk(KERN_ERR MSE_TAG" %s %d : \r\n" fmt, __FUNCTION__, __LINE__, ##args) +#define MSE_FUN(f) //printk(MSE_TAG" %s\r\n", __func__) +#define MSE_ERR(fmt, args...) //printk(KERN_ERR MSE_TAG" %s %d : \r\n" fmt, __func__, __LINE__, ##args) #define MSE_LOG(fmt, args...) //printk(KERN_ERR MSE_TAG fmt, ##args) #define MSE_VER(fmt, args...) ((void)0) @@ -1805,7 +1805,7 @@ static long lsm303c_unlocked_ioctl(struct file *file, unsigned int cmd, break; default: - MSE_ERR("%s not supported = 0x%04x", __FUNCTION__, cmd); + MSE_ERR("%s not supported = 0x%04x", __func__, cmd); retval = -ENOIOCTLCMD; break; } diff --git a/drivers/misc/mediatek/magnetometer/lsm303m/lsm303m.c b/drivers/misc/mediatek/magnetometer/lsm303m/lsm303m.c index 13f2f4135..a741e7e33 100644 --- a/drivers/misc/mediatek/magnetometer/lsm303m/lsm303m.c +++ b/drivers/misc/mediatek/magnetometer/lsm303m/lsm303m.c @@ -205,8 +205,8 @@ static char selftestRes[8]= {0}; /*----------------------------------------------------------------------------*/ #define MSE_TAG "MSENSOR" -#define MSE_FUN(f) printk(MSE_TAG" %s\r\n", __FUNCTION__) -#define MSE_ERR(fmt, args...) printk(KERN_ERR MSE_TAG" %s %d : \r\n" fmt, __FUNCTION__, __LINE__, ##args) +#define MSE_FUN(f) printk(MSE_TAG" %s\r\n", __func__) +#define MSE_ERR(fmt, args...) printk(KERN_ERR MSE_TAG" %s %d : \r\n" fmt, __func__, __LINE__, ##args) #define MSE_LOG(fmt, args...) printk(MSE_TAG fmt, ##args) #define MSE_VER(fmt, args...) ((void)0) @@ -1644,7 +1644,7 @@ static long lsm303m_unlocked_ioctl(struct file *file, unsigned int cmd, break; default: - MSE_ERR("%s not supported = 0x%04x", __FUNCTION__, cmd); + MSE_ERR("%s not supported = 0x%04x", __func__, cmd); retval = -ENOIOCTLCMD; break; } diff --git a/drivers/misc/mediatek/magnetometer/mag3110/mag3110.c b/drivers/misc/mediatek/magnetometer/mag3110/mag3110.c index a45f3dc2e..3c75ca1ed 100644 --- a/drivers/misc/mediatek/magnetometer/mag3110/mag3110.c +++ b/drivers/misc/mediatek/magnetometer/mag3110/mag3110.c @@ -104,8 +104,8 @@ enum { #define MAG3110_AXES_NUM 3 /*----------------------------------------------------------------------------*/ #define MSE_TAG "MSENSOR" -#define MSE_FUN(f) printk(MSE_TAG" %s\r\n", __FUNCTION__) -#define MSE_ERR(fmt, args...) printk(MSE_TAG" %s %d : \r\n"fmt, __FUNCTION__, __LINE__, ##args) +#define MSE_FUN(f) printk(MSE_TAG" %s\r\n", __func__) +#define MSE_ERR(fmt, args...) printk(MSE_TAG" %s %d : \r\n"fmt, __func__, __LINE__, ##args) #define MSE_LOG(fmt, args...) printk(MSE_TAG fmt, ##args) #define MSE_VER(fmt, args...) ((void)0) /*----------------------------------------------------------------------------*/ @@ -980,7 +980,7 @@ static int mag3110_unlocked_ioctl(struct file *file, unsigned int cmd,unsigned l break; default: - MSE_ERR("%s not supported = 0x%04x", __FUNCTION__, cmd); + MSE_ERR("%s not supported = 0x%04x", __func__, cmd); retval = -ENOIOCTLCMD; break; } diff --git a/drivers/misc/mediatek/magnetometer/mc41xx/mc41xx.c b/drivers/misc/mediatek/magnetometer/mc41xx/mc41xx.c index dc5e0f4a2..3b2b0faff 100644 --- a/drivers/misc/mediatek/magnetometer/mc41xx/mc41xx.c +++ b/drivers/misc/mediatek/magnetometer/mc41xx/mc41xx.c @@ -83,8 +83,8 @@ **************************/ #if 0 #define MSE_TAG "[MSENSOR] " - #define MSE_FUN(f) printk(KERN_INFO MSE_TAG "[%s]", __FUNCTION__) - #define MSE_ERR(fmt, args...) printk(KERN_ERR MSE_TAG "[%s] %d: "fmt, __FUNCTION__, __LINE__, ##args) + #define MSE_FUN(f) printk(KERN_INFO MSE_TAG "[%s]", __func__) + #define MSE_ERR(fmt, args...) printk(KERN_ERR MSE_TAG "[%s] %d: "fmt, __func__, __LINE__, ##args) #define MSE_LOG(fmt, args...) printk(KERN_INFO MSE_TAG fmt, ##args) #define MSE_VER(fmt, args...) ((void)0) #else @@ -278,7 +278,7 @@ int mCube_SensorWrite(u8 *pbDataBuf, int nDataLength) if (0 > hwmsen_write_block(s_ptMcmag_i2c_client, pbDataBuf[0], &pbDataBuf[1], (nDataLength - 1))) { - MSE_ERR("[%s] ERR: i2c write block fail\n", __FUNCTION__); + MSE_ERR("[%s] ERR: i2c write block fail\n", __func__); return (-EIO); } @@ -295,7 +295,7 @@ int mCube_SensorRead(u8 bCmd, int nRcvBufLength, u8 *pbRcvBuf) if (0 > hwmsen_read_block(s_ptMcmag_i2c_client, bCmd, pbRcvBuf, nRcvBufLength)) { - MSE_ERR("[%s] ERR: i2c read fail\n", __FUNCTION__); + MSE_ERR("[%s] ERR: i2c read fail\n", __func__); return (-EIO); } diff --git a/drivers/misc/mediatek/magnetometer/mc6420/mc6420.c b/drivers/misc/mediatek/magnetometer/mc6420/mc6420.c index f949a7193..739b7767b 100644 --- a/drivers/misc/mediatek/magnetometer/mc6420/mc6420.c +++ b/drivers/misc/mediatek/magnetometer/mc6420/mc6420.c @@ -67,8 +67,8 @@ **************************/ #if 0 #define MSE_TAG "[MSENSOR] " - #define MSE_FUN(f) printk(KERN_INFO MSE_TAG "[%s]", __FUNCTION__) - #define MSE_ERR(fmt, args...) printk(KERN_ERR MSE_TAG "[%s] %d: "fmt, __FUNCTION__, __LINE__, ##args) + #define MSE_FUN(f) printk(KERN_INFO MSE_TAG "[%s]", __func__) + #define MSE_ERR(fmt, args...) printk(KERN_ERR MSE_TAG "[%s] %d: "fmt, __func__, __LINE__, ##args) #define MSE_LOG(fmt, args...) printk(KERN_INFO MSE_TAG fmt, ##args) #define MSE_VER(fmt, args...) ((void)0) #else @@ -252,7 +252,7 @@ mCubeResult_t mCube_SensorWrite(void *pDevID, u8 *pbDataBuf, int nDataLength) if (0 > hwmsen_write_block(s_ptMcmag_i2c_client, pbDataBuf[0], &pbDataBuf[1], (nDataLength - 1))) { - MSE_ERR("[%s] ERR: i2c write block fail\n", __FUNCTION__); + MSE_ERR("[%s] ERR: i2c write block fail\n", __func__); return (MCUBE_FAILURE); } @@ -269,7 +269,7 @@ mCubeResult_t mCube_SensorRead(void *pDevID, u8 bCmd, int nRcvBufLength, u8 * if (0 > hwmsen_read_block(s_ptMcmag_i2c_client, bCmd, pbRcvBuf, nRcvBufLength)) { - MSE_ERR("[%s] ERR: i2c read fail\n", __FUNCTION__); + MSE_ERR("[%s] ERR: i2c read fail\n", __func__); return (MCUBE_FAILURE); } diff --git a/drivers/misc/mediatek/magnetometer/mc64xx/mc64xx.c b/drivers/misc/mediatek/magnetometer/mc64xx/mc64xx.c index 29031e2c8..9f489deb9 100644 --- a/drivers/misc/mediatek/magnetometer/mc64xx/mc64xx.c +++ b/drivers/misc/mediatek/magnetometer/mc64xx/mc64xx.c @@ -86,8 +86,8 @@ **************************/ #if 1 #define MSE_TAG "[MSENSOR] " - #define MSE_FUN(f) printk(KERN_INFO MSE_TAG "[%s]", __FUNCTION__) - #define MSE_ERR(fmt, args...) printk(KERN_ERR MSE_TAG "[%s] %d: "fmt, __FUNCTION__, __LINE__, ##args) + #define MSE_FUN(f) printk(KERN_INFO MSE_TAG "[%s]", __func__) + #define MSE_ERR(fmt, args...) printk(KERN_ERR MSE_TAG "[%s] %d: "fmt, __func__, __LINE__, ##args) #define MSE_LOG(fmt, args...) printk(KERN_INFO MSE_TAG fmt, ##args) #define MSE_VER(fmt, args...) ((void)0) #else @@ -270,7 +270,7 @@ int mCube_SensorWrite(u8 *pbDataBuf, int nDataLength) if (0 > hwmsen_write_block(s_ptMcmag_i2c_client, pbDataBuf[0], &pbDataBuf[1], (nDataLength - 1))) { - MSE_ERR("[%s] ERR: i2c write block fail\n", __FUNCTION__); + MSE_ERR("[%s] ERR: i2c write block fail\n", __func__); return (-EIO); } @@ -287,7 +287,7 @@ int mCube_SensorRead(u8 bCmd, int nRcvBufLength, u8 *pbRcvBuf) if (0 > hwmsen_read_block(s_ptMcmag_i2c_client, bCmd, pbRcvBuf, nRcvBufLength)) { - MSE_ERR("[%s] ERR: i2c read fail\n", __FUNCTION__); + MSE_ERR("[%s] ERR: i2c read fail\n", __func__); return (-EIO); } diff --git a/drivers/misc/mediatek/magnetometer/mmc328x/mmc328x.c b/drivers/misc/mediatek/magnetometer/mmc328x/mmc328x.c index daa627db6..bd6ed96bb 100644 --- a/drivers/misc/mediatek/magnetometer/mmc328x/mmc328x.c +++ b/drivers/misc/mediatek/magnetometer/mmc328x/mmc328x.c @@ -1029,7 +1029,7 @@ static int mmc328x_unlocked_ioctl(struct file *file, unsigned int cmd,unsigned l 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; } diff --git a/drivers/misc/mediatek/magnetometer/mmc328x_auto/mmc328x.c b/drivers/misc/mediatek/magnetometer/mmc328x_auto/mmc328x.c index 9a05d5881..8fbc7ba86 100644 --- a/drivers/misc/mediatek/magnetometer/mmc328x_auto/mmc328x.c +++ b/drivers/misc/mediatek/magnetometer/mmc328x_auto/mmc328x.c @@ -1010,7 +1010,7 @@ static int mmc328x_ioctl(struct inode *inode, struct file *file, unsigned int cm 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; } diff --git a/drivers/misc/mediatek/magnetometer/mmc328xma/mmc328x.c b/drivers/misc/mediatek/magnetometer/mmc328xma/mmc328x.c index a611f27e7..2241a47a3 100644 --- a/drivers/misc/mediatek/magnetometer/mmc328xma/mmc328x.c +++ b/drivers/misc/mediatek/magnetometer/mmc328xma/mmc328x.c @@ -1073,7 +1073,7 @@ static int mmc328x_unlocked_ioctl(struct file *file, unsigned int cmd,unsigned l 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; } diff --git a/drivers/misc/mediatek/magnetometer/mmc3416x/mmc3416x.c b/drivers/misc/mediatek/magnetometer/mmc3416x/mmc3416x.c index 3ea14dd23..a2931cccd 100644 --- a/drivers/misc/mediatek/magnetometer/mmc3416x/mmc3416x.c +++ b/drivers/misc/mediatek/magnetometer/mmc3416x/mmc3416x.c @@ -1094,7 +1094,7 @@ static int mmc3416x_release(struct inode *inode, struct file *file) 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; } diff --git a/drivers/misc/mediatek/magnetometer/qmc5983/qmc5983.c b/drivers/misc/mediatek/magnetometer/qmc5983/qmc5983.c index 0e57c66e2..a9590cfa5 100644 --- a/drivers/misc/mediatek/magnetometer/qmc5983/qmc5983.c +++ b/drivers/misc/mediatek/magnetometer/qmc5983/qmc5983.c @@ -101,8 +101,8 @@ #endif #define MSE_TAG "[Msensor] " -#define MSE_FUN(f) printk(MSE_TAG"%s\n", __FUNCTION__) -#define MSE_ERR(fmt, args...) printk(KERN_ERR MSE_TAG"%s %d : "fmt, __FUNCTION__, __LINE__, ##args) +#define MSE_FUN(f) printk(MSE_TAG"%s\n", __func__) +#define MSE_ERR(fmt, args...) printk(KERN_ERR MSE_TAG"%s %d : "fmt, __func__, __LINE__, ##args) #define MSE_LOG(fmt, args...) printk(MSE_TAG fmt, ##args) @@ -1193,7 +1193,7 @@ static int qmc5983_unlocked_ioctl(struct file *file, unsigned int cmd,unsigned l 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; } diff --git a/drivers/misc/mediatek/magnetometer/s62x/s62x.c b/drivers/misc/mediatek/magnetometer/s62x/s62x.c index d3996ea92..6379791a3 100644 --- a/drivers/misc/mediatek/magnetometer/s62x/s62x.c +++ b/drivers/misc/mediatek/magnetometer/s62x/s62x.c @@ -1226,7 +1226,7 @@ static long s62x_unlocked_ioctl(struct file *file, unsigned int cmd, unsigned lo break; default: - printk(KERN_ERR "S62X %s not supported = 0x%04x\n", __FUNCTION__, cmd); + printk(KERN_ERR "S62X %s not supported = 0x%04x\n", __func__, cmd); return -ENOIOCTLCMD; break; } diff --git a/drivers/misc/mediatek/magnetometer/st480/st480.c b/drivers/misc/mediatek/magnetometer/st480/st480.c index 8d2478b41..839a66c9e 100644 --- a/drivers/misc/mediatek/magnetometer/st480/st480.c +++ b/drivers/misc/mediatek/magnetometer/st480/st480.c @@ -21,8 +21,8 @@ #include "mag.h" /*----------------------------------------------------------------------------*/ #define MSE_TAG "MSENSOR" -#define MSE_FUN(f) printk(MSE_TAG" %s\r\n", __FUNCTION__) -#define MSE_ERR(fmt, args...) printk(KERN_ERR MSE_TAG" %s %d : \r\n"fmt, __FUNCTION__, __LINE__, ##args) +#define MSE_FUN(f) printk(MSE_TAG" %s\r\n", __func__) +#define MSE_ERR(fmt, args...) printk(KERN_ERR MSE_TAG" %s %d : \r\n"fmt, __func__, __LINE__, ##args) #define MSE_LOG(fmt, args...) printk(KERN_INFO MSE_TAG fmt, ##args) #define MSE_VER(fmt, args...) ((void)0) @@ -935,7 +935,7 @@ static long st480d_compat_ioctl(struct file *file, unsigned int cmd, unsigned lo 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; } diff --git a/drivers/misc/mediatek/magnetometer/yamaha529/yamaha529.c b/drivers/misc/mediatek/magnetometer/yamaha529/yamaha529.c index f968c80d4..ed885fc2a 100644 --- a/drivers/misc/mediatek/magnetometer/yamaha529/yamaha529.c +++ b/drivers/misc/mediatek/magnetometer/yamaha529/yamaha529.c @@ -2510,8 +2510,8 @@ geomagnetic_driver_init(struct geomagnetic_hwdep_driver *hwdep_driver) #define MSE_TAG "MSENSOR" #if DRIVER_DEBUG -#define MSE_FUN(f) printk(KERN_INFO MSE_TAG" %s\r\n", __FUNCTION__) -#define MSE_ERR(fmt, args...) printk(KERN_ERR MSE_TAG" %s %d : \r\n"fmt, __FUNCTION__, __LINE__, ##args) +#define MSE_FUN(f) printk(KERN_INFO MSE_TAG" %s\r\n", __func__) +#define MSE_ERR(fmt, args...) printk(KERN_ERR MSE_TAG" %s %d : \r\n"fmt, __func__, __LINE__, ##args) #define MSE_LOG(fmt, args...) printk(KERN_INFO MSE_TAG fmt, ##args) #define MSE_VER(fmt, args...) ((void)0) #else @@ -3596,7 +3596,7 @@ static int yamaha529_ioctl(struct inode *inode, struct file *file, unsigned int break; default: - MSE_ERR("%s not supported = 0x%04x", __FUNCTION__, cmd); + MSE_ERR("%s not supported = 0x%04x", __func__, cmd); retval = -ENOIOCTLCMD; break; } diff --git a/drivers/misc/mediatek/magnetometer/yamaha529/yamaha529.h b/drivers/misc/mediatek/magnetometer/yamaha529/yamaha529.h index 57de2ec19..847762300 100644 --- a/drivers/misc/mediatek/magnetometer/yamaha529/yamaha529.h +++ b/drivers/misc/mediatek/magnetometer/yamaha529/yamaha529.h @@ -62,8 +62,8 @@ */ #define MSE_TAG "MSENSOR" -#define MSE_FUN(f) printk(KERN_INFO MSE_TAG" %s\r\n", __FUNCTION__) -#define MSE_ERR(fmt, args...) printk(KERN_ERR MSE_TAG" %s %d : \r\n"fmt, __FUNCTION__, __LINE__, ##args) +#define MSE_FUN(f) printk(KERN_INFO MSE_TAG" %s\r\n", __func__) +#define MSE_ERR(fmt, args...) printk(KERN_ERR MSE_TAG" %s %d : \r\n"fmt, __func__, __LINE__, ##args) #define MSE_LOG(fmt, args...) printk(KERN_INFO MSE_TAG fmt, ##args) #define MSE_VER(fmt, args...) ((void)0) diff --git a/drivers/misc/mediatek/magnetometer/yamaha530/yas_mag_kernel_driver.c b/drivers/misc/mediatek/magnetometer/yamaha530/yas_mag_kernel_driver.c index 7992e8dde..39ed8f822 100644 --- a/drivers/misc/mediatek/magnetometer/yamaha530/yas_mag_kernel_driver.c +++ b/drivers/misc/mediatek/magnetometer/yamaha530/yas_mag_kernel_driver.c @@ -61,8 +61,8 @@ #define MSE_TAG "MSENSOR" #if DRIVER_DEBUG -#define MSE_FUN(f) printk(KERN_INFO MSE_TAG" %s\r\n", __FUNCTION__) -#define MSE_ERR(fmt, args...) printk(KERN_ERR MSE_TAG" %s %d : \r\n"fmt, __FUNCTION__, __LINE__, ##args) +#define MSE_FUN(f) printk(KERN_INFO MSE_TAG" %s\r\n", __func__) +#define MSE_ERR(fmt, args...) printk(KERN_ERR MSE_TAG" %s %d : \r\n"fmt, __func__, __LINE__, ##args) #define MSE_LOG(fmt, args...) printk(KERN_INFO MSE_TAG fmt, ##args) #define MSE_VER(fmt, args...) ((void)0) #else @@ -1656,7 +1656,7 @@ static long yamaha530_ioctl(struct file *file, unsigned int cmd,unsigned long ar break; */ default: - MSE_ERR("%s not supported = 0x%04x", __FUNCTION__, cmd); + MSE_ERR("%s not supported = 0x%04x", __func__, cmd); retval = -ENOIOCTLCMD; break; } diff --git a/drivers/misc/mediatek/magnetometer/yamaha532-new/yas_mag_kernel_driver.c b/drivers/misc/mediatek/magnetometer/yamaha532-new/yas_mag_kernel_driver.c index 1cac30010..ec7751640 100644 --- a/drivers/misc/mediatek/magnetometer/yamaha532-new/yas_mag_kernel_driver.c +++ b/drivers/misc/mediatek/magnetometer/yamaha532-new/yas_mag_kernel_driver.c @@ -62,8 +62,8 @@ #define MSE_TAG "MSENSOR" #if DRIVER_DEBUG -#define MSE_FUN(f) printk(KERN_INFO MSE_TAG" %s\r\n", __FUNCTION__) -#define MSE_ERR(fmt, args...) printk(KERN_ERR MSE_TAG" %s %d : \r\n"fmt, __FUNCTION__, __LINE__, ##args) +#define MSE_FUN(f) printk(KERN_INFO MSE_TAG" %s\r\n", __func__) +#define MSE_ERR(fmt, args...) printk(KERN_ERR MSE_TAG" %s %d : \r\n"fmt, __func__, __LINE__, ##args) #define MSE_LOG(fmt, args...) printk(KERN_INFO MSE_TAG fmt, ##args) #define MSE_VER(fmt, args...) ((void)0) #else @@ -1650,7 +1650,7 @@ static int yamaha530_release(struct inode *inode, struct file *file) break; */ default: - MSE_ERR("%s not supported = 0x%04x", __FUNCTION__, cmd); + MSE_ERR("%s not supported = 0x%04x", __func__, cmd); retval = -ENOIOCTLCMD; break; } diff --git a/drivers/misc/mediatek/magnetometer/yamaha532/yas_mag_kernel_driver.c b/drivers/misc/mediatek/magnetometer/yamaha532/yas_mag_kernel_driver.c index 7098fede5..80c2f93f9 100644 --- a/drivers/misc/mediatek/magnetometer/yamaha532/yas_mag_kernel_driver.c +++ b/drivers/misc/mediatek/magnetometer/yamaha532/yas_mag_kernel_driver.c @@ -61,8 +61,8 @@ #define MSE_TAG "MSENSOR" #if DRIVER_DEBUG -#define MSE_FUN(f) printk(KERN_INFO MSE_TAG" %s\r\n", __FUNCTION__) -#define MSE_ERR(fmt, args...) printk(KERN_ERR MSE_TAG" %s %d : \r\n"fmt, __FUNCTION__, __LINE__, ##args) +#define MSE_FUN(f) printk(KERN_INFO MSE_TAG" %s\r\n", __func__) +#define MSE_ERR(fmt, args...) printk(KERN_ERR MSE_TAG" %s %d : \r\n"fmt, __func__, __LINE__, ##args) #define MSE_LOG(fmt, args...) printk(KERN_INFO MSE_TAG fmt, ##args) #define MSE_VER(fmt, args...) ((void)0) #else @@ -1623,7 +1623,7 @@ static int yamaha530_release(struct inode *inode, struct file *file) break; */ default: - MSE_ERR("%s not supported = 0x%04x", __FUNCTION__, cmd); + MSE_ERR("%s not supported = 0x%04x", __func__, cmd); retval = -ENOIOCTLCMD; break; } diff --git a/drivers/misc/mediatek/magnetometer/yamaha537/yas_mag_kernel.c b/drivers/misc/mediatek/magnetometer/yamaha537/yas_mag_kernel.c index 00e2b8bf6..525d54f93 100644 --- a/drivers/misc/mediatek/magnetometer/yamaha537/yas_mag_kernel.c +++ b/drivers/misc/mediatek/magnetometer/yamaha537/yas_mag_kernel.c @@ -151,7 +151,7 @@ static int yas_device_write(int32_t type, uint8_t addr, const uint8_t *buf, for(i=0; i<=(len+1); i=i+8) { trans_len = ((i+8)<=(len+1)) ? 8 : (len+1-i); - MSE_LOG("%s trans_len = %d\n", __FUNCTION__,trans_len); + MSE_LOG("%s trans_len = %d\n", __func__,trans_len); ret = i2c_master_send(this_client, &tmp[i], trans_len); if(ret < 0) break; @@ -167,7 +167,7 @@ static int yas_device_write(int32_t type, uint8_t addr, const uint8_t *buf, ret = i2c_master_send(this_client, (char *)(st->dma_pa), len+1); if(ret < 0) { - MAGN_ERR("%s i2c_master_send failed! ret = %d\n",__FUNCTION__, ret); + MAGN_ERR("%s i2c_master_send failed! ret = %d\n",__func__, ret); } } } @@ -176,7 +176,7 @@ static int yas_device_write(int32_t type, uint8_t addr, const uint8_t *buf, mutex_unlock(&yas537_i2c_mutex); if(ret < 0) return ret; - //MSE_LOG("%s successful\n", __FUNCTION__); + //MSE_LOG("%s successful\n", __func__); return 0; } @@ -232,7 +232,7 @@ static int yas_device_read(int32_t type, uint8_t addr, uint8_t *buf, int len) err = i2c_master_send(this_client, buf,1); if(err < 0) { - MSE_ERR("%s i2c_master_send failed err = %d\n", __FUNCTION__, err); + MSE_ERR("%s i2c_master_send failed err = %d\n", __func__, err); mutex_unlock(&yas537_i2c_mutex); return err; } @@ -240,13 +240,13 @@ static int yas_device_read(int32_t type, uint8_t addr, uint8_t *buf, int len) for(i=0; i<=len; i=i+8) { trans_len = ((i+8)<=len) ? 8 : (len-i); - MSE_LOG("%s trans_len = %d\n", __FUNCTION__,trans_len); + MSE_LOG("%s trans_len = %d\n", __func__,trans_len); err = i2c_master_recv(this_client, &buf[i], trans_len); if(err < 0) { - MSE_ERR("%s i2c_master_recv failed err = %d\n", __FUNCTION__, err); + MSE_ERR("%s i2c_master_recv failed err = %d\n", __func__, err); mutex_unlock(&yas537_i2c_mutex); return err; } @@ -271,7 +271,7 @@ static int yas_device_read(int32_t type, uint8_t addr, uint8_t *buf, int len) } } //#endif -// MSE_LOG("%s successful\n", __FUNCTION__); +// MSE_LOG("%s successful\n", __func__); mutex_unlock(&yas537_i2c_mutex); return 0; @@ -996,7 +996,7 @@ static int yas_probe(struct i2c_client *i2c, st->dma_va = (char *)dma_alloc_coherent(&(this_client->dev), 1024, &(st->dma_pa), GFP_KERNEL); if(unlikely(NULL==st->dma_va)) { - MAGN_ERR("%s dma_alloc_coherent failed!\n",__FUNCTION__); + MAGN_ERR("%s dma_alloc_coherent failed!\n",__func__); } } } diff --git a/drivers/misc/mediatek/mmc-host/mt6735/dbg.h b/drivers/misc/mediatek/mmc-host/mt6735/dbg.h index 8fc54d51a..0474b7377 100644 --- a/drivers/misc/mediatek/mmc-host/mt6735/dbg.h +++ b/drivers/misc/mediatek/mmc-host/mt6735/dbg.h @@ -174,14 +174,14 @@ extern unsigned int sd_debug_zone[HOST_MAX_NUM]; do { \ if ((DBG_EVT_##evt) & sd_debug_zone[host->id]) { \ pr_err(TAG"%d -> "fmt" <- %s() : L<%d> PID<%s><0x%x>\n", \ - host->id, ##args , __FUNCTION__, __LINE__, current->comm, current->pid); \ + host->id, ##args , __func__, __LINE__, current->comm, current->pid); \ } \ } while(0) #if 1 #define ERR_MSG(fmt, args...) \ do { \ pr_err(TAG"%d -> "fmt" <- %s() : L<%d> PID<%s><0x%x>\n", \ - host->id, ##args , __FUNCTION__, __LINE__, current->comm, current->pid); \ + host->id, ##args , __func__, __LINE__, current->comm, current->pid); \ } while(0); #else #define MAX_PRINT_PERIOD (500000000) /* 500ms */ @@ -192,17 +192,17 @@ do { \ print_nums++; \ msdc_print_start_time = sched_clock(); \ pr_err(TAG"MSDC",TAG"%d -> "fmt" <- %s() : L<%d> PID<%s><0x%x>\n", \ - host->id, ##args , __FUNCTION__, __LINE__, current->comm, current->pid); \ + host->id, ##args , __func__, __LINE__, current->comm, current->pid); \ } else { \ msdc_print_end_time = sched_clock(); \ if ((msdc_print_end_time - msdc_print_start_time) >= MAX_PRINT_PERIOD){ \ pr_err(TAG"MSDC",TAG"%d -> "fmt" <- %s() : L<%d> PID<%s><0x%x>\n", \ - host->id, ##args , __FUNCTION__, __LINE__, current->comm, current->pid); \ + host->id, ##args , __func__, __LINE__, current->comm, current->pid); \ print_nums = 0; \ } else { \ if (print_nums <= MAX_PRINT_NUMS_OVER_PERIOD){ \ pr_err(TAG"MSDC",TAG"%d -> "fmt" <- %s() : L<%d> PID<%s><0x%x>\n", \ - host->id, ##args , __FUNCTION__, __LINE__, current->comm, current->pid); \ + host->id, ##args , __func__, __LINE__, current->comm, current->pid); \ print_nums++; \ } \ } \ @@ -212,7 +212,7 @@ do { \ #define INIT_MSG(fmt, args...) \ do { \ pr_err(TAG"%d -> "fmt" <- %s() : L<%d> PID<%s><0x%x>\n", \ - host->id, ##args , __FUNCTION__, __LINE__, current->comm, current->pid); \ + host->id, ##args , __func__, __LINE__, current->comm, current->pid); \ } while (0); #define SIMPLE_INIT_MSG(fmt, args...) \ do { \ @@ -223,7 +223,7 @@ do { \ #define INFO_MSG(fmt, args...) \ do { \ pr_info(TAG"%d -> "fmt" <- %s() : L<%d> PID<%s><0x%x>\n", \ - host->id, ##args , __FUNCTION__, __LINE__, current->comm, current->pid); \ + host->id, ##args , __func__, __LINE__, current->comm, current->pid); \ } while(0); #if 0 @@ -231,7 +231,7 @@ do { \ #define IRQ_MSG(fmt, args...) \ do { \ pr_err(TAG"%d -> "fmt" <- %s() : L<%d>\n", \ - host->id, ##args , __FUNCTION__, __LINE__); \ + host->id, ##args , __func__, __LINE__); \ } while (0); #else #define IRQ_MSG(fmt, args...) \ diff --git a/drivers/misc/mediatek/nand/mt6735/bmt.c b/drivers/misc/mediatek/nand/mt6735/bmt.c index d77003dd8..10e2984a1 100644 --- a/drivers/misc/mediatek/nand/mt6735/bmt.c +++ b/drivers/misc/mediatek/nand/mt6735/bmt.c @@ -224,7 +224,7 @@ static int load_bmt_data(int start, int pool_size) phys_bmt_struct phys_table; int i; - MSG(INIT, "[%s]: begin to search BMT from block 0x%x\n", __FUNCTION__, bmt_index); + MSG(INIT, "[%s]: begin to search BMT from block 0x%x\n", __func__, bmt_index); for (bmt_index = start + pool_size - 1; bmt_index >= start; bmt_index--) { diff --git a/drivers/misc/mediatek/nand/mt6735/mtk_nand.c b/drivers/misc/mediatek/nand/mt6735/mtk_nand.c index c86d5cba8..fa5996bb0 100644 --- a/drivers/misc/mediatek/nand/mt6735/mtk_nand.c +++ b/drivers/misc/mediatek/nand/mt6735/mtk_nand.c @@ -1176,7 +1176,7 @@ static bool mtk_nand_check_RW_count(u16 u2WriteSize) timeout--; if (0 == timeout) { - printk(KERN_INFO "[%s] timeout\n", __FUNCTION__); + printk(KERN_INFO "[%s] timeout\n", __func__); return false; } } @@ -1473,7 +1473,7 @@ static bool mtk_nand_dma_read_data(struct mtd_info *mtd, u8 * buf, u32 length) { if (!wait_for_completion_timeout(&g_comp_AHB_Done, 2)) { - MSG(READ, "wait for completion timeout happened @ [%s]: %d\n", __FUNCTION__, __LINE__); + MSG(READ, "wait for completion timeout happened @ [%s]: %d\n", __func__, __LINE__); dump_nfi(); g_running_dma = 0; return false; @@ -1484,7 +1484,7 @@ static bool mtk_nand_dma_read_data(struct mtd_info *mtd, u8 * buf, u32 length) timeout--; if (0 == timeout) { - printk(KERN_ERR "[%s] poll BYTELEN error\n", __FUNCTION__); + printk(KERN_ERR "[%s] poll BYTELEN error\n", __func__); g_running_dma = 0; return false; //4 // AHB Mode Time Out! } @@ -1496,7 +1496,7 @@ static bool mtk_nand_dma_read_data(struct mtd_info *mtd, u8 * buf, u32 length) timeout--; if (0 == timeout) { - printk(KERN_ERR "[%s] poll nfi_intr error\n", __FUNCTION__); + printk(KERN_ERR "[%s] poll nfi_intr error\n", __func__); dump_nfi(); g_running_dma = 0; return false; //4 // AHB Mode Time Out! @@ -1508,7 +1508,7 @@ static bool mtk_nand_dma_read_data(struct mtd_info *mtd, u8 * buf, u32 length) timeout--; if (0 == timeout) { - printk(KERN_ERR "[%s] poll BYTELEN error\n", __FUNCTION__); + printk(KERN_ERR "[%s] poll BYTELEN error\n", __func__); dump_nfi(); g_running_dma = 0; return false; //4 // AHB Mode Time Out! @@ -1554,7 +1554,7 @@ static bool mtk_nand_mcu_read_data(u8 * buf, u32 length) } if (0 == timeout) { - printk(KERN_ERR "[%s] timeout\n", __FUNCTION__); + printk(KERN_ERR "[%s] timeout\n", __func__); dump_nfi(); return false; } @@ -1574,7 +1574,7 @@ static bool mtk_nand_mcu_read_data(u8 * buf, u32 length) } if (0 == timeout) { - printk(KERN_ERR "[%s] timeout\n", __FUNCTION__); + printk(KERN_ERR "[%s] timeout\n", __func__); dump_nfi(); return false; } @@ -1653,7 +1653,7 @@ static bool mtk_nand_dma_write_data(struct mtd_info *mtd, u8 * pDataBuf, u32 u4S { if (!wait_for_completion_timeout(&g_comp_AHB_Done, 2)) { - MSG(READ, "wait for completion timeout happened @ [%s]: %d\n", __FUNCTION__, __LINE__); + MSG(READ, "wait for completion timeout happened @ [%s]: %d\n", __func__, __LINE__); dump_nfi(); g_running_dma = 0; return false; @@ -1667,7 +1667,7 @@ static bool mtk_nand_dma_write_data(struct mtd_info *mtd, u8 * pDataBuf, u32 u4S timeout--; if (0 == timeout) { - printk(KERN_ERR "[%s] poll BYTELEN error\n", __FUNCTION__); + printk(KERN_ERR "[%s] poll BYTELEN error\n", __func__); g_running_dma = 0; return false; //4 // AHB Mode Time Out! } @@ -1709,7 +1709,7 @@ static bool mtk_nand_mcu_write_data(struct mtd_info *mtd, const u8 * buf, u32 le } if (0 == timeout) { - printk(KERN_ERR "[%s] timeout\n", __FUNCTION__); + printk(KERN_ERR "[%s] timeout\n", __func__); dump_nfi(); return false; } @@ -1729,7 +1729,7 @@ static bool mtk_nand_mcu_write_data(struct mtd_info *mtd, const u8 * buf, u32 le } if (0 == timeout) { - printk(KERN_ERR "[%s] timeout\n", __FUNCTION__); + printk(KERN_ERR "[%s] timeout\n", __func__); dump_nfi(); return false; } @@ -2749,7 +2749,7 @@ static int mtk_nand_read_oob_raw(struct mtd_info *mtd, uint8_t * buf, int page_a if (len > NAND_MAX_OOBSIZE || len % OOB_AVAI_PER_SECTOR || !buf) { - printk(KERN_WARNING "[%s] invalid parameter, len: %d, buf: %p\n", __FUNCTION__, len, buf); + printk(KERN_WARNING "[%s] invalid parameter, len: %d, buf: %p\n", __func__, len, buf); return -EINVAL; } if (len > spare_per_sector) @@ -2895,7 +2895,7 @@ static int mtk_nand_write_oob_raw(struct mtd_info *mtd, const uint8_t * buf, int if (len > NAND_MAX_OOBSIZE || len % OOB_AVAI_PER_SECTOR || !buf) { - printk(KERN_WARNING "[%s] invalid parameter, len: %d, buf: %p\n", __FUNCTION__, len, buf); + printk(KERN_WARNING "[%s] invalid parameter, len: %d, buf: %p\n", __func__, len, buf); return -EINVAL; } @@ -3040,7 +3040,7 @@ int mtk_nand_read_oob_hw(struct mtd_info *mtd, struct nand_chip *chip, int page) if (mtk_nand_read_oob_raw(mtd, chip->oob_poi, page, mtd->oobsize)) { - // printk(KERN_ERR "[%s]mtk_nand_read_oob_raw return failed\n", __FUNCTION__); + // printk(KERN_ERR "[%s]mtk_nand_read_oob_raw return failed\n", __func__); return -EIO; } #ifdef TESTTIME @@ -3048,7 +3048,7 @@ int mtk_nand_read_oob_hw(struct mtd_info *mtd, struct nand_chip *chip, int page) if (!readoobflag) { readoobflag = 1; - printk(KERN_ERR "[%s] time is %llu", __FUNCTION__, time2); + printk(KERN_ERR "[%s] time is %llu", __func__, time2); } #endif @@ -3437,7 +3437,7 @@ static int mtk_nand_probe(struct platform_device *pdev) if (pdev->num_resources != 4 || res[0].flags != IORESOURCE_MEM || res[1].flags != IORESOURCE_MEM || res[2].flags != IORESOURCE_IRQ || res[3].flags != IORESOURCE_IRQ) { - MSG(INIT, "%s: invalid resource type\n", __FUNCTION__); + MSG(INIT, "%s: invalid resource type\n", __func__); return -ENODEV; } diff --git a/drivers/misc/mediatek/pmic_wrap/mt6735/pwrap_hal.h b/drivers/misc/mediatek/pmic_wrap/mt6735/pwrap_hal.h index c02b72e54..206c4ac91 100644 --- a/drivers/misc/mediatek/pmic_wrap/mt6735/pwrap_hal.h +++ b/drivers/misc/mediatek/pmic_wrap/mt6735/pwrap_hal.h @@ -13,8 +13,8 @@ #ifdef PMIC_WRAP_DEBUG #define PWRAPDEB(fmt, arg...) printk(PWRAPTAG "cpuid=%d," fmt,raw_smp_processor_id(), ##arg) //#define PWRAPLOG(fmt, arg...) printk(PWRAPTAG fmt,##arg) - #define PWRAPFUC(fmt, arg...) printk(PWRAPTAG "cpuid=%d,%s\n", raw_smp_processor_id(), __FUNCTION__) - //#define PWRAPFUC(fmt, arg...) printk(PWRAPTAG "%s\n", __FUNCTION__) + #define PWRAPFUC(fmt, arg...) printk(PWRAPTAG "cpuid=%d,%s\n", raw_smp_processor_id(), __func__) + //#define PWRAPFUC(fmt, arg...) printk(PWRAPTAG "%s\n", __func__) #endif //typedef unsigned int U32; //typedef signed int S32; diff --git a/drivers/misc/mediatek/power/mt6735/max77819_pmic.c b/drivers/misc/mediatek/power/mt6735/max77819_pmic.c index 786c599dc..3d9fa6c2e 100644 --- a/drivers/misc/mediatek/power/mt6735/max77819_pmic.c +++ b/drivers/misc/mediatek/power/mt6735/max77819_pmic.c @@ -113,8 +113,8 @@ static struct max77819_pmic_i2c_data *obj_i2c_data = NULL; /*----------------------------------------------------------------------------*/ #define BLS_TAG "[MAX77819_PMIC] " -#define BLS_FUN(f) printk(KERN_ERR BLS_TAG"%s\n", __FUNCTION__) -#define BLS_ERR(fmt, args...) printk(KERN_ERR BLS_TAG"%s %d : "fmt, __FUNCTION__, __LINE__, ##args) +#define BLS_FUN(f) printk(KERN_ERR BLS_TAG"%s\n", __func__) +#define BLS_ERR(fmt, args...) printk(KERN_ERR BLS_TAG"%s %d : "fmt, __func__, __LINE__, ##args) #define BLS_LOG(fmt, args...) printk(KERN_ERR BLS_TAG fmt, ##args) /*----------------------------------------------------------------------------*/ /* diff --git a/drivers/misc/mediatek/power_gs/mt6735/mt_power_gs.c b/drivers/misc/mediatek/power_gs/mt6735/mt_power_gs.c index 221c1342e..af9df98bb 100644 --- a/drivers/misc/mediatek/power_gs/mt6735/mt_power_gs.c +++ b/drivers/misc/mediatek/power_gs/mt6735/mt_power_gs.c @@ -124,7 +124,7 @@ static int __init mt_power_gs_init(void) mt_power_gs_dir = proc_mkdir("mt_power_gs", NULL); if (!mt_power_gs_dir) - printk("[%s]: mkdir /proc/mt_power_gs failed\n", __FUNCTION__); + printk("[%s]: mkdir /proc/mt_power_gs failed\n", __func__); return 0; } diff --git a/drivers/misc/mediatek/power_gs/mt6735/mt_power_gs_suspend.c b/drivers/misc/mediatek/power_gs/mt6735/mt_power_gs_suspend.c index 77508de56..4fca0360c 100644 --- a/drivers/misc/mediatek/power_gs/mt6735/mt_power_gs_suspend.c +++ b/drivers/misc/mediatek/power_gs/mt6735/mt_power_gs_suspend.c @@ -120,7 +120,7 @@ static int __init mt_power_gs_suspend_init(void) if (!mt_power_gs_dir) { - printk("[%s]: mkdir /proc/mt_power_gs failed\n", __FUNCTION__); + printk("[%s]: mkdir /proc/mt_power_gs failed\n", __func__); } else { diff --git a/drivers/misc/mediatek/secmem/mt6735/secmem.c b/drivers/misc/mediatek/secmem/mt6735/secmem.c index d45daf5be..ab31c793f 100644 --- a/drivers/misc/mediatek/secmem/mt6735/secmem.c +++ b/drivers/misc/mediatek/secmem/mt6735/secmem.c @@ -49,7 +49,7 @@ do { \ } \ } while(0) -#define MSG_FUNC() MSG(FUNC, "%s\n", __FUNCTION__) +#define MSG_FUNC() MSG(FUNC, "%s\n", __func__) typedef struct { u32 id; diff --git a/drivers/misc/mediatek/secwidevine/classicdrm/secwidevine.c b/drivers/misc/mediatek/secwidevine/classicdrm/secwidevine.c index daa2407ff..b840304d9 100644 --- a/drivers/misc/mediatek/secwidevine/classicdrm/secwidevine.c +++ b/drivers/misc/mediatek/secwidevine/classicdrm/secwidevine.c @@ -49,7 +49,7 @@ do { \ } \ } while(0) -#define MSG_FUNC() MSG(FUNC, "%s\n", __FUNCTION__) +#define MSG_FUNC() MSG(FUNC, "%s\n", __func__) typedef struct mc_session_handle mc_session_handle_t; diff --git a/drivers/misc/mediatek/sensorHub/CwMcuSensor/CwMcuSensor.c b/drivers/misc/mediatek/sensorHub/CwMcuSensor/CwMcuSensor.c index 9d99c46a8..501a00266 100644 --- a/drivers/misc/mediatek/sensorHub/CwMcuSensor/CwMcuSensor.c +++ b/drivers/misc/mediatek/sensorHub/CwMcuSensor/CwMcuSensor.c @@ -120,14 +120,14 @@ static void cwmcu_reinit(void) data[3] = (uint8_t)sensor->sensors_info[i][j].timeout; data[4] = (uint8_t)(sensor->sensors_info[i][j].timeout >>8); if(CWMCU_bus_write(sensor, CwRegMapW_SET_ENABLE, data, 5)< 0){ - printk("%s:%s:(flush:bus write fail)\n",LOG_TAG_KERNEL ,__FUNCTION__); + printk("%s:%s:(flush:bus write fail)\n",LOG_TAG_KERNEL ,__func__); } - printk("%s:%s:(id:%d enable)\n",LOG_TAG_KERNEL ,__FUNCTION__,j); + printk("%s:%s:(id:%d enable)\n",LOG_TAG_KERNEL ,__func__,j); if(CWMCU_bus_write(sensor, CwRegMapW_SET_FLUSH, data, 2)< 0){ - printk("%s:%s:(flush:bus write fail)\n",LOG_TAG_KERNEL ,__FUNCTION__); + printk("%s:%s:(flush:bus write fail)\n",LOG_TAG_KERNEL ,__func__); } - printk("%s:%s:(flush:id:%d)\n",LOG_TAG_KERNEL ,__FUNCTION__, j); + printk("%s:%s:(flush:id:%d)\n",LOG_TAG_KERNEL ,__func__, j); msleep(1); } } @@ -148,7 +148,7 @@ static void cwmcu_reinit(void) data[9] = sensor->hw_info[i].private_setting[3]; CWMCU_bus_write(sensor, CwRegMapRW_HW_SENSORS_CONFIG_START+i, data, 10); printk(KERN_DEBUG "CwMcu:%s id:%d, HwId:%u, deviceaddr:%u, mode:%u, position:%u\n" - ,__FUNCTION__ + ,__func__ , i ,sensor->hw_info[i].hw_id ,sensor->hw_info[i].deviceaddr @@ -180,9 +180,9 @@ static void cwmcu_read_batch_buff(struct CWMCU_data *sensor) if (CWMCU_bus_read(sensor, CwRegMapR_BatchCount, data, 2) >= 0) { count = ((uint16_t)data[1] << 8) | (uint16_t)data[0]; -// printk("CwMcu:%s count %u\n",__FUNCTION__, count); +// printk("CwMcu:%s count %u\n",__func__, count); } else { - printk("CwMcu:%s check count failed~!!\n",__FUNCTION__); + printk("CwMcu:%s check count failed~!!\n",__func__); return; } for (i = 0; i < count; i++) { @@ -192,7 +192,7 @@ static void cwmcu_read_batch_buff(struct CWMCU_data *sensor) sensor->report_count++; if (data[0] == META_DATA) { data_event[1] = ((u32)sensor->report_count << 24) |((u32)data[0] << 16) | ((u32)data[2] << 8) | (u32)data[1]; - printk("CwMcu:%s META_DATA ,%u,%u,%u,%u,%u,%u,%u,%u,%u\n",__FUNCTION__, + printk("CwMcu:%s META_DATA ,%u,%u,%u,%u,%u,%u,%u,%u,%u\n",__func__, data[0],data[1],data[2],data[3],data[4],data[5],data[6],data[7],data[8] ); input_report_abs(sensor->input, CW_ABS_Z, data_event[1]); @@ -244,9 +244,9 @@ static void cwmcu_read_stream_buff(struct CWMCU_data *sensor) if (CWMCU_bus_read(sensor, CwRegMapR_StreamCount, data, 2) >= 0) { count = ((uint16_t)data[1] << 8) | (uint16_t)data[0]; -// printk("CwMcu:%s count %u\n",__FUNCTION__, count); +// printk("CwMcu:%s count %u\n",__func__, count); } else { - printk("CwMcu:%s check count failed~!!\n",__FUNCTION__); + printk("CwMcu:%s check count failed~!!\n",__func__); return; } for (i = 0; i < count; i++) { @@ -257,7 +257,7 @@ static void cwmcu_read_stream_buff(struct CWMCU_data *sensor) sensor->report_count++; if (data[0] == META_DATA) { data_event[1] = ((u32)sensor->report_count << 24) |((u32)data[0] << 16) | ((u32)data[2] << 8) | (u32)data[1]; - printk("CwMcu:%s META_DATA ,%u,%u,%u,%u,%u,%u,%u,%u,%u\n",__FUNCTION__, + printk("CwMcu:%s META_DATA ,%u,%u,%u,%u,%u,%u,%u,%u,%u\n",__func__, data[0],data[1],data[2],data[3],data[4],data[5],data[6],data[7],data[8] ); input_report_abs(sensor->input, CW_ABS_Z, data_event[1]); @@ -346,7 +346,7 @@ static void cwmcu_read_mcu_info(struct CWMCU_data *sensor) if (CWMCU_bus_read(sensor, CwRegMapR_SystemInfoMsgCount, data, 1) >= 0) { count = (uint16_t)data[0]; } else { - printk("CwMcu:%s check count failed~!!\n",__FUNCTION__); + printk("CwMcu:%s check count failed~!!\n",__func__); return; } for (i = 0; i < count; i++) { @@ -366,7 +366,7 @@ static void cwmcu_read_Interrupt_buff(struct CWMCU_data *sensor) if (CWMCU_bus_read(sensor, CwRegMapR_InteruptCount, data, 1) >= 0) { count = (uint16_t)data[0]; } else { - printk("CwMcu:%s check count failed~!!\n",__FUNCTION__); + printk("CwMcu:%s check count failed~!!\n",__func__); return; } for (i = 0; i < count; i++) { @@ -400,14 +400,14 @@ static void cwmcu_read_Interrupt_buff(struct CWMCU_data *sensor) }else if(data[1] == 1){ sensor->mcu_enable_list = (sensor->mcu_enable_list&0x0000FFFF) |(((uint32_t)data[3])<<24)|(((uint32_t)data[2])<<16); } - printk("CwMcu:%s:(McuEnableList:%u)\n",__FUNCTION__,sensor->mcu_enable_list); + printk("CwMcu:%s:(McuEnableList:%u)\n",__func__,sensor->mcu_enable_list); }else if(data[0] == MCU_HW_ENABLE_LIST){ if(data[1] == 0){ sensor->mcu_hw_enable_list = (sensor->mcu_hw_enable_list&0xFFFF0000) |(((uint32_t)data[3])<<8)|((uint32_t)data[2]); }else if(data[1] == 1){ sensor->mcu_hw_enable_list = (sensor->mcu_hw_enable_list&0x0000FFFF) |(((uint32_t)data[3])<<24)|(((uint32_t)data[2])<<16); } - printk("CwMcu:%s:(McuHwEnableList:%u)\n",__FUNCTION__,sensor->mcu_hw_enable_list); + printk("CwMcu:%s:(McuHwEnableList:%u)\n",__func__,sensor->mcu_hw_enable_list); } } sensor->interrupt_check_count++; @@ -547,11 +547,11 @@ static int active_set(struct device *dev, struct device_attribute *attr, const c cwmcu_powermode_switch(SWITCH_POWER_ENABLE, 1); if(enabled){ if(CWMCU_bus_write(sensor, CwRegMapW_SET_ENABLE, data, 5)< 0){ - printk("%s:%s:(bus Write Fail)\n",LOG_TAG_KERNEL ,__FUNCTION__); + printk("%s:%s:(bus Write Fail)\n",LOG_TAG_KERNEL ,__func__); } }else{ if(CWMCU_bus_write(sensor, CwRegMapW_SET_DISABLE, data, 5)< 0){ - printk("%s:%s:(bus Write Fail)\n",LOG_TAG_KERNEL ,__FUNCTION__); + printk("%s:%s:(bus Write Fail)\n",LOG_TAG_KERNEL ,__func__); } } msleep(5); @@ -560,7 +560,7 @@ static int active_set(struct device *dev, struct device_attribute *attr, const c return count; enabled_list = (uint32_t)data[3]<<24 |(uint32_t)data[2]<<16 |(uint32_t)data[1]<<8 |(uint32_t)data[0]; if(enabled_list !=sensor->enabled_list){ - printk("%s:%s:(Enable not match AP:0x%x,MCU:0x%x)\n",LOG_TAG_KERNEL ,__FUNCTION__, sensor->enabled_list,enabled_list); + printk("%s:%s:(Enable not match AP:0x%x,MCU:0x%x)\n",LOG_TAG_KERNEL ,__func__, sensor->enabled_list,enabled_list); enabled_list_temp = sensor->enabled_list ^ enabled_list; for(i=0;i<SENSORS_ID_END;i++){ if (enabled_list_temp & (1<<i)) { @@ -571,13 +571,13 @@ static int active_set(struct device *dev, struct device_attribute *attr, const c data[3] = (uint8_t)sensor->sensors_info[NonWakeUpHandle][i].timeout; data[4] = (uint8_t)(sensor->sensors_info[NonWakeUpHandle][i].timeout >>8); CWMCU_bus_write(sensor, CwRegMapW_SET_ENABLE, data, 5); - printk("%s:%s:(id:%d enable)\n",LOG_TAG_KERNEL ,__FUNCTION__,i); + printk("%s:%s:(id:%d enable)\n",LOG_TAG_KERNEL ,__func__,i); }else{ data[2] = 0; data[3] = 0; data[4] = 0; if(CWMCU_bus_write(sensor, CwRegMapW_SET_DISABLE, data, 5)< 0){ - printk("%s:%s:(bus Write Fail)\n",LOG_TAG_KERNEL ,__FUNCTION__); + printk("%s:%s:(bus Write Fail)\n",LOG_TAG_KERNEL ,__func__); } } msleep(5); @@ -585,7 +585,7 @@ static int active_set(struct device *dev, struct device_attribute *attr, const c } } cwmcu_powermode_switch(SWITCH_POWER_ENABLE, 0); - printk("%s:%s:(id:%d, en:%d)\n",LOG_TAG_KERNEL ,__FUNCTION__, id,enabled); + printk("%s:%s:(id:%d, en:%d)\n",LOG_TAG_KERNEL ,__func__, id,enabled); return count; } @@ -639,10 +639,10 @@ static int batch_set(struct device *dev, struct device_attribute *attr, const ch } cwmcu_powermode_switch(SWITCH_POWER_BATCH, 1); if (CWMCU_bus_write(sensor, CwRegMapW_SET_ENABLE, data, 5)<0){ - printk("%s:%s:(Write Fail:id:%d, mode:%d, rate:%d, timeout:%lld)\n",LOG_TAG_KERNEL ,__FUNCTION__, id,mode, rate, timeout); + printk("%s:%s:(Write Fail:id:%d, mode:%d, rate:%d, timeout:%lld)\n",LOG_TAG_KERNEL ,__func__, id,mode, rate, timeout); } cwmcu_powermode_switch(SWITCH_POWER_BATCH, 0); - printk("%s:%s:(id:%d, mode:%d, rate:%d, timeout:%lld)\n",LOG_TAG_KERNEL ,__FUNCTION__, id,mode, rate, timeout); + printk("%s:%s:(id:%d, mode:%d, rate:%d, timeout:%lld)\n",LOG_TAG_KERNEL ,__func__, id,mode, rate, timeout); } return count; } @@ -1209,14 +1209,14 @@ static int set_calibrator_data0(struct device *dev,struct device_attribute *attr } printk("--CWMCU-- CW_ACCELERATION_CALIBRATOR write data\n"); if (CWMCU_bus_write(sensor, CwRegMapRW_Calibrator_Data_Acceleration , &data[3], 30) >= 0) { - printk("CwMcu:%s:(%d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d)\n",__FUNCTION__, + printk("CwMcu:%s:(%d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d)\n",__func__, data[0], data[1], data[2], data[3], data[4], data[5], data[6], data[7], data[8], data[9], data[10], data[11], data[12], data[13], data[14], data[15], data[16], data[17], data[18], data[19], data[20], data[21], data[22], data[23], data[24], data[25], data[26], data[27], data[28], data[29], data[30], data[31], data[32] ); }else{ - printk("CwMcu:%s:(bus write fail)\n",__FUNCTION__); + printk("CwMcu:%s:(bus write fail)\n",__func__); } cwmcu_powermode_switch(SWITCH_POWER_CALIB, 0); @@ -1240,7 +1240,7 @@ static int get_calibrator_data1(struct device *dev, struct device_attribute *att printk(KERN_ERR "--CWMCU-- bus calibrator read fail!!! [MAG]\n"); data[0] = 255; }else{ - printk("CWMCU:%s:(%d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d)\n",__FUNCTION__, + printk("CWMCU:%s:(%d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d)\n",__func__, data[0], data[1], data[2], data[3], data[4], data[5], data[6], data[7], data[8], data[9], data[10], data[11], data[12], data[13], data[14], data[15], data[16], data[17], data[18], data[19], data[20], data[21], data[22], @@ -1281,14 +1281,14 @@ static int set_calibrator_data1(struct device *dev,struct device_attribute *attr } printk("--CWMCU-- CWMCU_MAGNETIC_CALIBRATOR write data\n"); if (CWMCU_bus_write(sensor, CwRegMapRW_Calibrator_Data_Magnetioc , &data[3], 30) >= 0) { - printk("CwMcu:%s:(%d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d)\n",__FUNCTION__, + printk("CwMcu:%s:(%d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d)\n",__func__, data[0], data[1], data[2], data[3], data[4], data[5], data[6], data[7], data[8], data[9], data[10], data[11], data[12], data[13], data[14], data[15], data[16], data[17], data[18], data[19], data[20], data[21], data[22], data[23], data[24], data[25], data[26], data[27], data[28], data[29], data[30], data[31], data[32] ); }else{ - printk("CwMcu:%s:(bus write fail)\n",__FUNCTION__); + printk("CwMcu:%s:(bus write fail)\n",__func__); } cwmcu_powermode_switch(SWITCH_POWER_CALIB, 0); @@ -1307,10 +1307,10 @@ static int get_calibrator_data2(struct device *dev, struct device_attribute *att cwmcu_powermode_switch(SWITCH_POWER_CALIB, 1); if (CWMCU_bus_read(sensor, CwRegMapRW_Calibrator_Data_Gyro , &data[3], 30) < 0) { - printk("CwMcu:%s:(bus read fail)\n",__FUNCTION__); + printk("CwMcu:%s:(bus read fail)\n",__func__); data[0] = 255; }else{ - printk("CwMcu:%s:(%d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d)\n",__FUNCTION__, + printk("CwMcu:%s:(%d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d)\n",__func__, data[0], data[1], data[2], data[3], data[4], data[5], data[6], data[7], data[8], data[9], data[10], data[11], data[12], data[13], data[14], data[15], data[16], data[17], data[18], data[19], data[20], data[21], data[22], @@ -1348,14 +1348,14 @@ static int set_calibrator_data2(struct device *dev,struct device_attribute *attr data[i] = (uint8_t)temp[i]; } if (CWMCU_bus_write(sensor, CwRegMapRW_Calibrator_Data_Gyro , &data[3], 30) >= 0) { - printk("CwMcu:%s:(%d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d)\n",__FUNCTION__, + printk("CwMcu:%s:(%d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d)\n",__func__, data[0], data[1], data[2], data[3], data[4], data[5], data[6], data[7], data[8], data[9], data[10], data[11], data[12], data[13], data[14], data[15], data[16], data[17], data[18], data[19], data[20], data[21], data[22], data[23], data[24], data[25], data[26], data[27], data[28], data[29], data[30], data[31], data[32] ); }else{ - printk("CwMcu:%s:(bus write fail)\n",__FUNCTION__); + printk("CwMcu:%s:(bus write fail)\n",__func__); } cwmcu_powermode_switch(SWITCH_POWER_CALIB, 0); return count; @@ -1431,7 +1431,7 @@ static int timestamp_show(struct device *dev, struct device_attribute *attr, cha timestamp = ((uint32_t)data[3])<<24 | ((uint32_t)data[2])<<16 | ((uint32_t)data[1])<<8 | ((uint32_t)data[0]); timebase = ((uint32_t)data[7])<<24 | ((uint32_t)data[6])<<16 | ((uint32_t)data[5])<<8 | ((uint32_t)data[4]); timebasew = ((uint32_t)data[11])<<24 | ((uint32_t)data[10])<<16 | ((uint32_t)data[9])<<8 | ((uint32_t)data[8]); - CW_INFO("%s:( Time:%d,Base:%d,Basew:%d)\n",__FUNCTION__, timestamp,timebase,timebasew); + CW_INFO("%s:( Time:%d,Base:%d,Basew:%d)\n",__func__, timestamp,timebase,timebasew); buf[12] = 0; memcpy(buf, data, 12); }else{ @@ -1548,7 +1548,7 @@ void factory_active_sensor(int sensor_id, int enabled) mt_eint_unmask(CUST_EINT_SENSORHUB_NUM); } cwmcu_powermode_switch(SWITCH_POWER_ENABLE, 0); - printk("CwMcu:%s id:%d, en:%d\n",__FUNCTION__, sensor_id, enabled); + printk("CwMcu:%s id:%d, en:%d\n",__func__, sensor_id, enabled); } @@ -1606,7 +1606,7 @@ void factory_clear_calibrator_data(int sensor_id) int factory_set_calibrator_data(int sensor_id, SENSOR_DATA *cali_data) { if (!cali_data){ - CW_ERROR("[%s] no sensor data", __FUNCTION__); + CW_ERROR("[%s] no sensor data", __func__); return -1; } @@ -1779,7 +1779,7 @@ static void cwmcu_resume_work(struct work_struct *work) } cwmcu_powermode_switch(SWITCH_POWER_PROBE, 0); - CW_DEBUG("%s:end", __FUNCTION__); + CW_DEBUG("%s:end", __func__); } void CWMCU_suspend(struct device *dev) diff --git a/drivers/misc/mediatek/sensorHub/SCP_sensorHub/SCP_sensorHub.c b/drivers/misc/mediatek/sensorHub/SCP_sensorHub/SCP_sensorHub.c index 945182f8e..3ef1c786f 100644 --- a/drivers/misc/mediatek/sensorHub/SCP_sensorHub/SCP_sensorHub.c +++ b/drivers/misc/mediatek/sensorHub/SCP_sensorHub/SCP_sensorHub.c @@ -303,8 +303,8 @@ static SCP_SENSOR_HUB_DATA_P userData = NULL; static uint *userDataLen = NULL; /*----------------------------------------------------------------------------*/ #define SCP_TAG "[sensorHub] " -#define SCP_FUN(f) printk(KERN_ERR SCP_TAG"%s\n", __FUNCTION__) -#define SCP_ERR(fmt, args...) printk(KERN_ERR SCP_TAG"%s %d : "fmt, __FUNCTION__, __LINE__, ##args) +#define SCP_FUN(f) printk(KERN_ERR SCP_TAG"%s\n", __func__) +#define SCP_ERR(fmt, args...) printk(KERN_ERR SCP_TAG"%s %d : "fmt, __func__, __LINE__, ##args) #define SCP_LOG(fmt, args...) printk(KERN_ERR SCP_TAG fmt, ##args) /*--------------------SCP_sensorHub power control function----------------------------------*/ static void SCP_sensorHub_power(struct sensorHub_hw *hw, unsigned int on) @@ -757,7 +757,7 @@ int SCP_sensorHub_req_send(SCP_SENSOR_HUB_DATA_P data, uint *len, unsigned int w if (in_interrupt()) { - SCP_ERR("Can't do %s in interrupt context!!\n", __FUNCTION__); + SCP_ERR("Can't do %s in interrupt context!!\n", __func__); return -1; } diff --git a/drivers/misc/mediatek/sensorHub/SCP_shf/shf_kernel.c b/drivers/misc/mediatek/sensorHub/SCP_shf/shf_kernel.c index b4671f5dd..66c9b176f 100644 --- a/drivers/misc/mediatek/sensorHub/SCP_shf/shf_kernel.c +++ b/drivers/misc/mediatek/sensorHub/SCP_shf/shf_kernel.c @@ -28,8 +28,8 @@ /*----------------------------------------------------------------------------*/ #define SHF_TAG "[shf_kernel] " -#define SHF_FUN(f) printk( SHF_TAG"%s\n", __FUNCTION__) -#define SHF_ERR(fmt, args...) printk(KERN_ERR SHF_TAG"%s %d : "fmt, __FUNCTION__, __LINE__, ##args) +#define SHF_FUN(f) printk( SHF_TAG"%s\n", __func__) +#define SHF_ERR(fmt, args...) printk(KERN_ERR SHF_TAG"%s %d : "fmt, __func__, __LINE__, ##args) #define SHF_LOG(fmt, args...) printk( SHF_TAG fmt, ##args) /*----------------------------------------------------------------------------*/ diff --git a/drivers/misc/mediatek/spm/mt6735/mt_spm_sleep.c b/drivers/misc/mediatek/spm/mt6735/mt_spm_sleep.c index 69d40b811..1bfbb6219 100755 --- a/drivers/misc/mediatek/spm/mt6735/mt_spm_sleep.c +++ b/drivers/misc/mediatek/spm/mt6735/mt_spm_sleep.c @@ -1339,7 +1339,7 @@ wake_reason_t spm_go_to_sleep(u32 spm_flags, u32 spm_data) extern bool is_already_snap_shot; if (!is_already_snap_shot) - snapshot_golden_setting(__FUNCTION__, 0); + snapshot_golden_setting(__func__, 0); } #endif diff --git a/drivers/misc/mediatek/ssw/combo_fxla2203/combo_fxla2203_driver.c b/drivers/misc/mediatek/ssw/combo_fxla2203/combo_fxla2203_driver.c index de2905687..8fe8e90c0 100644 --- a/drivers/misc/mediatek/ssw/combo_fxla2203/combo_fxla2203_driver.c +++ b/drivers/misc/mediatek/ssw/combo_fxla2203/combo_fxla2203_driver.c @@ -140,7 +140,7 @@ ssize_t ssw_mode_store(struct kobject *kobj, const char *buffer, size_t size) if (res != 1) { - printk("%s: expect 1 numbers\n", __FUNCTION__); + printk("%s: expect 1 numbers\n", __func__); } else { @@ -179,7 +179,7 @@ ssize_t ssw_mode_store(struct kobject *kobj, const char *buffer, size_t size) unsigned int type; if (res != 1) { - printk("%s: expect 1 numbers\n", __FUNCTION__); + printk("%s: expect 1 numbers\n", __func__); } else { diff --git a/drivers/misc/mediatek/ssw/combo_fxla2203_v2/combo_fxla2203_driver.c b/drivers/misc/mediatek/ssw/combo_fxla2203_v2/combo_fxla2203_driver.c index 4f5052c51..8f0d3fdf2 100644 --- a/drivers/misc/mediatek/ssw/combo_fxla2203_v2/combo_fxla2203_driver.c +++ b/drivers/misc/mediatek/ssw/combo_fxla2203_v2/combo_fxla2203_driver.c @@ -119,7 +119,7 @@ ssize_t ssw_mode_store(struct kobject *kobj, const char *buffer, size_t size) if (res != 1) { - printk("%s: expect 1 numbers\n", __FUNCTION__); + printk("%s: expect 1 numbers\n", __func__); } else { diff --git a/drivers/misc/mediatek/ssw/combo_fxla2203_v3/combo_fxla2203_driver.c b/drivers/misc/mediatek/ssw/combo_fxla2203_v3/combo_fxla2203_driver.c index 5927ab450..d7534a360 100644 --- a/drivers/misc/mediatek/ssw/combo_fxla2203_v3/combo_fxla2203_driver.c +++ b/drivers/misc/mediatek/ssw/combo_fxla2203_v3/combo_fxla2203_driver.c @@ -119,7 +119,7 @@ ssize_t ssw_mode_store(struct kobject *kobj, const char *buffer, size_t size) if (res != 1) { - printk("%s: expect 1 numbers\n", __FUNCTION__); + printk("%s: expect 1 numbers\n", __func__); } else { diff --git a/drivers/misc/mediatek/ssw/ssw_generic/sim_switch.c b/drivers/misc/mediatek/ssw/ssw_generic/sim_switch.c index 52487de17..fdf65628c 100644 --- a/drivers/misc/mediatek/ssw/ssw_generic/sim_switch.c +++ b/drivers/misc/mediatek/ssw/ssw_generic/sim_switch.c @@ -158,7 +158,7 @@ ssize_t ssw_mode_store(struct kobject *kobj, const char *buffer, size_t size) if (res != 1) { - SSW_DBG("%s: expect 1 numbers\n", __FUNCTION__); + SSW_DBG("%s: expect 1 numbers\n", __func__); } else { diff --git a/drivers/misc/mediatek/ssw/ssw_generic_v2/sim_switch.c b/drivers/misc/mediatek/ssw/ssw_generic_v2/sim_switch.c index 1bf6d6bf0..a68c198df 100644 --- a/drivers/misc/mediatek/ssw/ssw_generic_v2/sim_switch.c +++ b/drivers/misc/mediatek/ssw/ssw_generic_v2/sim_switch.c @@ -116,7 +116,7 @@ ssize_t ssw_mode_store(struct kobject *kobj, const char *buffer, size_t size) if (res != 1) { - SSW_DBG("%s: expect 1 numbers\n", __FUNCTION__); + SSW_DBG("%s: expect 1 numbers\n", __func__); } else { diff --git a/drivers/misc/mediatek/ssw/ssw_single/sim_switch.c b/drivers/misc/mediatek/ssw/ssw_single/sim_switch.c index e89c54312..b34c05f6f 100644 --- a/drivers/misc/mediatek/ssw/ssw_single/sim_switch.c +++ b/drivers/misc/mediatek/ssw/ssw_single/sim_switch.c @@ -133,7 +133,7 @@ ssize_t ssw_mode_store(struct kobject *kobj, const char *buffer, size_t size) if (res != 1) { - printk("%s: expect 1 numbers\n", __FUNCTION__); + printk("%s: expect 1 numbers\n", __func__); } else { diff --git a/drivers/misc/mediatek/ssw/ssw_single_v2/sim_switch.c b/drivers/misc/mediatek/ssw/ssw_single_v2/sim_switch.c index a973edbf8..62657a2c0 100644 --- a/drivers/misc/mediatek/ssw/ssw_single_v2/sim_switch.c +++ b/drivers/misc/mediatek/ssw/ssw_single_v2/sim_switch.c @@ -114,7 +114,7 @@ ssize_t ssw_mode_store(struct kobject *kobj, const char *buffer, size_t size) if (res != 1) { - SSW_DBG("%s: expect 1 numbers\n", __FUNCTION__); + SSW_DBG("%s: expect 1 numbers\n", __func__); } else { diff --git a/drivers/misc/mediatek/sysenv/mt6735/sysenv.c b/drivers/misc/mediatek/sysenv/mt6735/sysenv.c index 1c6eca841..083270101 100644 --- a/drivers/misc/mediatek/sysenv/mt6735/sysenv.c +++ b/drivers/misc/mediatek/sysenv/mt6735/sysenv.c @@ -409,7 +409,7 @@ write_env: ret = write_env_area(env_buffer); if (ret < 0) { pr_err("[%s]%s error: write env area fail\n", - MODULE_NAME, __FUNCTION__); + MODULE_NAME, __func__); memset(env_buffer, 0x00, CFG_ENV_SIZE); return -1; } diff --git a/drivers/misc/mediatek/trustzone/tz_irq.c b/drivers/misc/mediatek/trustzone/tz_irq.c index ea419fd1d..60cb3dd6e 100644 --- a/drivers/misc/mediatek/trustzone/tz_irq.c +++ b/drivers/misc/mediatek/trustzone/tz_irq.c @@ -102,7 +102,7 @@ void kree_irq_init(void) ret = KREE_CreateSession(TZ_TA_IRQ_UUID, &irq_session); if (ret != TZ_RESULT_SUCCESS) { - printk("%s: CreateSession error %d\n", __FUNCTION__, ret); + printk("%s: CreateSession error %d\n", __func__, ret); return; } } @@ -128,7 +128,7 @@ int kree_set_fiq(int irq, unsigned long irq_flags) param); if (ret != TZ_RESULT_SUCCESS) { - printk("%s error: %s\n", __FUNCTION__, TZ_GetErrorString(ret)); + printk("%s error: %s\n", __func__, TZ_GetErrorString(ret)); } return ret; } @@ -145,7 +145,7 @@ static void __kree_enable_fiq(int irq, int enable) param); if (ret != TZ_RESULT_SUCCESS) { - printk("%s error: %s\n", __FUNCTION__, TZ_GetErrorString(ret)); + printk("%s error: %s\n", __func__, TZ_GetErrorString(ret)); } } @@ -170,7 +170,7 @@ void kree_query_fiq(int irq, int *enable, int *pending) param); if (ret != TZ_RESULT_SUCCESS) { - printk("%s error: %s\n", __FUNCTION__, TZ_GetErrorString(ret)); + printk("%s error: %s\n", __func__, TZ_GetErrorString(ret)); param[1].value.a = 0; } @@ -225,7 +225,7 @@ void kree_irq_mask_all(unsigned int *pmask, unsigned int size) param); if (ret != TZ_RESULT_SUCCESS) { - printk("%s error: %s\n", __FUNCTION__, TZ_GetErrorString(ret)); + printk("%s error: %s\n", __func__, TZ_GetErrorString(ret)); } } @@ -241,6 +241,6 @@ void kree_irq_mask_restore(unsigned int *pmask, unsigned int size) param); if (ret != TZ_RESULT_SUCCESS) { - printk("%s error: %s\n", __FUNCTION__, TZ_GetErrorString(ret)); + printk("%s error: %s\n", __func__, TZ_GetErrorString(ret)); } } diff --git a/drivers/misc/mediatek/trustzone/tz_pm.c b/drivers/misc/mediatek/trustzone/tz_pm.c index 55b54c9ef..24ff6a7ef 100644 --- a/drivers/misc/mediatek/trustzone/tz_pm.c +++ b/drivers/misc/mediatek/trustzone/tz_pm.c @@ -30,7 +30,7 @@ void kree_pm_cpu_lowpower(volatile int *ppen_release, int logical_cpuid) param); if (ret != TZ_RESULT_SUCCESS) { - printk("%s error: %s\n", __FUNCTION__, TZ_GetErrorString(ret)); + printk("%s error: %s\n", __func__, TZ_GetErrorString(ret)); } } @@ -44,7 +44,7 @@ int kree_pm_cpu_dormant(int mode) TZ_ParamTypes1(TZPT_VALUE_INPUT), param); if (ret != TZ_RESULT_SUCCESS) { - printk("%s error: %s\n", __FUNCTION__, TZ_GetErrorString(ret)); + printk("%s error: %s\n", __func__, TZ_GetErrorString(ret)); } return 0; @@ -60,7 +60,7 @@ int kree_pm_device_ops(int state) TZ_ParamTypes1(TZPT_VALUE_INPUT), param); if (ret != TZ_RESULT_SUCCESS) { - printk("%s error: %s\n", __FUNCTION__, TZ_GetErrorString(ret)); + printk("%s error: %s\n", __func__, TZ_GetErrorString(ret)); } return ret; } @@ -75,7 +75,7 @@ int kree_pm_cpu_dormant_workaround_wake(int workaround_wake) TZ_ParamTypes1(TZPT_VALUE_INPUT), param); if (ret != TZ_RESULT_SUCCESS) { - printk("%s error: %s\n", __FUNCTION__, TZ_GetErrorString(ret)); + printk("%s error: %s\n", __func__, TZ_GetErrorString(ret)); } return 0; diff --git a/drivers/misc/mediatek/uart/mt6735/platform_uart.c b/drivers/misc/mediatek/uart/mt6735/platform_uart.c index 548034959..a6670465f 100644 --- a/drivers/misc/mediatek/uart/mt6735/platform_uart.c +++ b/drivers/misc/mediatek/uart/mt6735/platform_uart.c @@ -2138,7 +2138,7 @@ void mtk_uart_restore(void) void mtk_uart_switch_tx_to_gpio(struct mtk_uart *uart) { - printk(KERN_ERR "%s port:0x%x\n", __FUNCTION__, uart->nport); + printk(KERN_ERR "%s port:0x%x\n", __func__, uart->nport); #ifdef CONFIG_PM #ifndef CONFIG_MTK_FPGA switch(uart->nport){ @@ -2184,7 +2184,7 @@ void mtk_uart_switch_tx_to_gpio(struct mtk_uart *uart) /*---------------------------------------------------------------------------*/ void mtk_uart_switch_to_tx(struct mtk_uart *uart) { - printk(KERN_ERR "%s port:0x%x\n", __FUNCTION__, uart->nport); + printk(KERN_ERR "%s port:0x%x\n", __func__, uart->nport); #ifdef CONFIG_PM #ifndef CONFIG_MTK_FPGA switch(uart->nport){ @@ -2226,7 +2226,7 @@ void mtk_uart_switch_to_tx(struct mtk_uart *uart) /*---------------------------------------------------------------------------*/ void mtk_uart_switch_rx_to_gpio(struct mtk_uart *uart) { - printk(KERN_ERR "%s port:0x%x\n", __FUNCTION__, uart->nport); + printk(KERN_ERR "%s port:0x%x\n", __func__, uart->nport); #ifdef CONFIG_PM #ifndef CONFIG_MTK_FPGA switch(uart->nport){ @@ -2268,7 +2268,7 @@ void mtk_uart_switch_rx_to_gpio(struct mtk_uart *uart) /*---------------------------------------------------------------------------*/ void mtk_uart_switch_to_rx(struct mtk_uart *uart) { - printk(KERN_ERR "%s port:0x%x\n", __FUNCTION__, uart->nport); + printk(KERN_ERR "%s port:0x%x\n", __func__, uart->nport); #ifdef CONFIG_PM #ifndef CONFIG_MTK_FPGA switch(uart->nport){ diff --git a/drivers/misc/mediatek/uart/mt6735/platform_uart.h b/drivers/misc/mediatek/uart/mt6735/platform_uart.h index 937528eb3..2252f652b 100644 --- a/drivers/misc/mediatek/uart/mt6735/platform_uart.h +++ b/drivers/misc/mediatek/uart/mt6735/platform_uart.h @@ -165,7 +165,7 @@ do { \ /*---------------------------------------------------------------------------*/ #define UART_DEBUG_EVT(evt) ((evt) & uart->evt_mask) /*---------------------------------------------------------------------------*/ -#define MSG_FUNC_ENTRY(f) MSG(FUC, "%s\n", __FUNCTION__) +#define MSG_FUNC_ENTRY(f) MSG(FUC, "%s\n", __func__) #define MSG_RAW pr_notice /*---------------------------------------------------------------------------*/ #else /*release mode: only enable error log*/ diff --git a/drivers/misc/mediatek/uart/uart.c b/drivers/misc/mediatek/uart/uart.c index b6ede0ce1..327c4c841 100644 --- a/drivers/misc/mediatek/uart/uart.c +++ b/drivers/misc/mediatek/uart/uart.c @@ -327,7 +327,7 @@ ssize_t mtk_uart_debug_store(struct kobject *kobj, const char *buffer, size_t si int res = sscanf(buffer, "0x%x 0x%x 0x%x 0x%x", &a, &b, &c, &d); if (res != 4) { - MSG_ERR("%s: expect 4 numbers\n", __FUNCTION__); + MSG_ERR("%s: expect 4 numbers\n", __func__); } else { set_uart_evt_mask(0, a); set_uart_evt_mask(1, b); @@ -340,7 +340,7 @@ ssize_t mtk_uart_debug_store(struct kobject *kobj, const char *buffer, size_t si int res = sscanf(buffer, "0x%x 0x%x 0x%x 0x%x 0x%x", &a, &b, &c, &d, &e); if (res != 5) { - MSG_ERR("%s: expect 5 numbers\n", __FUNCTION__); + MSG_ERR("%s: expect 5 numbers\n", __func__); } else { set_uart_evt_mask(0, a); set_uart_evt_mask(1, b); @@ -364,7 +364,7 @@ ssize_t mtk_uart_sysrq_store(struct kobject *kobj, const char *buffer, size_t si int res = sscanf(buffer, "%d\n", &a); if (res != 1) { - MSG_ERR("%s: expect 1 number\n", __FUNCTION__); + MSG_ERR("%s: expect 1 number\n", __func__); } else { atomic_set(&obj->sysrq, a); } @@ -392,9 +392,9 @@ ssize_t mtk_uart_vffsz_store(struct kobject *kobj, const char *buffer, size_t si int idx, sz; if (2 != sscanf(buffer, "%d %d", &idx, &sz)) { - MSG_ERR("%s: expect 2 variables\n", __FUNCTION__); + MSG_ERR("%s: expect 2 variables\n", __func__); } else if (idx >= ARRAY_SIZE(obj->vffLen) || (sz%8 != 0)) { - MSG_ERR("%s: invalid args %d, %d\n", __FUNCTION__, idx, sz); + MSG_ERR("%s: invalid args %d, %d\n", __func__, idx, sz); } else { atomic_set(&obj->vffLen[idx], sz); } @@ -414,7 +414,7 @@ ssize_t mtk_uart_conse_store(struct kobject *kobj, const char *buffer, size_t si int enable; if (1 != sscanf(buffer, "%d", &enable)) { - MSG_ERR("%s: expect 1 variables\n", __FUNCTION__); + MSG_ERR("%s: expect 1 variables\n", __func__); } else { atomic_set(&obj->console_enable, enable); } @@ -455,7 +455,7 @@ ssize_t mtk_uart_vff_en_store(struct kobject *kobj, const char *buffer, size_t s &u1_tx, &u1_rx, &u2_tx, &u2_rx, &u3_tx, &u3_rx, &u4_tx, &u4_rx); if (res != 8) { - MSG_ERR("%s: expect 8 numbers\n", __FUNCTION__); + MSG_ERR("%s: expect 8 numbers\n", __func__); } else { uart_setting = get_uart_default_settings(0); uart_setting->tx_mode = u1_tx; @@ -478,7 +478,7 @@ ssize_t mtk_uart_vff_en_store(struct kobject *kobj, const char *buffer, size_t s &u1_tx, &u1_rx, &u2_tx, &u2_rx, &u3_tx, &u3_rx, &u4_tx, &u4_rx, &u5_tx, &u5_rx); if (res != 8) { - MSG_ERR("%s: expect 8 numbers\n", __FUNCTION__); + MSG_ERR("%s: expect 8 numbers\n", __func__); } else { uart_setting = get_uart_default_settings(0); uart_setting->tx_mode = u1_tx; @@ -536,7 +536,7 @@ ssize_t mtk_uart_lsr_status_store(struct kobject *kobj, const char *buffer, size &u1_lsr, &u2_lsr, &u3_lsr, &u4_lsr); if (res != 4) { - MSG_ERR("%s: expect 4 numbers\n", __FUNCTION__); + MSG_ERR("%s: expect 4 numbers\n", __func__); } else { set_uart_lsr_status(0, u1_lsr); set_uart_lsr_status(1, u2_lsr); @@ -550,7 +550,7 @@ ssize_t mtk_uart_lsr_status_store(struct kobject *kobj, const char *buffer, size &u1_lsr, &u2_lsr, &u3_lsr, &u4_lsr, &u5_lsr); if (res != 5) { - MSG_ERR("%s: expect 5 numbers\n", __FUNCTION__); + MSG_ERR("%s: expect 5 numbers\n", __func__); } else { set_uart_lsr_status(0, u1_lsr); set_uart_lsr_status(1, u2_lsr); @@ -1538,7 +1538,7 @@ static void mtk_uart_rx_chars(struct mtk_uart *uart) tty_flip_buffer_push(TTY_FLIP_ARG(tty)); update_history_time(0, uart->nport); spin_unlock_irqrestore(&port->lock, flags); - MSG(FUC, "%s (%2d)\n", __FUNCTION__, UART_FIFO_SIZE - max_count - 1); + MSG(FUC, "%s (%2d)\n", __func__, UART_FIFO_SIZE - max_count - 1); #if defined(CONFIG_MTK_HDMI_SUPPORT) #ifdef MHL_UART_SHARE_PIN if((UART_FIFO_SIZE - max_count - 1) > 0) diff --git a/drivers/misc/mediatek/usb11/musbfsh_host.c b/drivers/misc/mediatek/usb11/musbfsh_host.c index 08b34f165..0760ce184 100644 --- a/drivers/misc/mediatek/usb11/musbfsh_host.c +++ b/drivers/misc/mediatek/usb11/musbfsh_host.c @@ -401,7 +401,7 @@ static void musbfsh_advance_schedule(struct musbfsh *musbfsh, struct urb *urb, /* if(((unsigned int)(long)&qh->hep->urb_list)< 0xc0000000) { - printk(KERN_ERR"hank:%s(%d)urb=0x%x,qh=0x%x,qh->hep=0x%x,&qh->hep->urb_list=0x%x\n",__FUNCTION__,__LINE__, + printk(KERN_ERR"hank:%s(%d)urb=0x%x,qh=0x%x,qh->hep=0x%x,&qh->hep->urb_list=0x%x\n",__func__,__LINE__, (unsigned int)(long)urb,(unsigned int)(long)qh,(unsigned int)(long)qh->hep,(unsigned int)(long)&qh->hep->urb_list); return ; } diff --git a/drivers/misc/mediatek/vdec/hal/vdec_hal_if_h265.c b/drivers/misc/mediatek/vdec/hal/vdec_hal_if_h265.c index 3f3533553..050365a04 100644 --- a/drivers/misc/mediatek/vdec/hal/vdec_hal_if_h265.c +++ b/drivers/misc/mediatek/vdec/hal/vdec_hal_if_h265.c @@ -1632,7 +1632,7 @@ INT32 i4VDEC_HAL_H265_DecStart(UINT32 u4VDecID, VDEC_INFO_DEC_PRM_T *prDecPrm) void vVDEC_HAL_H265_GetMbxMby(UINT32 u4VDecID, UINT32 *pu4Mbx, UINT32 *pu4Mby) { UINT32 u4RegReturnValue; - //DBG_H265_PRINTF(pfLogFile,"\n[Info] %s() \n", __FUNCTION__); + //DBG_H265_PRINTF(pfLogFile,"\n[Info] %s() \n", __func__); u4RegReturnValue = u4VDecReadHEVCVLD(u4VDecID, HEVC_LCU_POS_REG); *pu4Mbx = (u4RegReturnValue & 0x0000FFFF); *pu4Mby = ((u4RegReturnValue >> 16) & 0x0000FFFF); diff --git a/drivers/misc/mediatek/vdec/hal/vdec_hal_if_mpeg.c b/drivers/misc/mediatek/vdec/hal/vdec_hal_if_mpeg.c index 6879b2149..0ec9966a2 100644 --- a/drivers/misc/mediatek/vdec/hal/vdec_hal_if_mpeg.c +++ b/drivers/misc/mediatek/vdec/hal/vdec_hal_if_mpeg.c @@ -1028,7 +1028,7 @@ void vVDEC_HAL_MPEG_VDec_DumpReg(UINT32 u4VDecID, BOOL fgBefore) //return; //#endif - printk("<vdec> %s, %d!\n", __FUNCTION__, __LINE__); + printk("<vdec> %s, %d!\n", __func__, __LINE__); //_tRecFileInfo.fpFile = fopen(_bFileStr1[_u4VDecID][2],"a+t"); #if 1 diff --git a/drivers/misc/mediatek/vdec/hal/vdec_hal_if_vp6.c b/drivers/misc/mediatek/vdec/hal/vdec_hal_if_vp6.c index f54b5402e..27c18e7ba 100644 --- a/drivers/misc/mediatek/vdec/hal/vdec_hal_if_vp6.c +++ b/drivers/misc/mediatek/vdec/hal/vdec_hal_if_vp6.c @@ -258,7 +258,7 @@ void vVDEC_HAL_VP6_InitCtx(UINT32 u4VDecID, UINT32 u4BSID, VDEC_INFO_VP6_FRM_HDR { UINT32 i, j, u4Cnt, u4Addr, u4Addr2, u4Tmp; UINT32 coeff_model[4]; - printk("//<vdec> entry %s\n", __FUNCTION__); + printk("//<vdec> entry %s\n", __func__); if (!prFrmHdr) { @@ -401,7 +401,7 @@ void vVDEC_HAL_VP6_InitCtx(UINT32 u4VDecID, UINT32 u4BSID, VDEC_INFO_VP6_FRM_HDR // ************************************************************************** INT32 i4VDEC_HAL_VP6_InitVDecHW(UINT32 u4VDecID, VDEC_INFO_VP6_VFIFO_PRM_T *prVp6VFifoInitPrm) { - printk("<vdec> entry %s\n", __FUNCTION__); + printk("<vdec> entry %s\n", __func__); #if (CONFIG_CHIP_VER_CURR < CONFIG_CHIP_VER_MT8555) vVDecResetHW(u4VDecID); @@ -469,7 +469,7 @@ INT32 i4VDEC_HAL_VP6_InitBarrelShifter(UINT32 u4BSID, UINT32 u4VDecID, VDEC_INFO //UINT32 u4VLDByte, u4VLDBit; UINT32 u4VLDRemainByte; - printk("<vdec> entry %s\n", __FUNCTION__); + printk("<vdec> entry %s\n", __func__); #if (CONFIG_DRV_VERIFY_SUPPORT) && (CONFIG_DRV_LINUX) //HalFlushInvalidateDCache(); @@ -580,7 +580,7 @@ INT32 i4VDEC_HAL_VP6_InitBarrelShifter2(UINT32 u4BSID, UINT32 u4VDecID, VDEC_INF INT32 i; UINT32 u4VLDRemainByte; UINT32 u4Cnt = 0; - printk("<vdec> entry %s\n", __FUNCTION__); + printk("<vdec> entry %s\n", __func__); #if (CONFIG_DRV_VERIFY_SUPPORT) && (CONFIG_DRV_LINUX) //HalFlushInvalidateDCache(); #endif @@ -794,7 +794,7 @@ INT32 i4VDEC_HAL_VP6_DecStart(UINT32 u4VDecID, VDEC_INFO_DEC_PRM_T *prDecPrm) //u4CRCSrc = (VDEC_CRC_EN | VDEC_CRC_SRC_PP); //CRC input from PP vVDecWriteCRC(u4VDecID, 0x4, u4CRCSrc); #endif - printk("<vdec> entry %s\n", __FUNCTION__); + printk("<vdec> entry %s\n", __func__); // set video down scaler parameter vVDECSetDownScalerPrm(u4VDecID, &prDecPrm->rDownScalerPrm); @@ -1083,7 +1083,7 @@ INT32 i4VDEC_HAL_VP6_DecStart(UINT32 u4VDecID, VDEC_INFO_DEC_PRM_T *prDecPrm) #endif { - printk("<vdec> Input window is 0x%x (%s, %d)\n", u4VDecReadVP6VLD(u4VDecID, 0xF0), __FUNCTION__, __LINE__); + printk("<vdec> Input window is 0x%x (%s, %d)\n", u4VDecReadVP6VLD(u4VDecID, 0xF0), __func__, __LINE__); //u4VDecReadVldRPtr(u4BSID, u4VDecID, &u4VldBit, PHYSICAL((UINT32)_pucVFifo[u4VDecID])); } @@ -1334,7 +1334,7 @@ UINT32 u4VDEC_HAL_VP6_Default_Models_Init(UINT32 u4BSID, UINT32 u4VDecID) // MEMCPY_ALIGNED(s->coeff_reorder, vp6_def_coeff_reorder, sizeof(s->coeff_reorder)); // vp6_coeff_order_table_init(s); - printk("<vdec> entry %s\n", __FUNCTION__); + printk("<vdec> entry %s\n", __func__); pred_range = 840; mbt_range = 102; @@ -2055,7 +2055,7 @@ UINT32 u4VDEC_HAL_VP6_Parse_Mb_Type_Models(UINT32 u4BSID, UINT32 u4VDecID) UINT32 u4Val, u4Tmp0, u4Tmp1, u4Tmp2, u4Tmp3; #ifdef VP6_MULTI_STREAM UINT32 u4Addr; - printk("<vdec> entry %s\n", __FUNCTION__); + printk("<vdec> entry %s\n", __func__); for (idx = 0; idx < 16; idx++) { @@ -2213,7 +2213,7 @@ UINT32 u4VDEC_HAL_VP6_Load_QMatrix(UINT32 u4BSID, UINT32 u4VDecID) 12, 13, 13, 13, 13, 13, 14, 14, 14, 14, 15, 15, 15, 15, 15, 15, }; - printk("<vdec> entry %s\n", __FUNCTION__); + printk("<vdec> entry %s\n", __func__); for (i = 0; i < 64; i += 4) { //fprintf(risc_out,"RISCWrite(`VLD_ADDR_1 +4*152, (0<<8) + %d);\n", i); @@ -2252,7 +2252,7 @@ UINT32 u4VDEC_HAL_VP6_Read_QMatrix(UINT32 u4BSID, UINT32 u4VDecID) 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, }; - printk("<vdec> entry %s\n", __FUNCTION__); + printk("<vdec> entry %s\n", __func__); for (i = 0; i < 64; i += 4) { vVDecWriteVLD(u4VDecID, RW_VLD_SCL_ADDR, ((1 << 8) + i)); @@ -2450,7 +2450,7 @@ UINT32 u4VDEC_HAL_VP6_Load_Filter_Coef(UINT32 u4BSID, UINT32 u4VDecID, UINT32 u4 // ==> 0x870 [28:24] = 3 // ==> 0x870 [20:16] = 2 // ==> 0x870 [12:8] = 1 - printk("<vdec> entry %s\n", __FUNCTION__); + printk("<vdec> entry %s\n", __func__); u4Tmp0 = (vp6_block_copy_filter[u4Select][1][0] * -1); u4Tmp1 = (vp6_block_copy_filter[u4Select][2][0] * -1); @@ -2511,7 +2511,7 @@ UINT32 u4VDEC_HAL_VP6_Load_Filter_Coef(UINT32 u4BSID, UINT32 u4VDecID, UINT32 u4 UINT32 u4VDEC_HAL_VP6_Write_SRAMData1(UINT32 u4BSID, UINT32 u4VDecID) { - printk("<vdec> entry %s\n", __FUNCTION__); + printk("<vdec> entry %s\n", __func__); //---------- ctx = 0 ---------- vVDecWriteVP6VLD(u4VDecID, 4 * 50, 0x3a8, u4BSID); @@ -2820,7 +2820,7 @@ UINT32 u4VDEC_HAL_VP6_Read_SRAMData1(UINT32 u4BSID, UINT32 u4VDecID) UINT32 u4Reg77 [50] = {0}; UINT32 u4Reg78 [50] = {0}; UINT32 u4Reg79 [50] = {0}; - printk("<vdec> entry %s\n", __FUNCTION__); + printk("<vdec> entry %s\n", __func__); for (i = 936; i <= 984; i++) { //RISCWrite(`VP6_ADDR + 4*75, 32'h3a8); @@ -2875,7 +2875,7 @@ UINT32 u4VDec_HAL_VP6_VDec_BackupSram(UINT32 u4VDecID, VDEC_INFO_VP6_DEC_PRM_T * { UINT32 i, j, u4Cnt, u4Addr, *pBuf; - printk("<vdec> entry %s\n", __FUNCTION__); + printk("<vdec> entry %s\n", __func__); if (!prDecPrm) { @@ -2914,7 +2914,7 @@ UINT32 u4VDec_HAL_VP6_VDec_RestoreSram(UINT32 u4VDecID, VDEC_INFO_VP6_DEC_PRM_T { UINT32 i, j, u4Cnt, u4Addr, *pBuf; - printk("<vdec> entry %s\n", __FUNCTION__); + printk("<vdec> entry %s\n", __func__); if (!prDecPrm) { diff --git a/drivers/misc/mediatek/vdec/hal/vdec_hal_if_wmv.c b/drivers/misc/mediatek/vdec/hal/vdec_hal_if_wmv.c index d5a74c45a..646955b59 100644 --- a/drivers/misc/mediatek/vdec/hal/vdec_hal_if_wmv.c +++ b/drivers/misc/mediatek/vdec/hal/vdec_hal_if_wmv.c @@ -27,7 +27,7 @@ extern void vVDecOutputDebugString(const CHAR *format, ...); extern BOOL fgWrMsg2PCEx(void *pvAddr, UINT32 u4Size, UINT32 u4Mode, VDEC_INFO_VERIFY_FILE_INFO_T *pFILE_INFO, const char *szFunction, INT32 i4Line); -#define fgWrMsg2PC(pvAddr, u4Size, u4Mode, pFILE_INFO) fgWrMsg2PCEx(pvAddr, u4Size, u4Mode, pFILE_INFO, __FUNCTION__, __LINE__) +#define fgWrMsg2PC(pvAddr, u4Size, u4Mode, pFILE_INFO) fgWrMsg2PCEx(pvAddr, u4Size, u4Mode, pFILE_INFO, __func__, __LINE__) #endif #if (CONFIG_CHIP_VER_CURR >= CONFIG_CHIP_VER_MT8555) diff --git a/drivers/misc/mediatek/vdec/hal/vdec_hw_common.c b/drivers/misc/mediatek/vdec/hal/vdec_hw_common.c index 778423217..1be9d1548 100644 --- a/drivers/misc/mediatek/vdec/hal/vdec_hw_common.c +++ b/drivers/misc/mediatek/vdec/hal/vdec_hw_common.c @@ -52,7 +52,7 @@ int vdecwriteFile(int fp, char *buf, int writelen); extern int rand(void); extern BOOL fgWrMsg2PCEx(void *pvAddr, UINT32 u4Size, UINT32 u4Mode, VDEC_INFO_VERIFY_FILE_INFO_T *pFILE_INFO, const char *szFunction, INT32 i4Line); -#define fgWrMsg2PC(pvAddr, u4Size, u4Mode, pFILE_INFO) fgWrMsg2PCEx(pvAddr, u4Size, u4Mode, pFILE_INFO, __FUNCTION__, __LINE__) +#define fgWrMsg2PC(pvAddr, u4Size, u4Mode, pFILE_INFO) fgWrMsg2PCEx(pvAddr, u4Size, u4Mode, pFILE_INFO, __func__, __LINE__) extern void vVDecOutputDebugString(const CHAR *format, ...); #endif diff --git a/drivers/misc/mediatek/vdec/hal/vdec_hw_common.h b/drivers/misc/mediatek/vdec/hal/vdec_hw_common.h index a61aeb87d..de252ecc7 100644 --- a/drivers/misc/mediatek/vdec/hal/vdec_hw_common.h +++ b/drivers/misc/mediatek/vdec/hal/vdec_hw_common.h @@ -1925,7 +1925,7 @@ extern BOOL fgVDecIsVLDFetchOk(UINT32 u4BSID, UINT32 u4VDecID); extern BOOL fgVDecWaitVldFetchOk(UINT32 u4BSID, UINT32 u4VDecID); extern UINT32 u4VDecVLDGetBitS(UINT32 u4BSID, UINT32 u4VDecID, UINT32 dShiftBit); -#define u4VDecReadVldRPtr(u4BSID, u4VDecID, pu4Bits, u4VFIFOSa) u4VDecReadVldRPtrEx(u4BSID, u4VDecID, pu4Bits, u4VFIFOSa, __FUNCTION__, __LINE__) +#define u4VDecReadVldRPtr(u4BSID, u4VDecID, pu4Bits, u4VFIFOSa) u4VDecReadVldRPtrEx(u4BSID, u4VDecID, pu4Bits, u4VFIFOSa, __func__, __LINE__) #if (CONFIG_DRV_ONLY || CONFIG_DRV_VERIFY_SUPPORT) @@ -1940,8 +1940,8 @@ extern void vVDecSimDump(UINT32 u4VDecID, UINT32 u4OffsetAddr, UINT32 u4Addr, UI extern void vVDecSimWDump(const char *szFunction, UINT32 u4VDecID, const char *szOffset, UINT32 u4Addr, UINT32 u4Val, UINT32 u4BaseReg); extern void vVDecSimRDump(const char *szFunction, UINT32 u4VDecID, const char *szOffset, UINT32 u4Addr, UINT32 u4Val, UINT32 u4BaseReg); -#define vVDecSimDumpW(u4VDecID, szOffset, u4Addr, u4Val) vVDecSimWDump(__FUNCTION__, u4VDecID, #szOffset, u4Addr, u4Val, szOffset) -#define vVDecSimDumpR(u4VDecID, szOffset, u4Addr, u4Val) vVDecSimRDump(__FUNCTION__, u4VDecID, #szOffset, u4Addr, u4Val, szOffset) +#define vVDecSimDumpW(u4VDecID, szOffset, u4Addr, u4Val) vVDecSimWDump(__func__, u4VDecID, #szOffset, u4Addr, u4Val, szOffset) +#define vVDecSimDumpR(u4VDecID, szOffset, u4Addr, u4Val) vVDecSimRDump(__func__, u4VDecID, #szOffset, u4Addr, u4Val, szOffset) #else #define vVDecSimDumpW(u4VDecID, szOffset, u4Addr, u4Val) diff --git a/drivers/misc/mediatek/vdec/hal/vdec_hw_mpeg.c b/drivers/misc/mediatek/vdec/hal/vdec_hw_mpeg.c index fc023cde9..00cdcb3a4 100644 --- a/drivers/misc/mediatek/vdec/hal/vdec_hw_mpeg.c +++ b/drivers/misc/mediatek/vdec/hal/vdec_hw_mpeg.c @@ -374,7 +374,7 @@ void vVLDDoDec(UINT32 u4VDecID, VDEC_INFO_DEC_PRM_T *prDecPrm, BOOL fgBPic, BOOL } #endif - printk("<vdec> Input window is 0x%x (%s, %d)\n", u4VDecReadVLD(u4VDecID, 0x00), __FUNCTION__, __LINE__); + printk("<vdec> Input window is 0x%x (%s, %d)\n", u4VDecReadVLD(u4VDecID, 0x00), __func__, __LINE__); // Process Decode #if VDEC_UFO_ENABLE //here, bypass pp out(UFO need to turn on pp out but bypass it) UINT32 u4Reg; @@ -2002,7 +2002,7 @@ void vVDecMpegCommSetting(UINT32 u4VDecID, VDEC_INFO_DEC_PRM_T *prDecPrm) if ((prDecPrm->u4PicW > 16) && (prDecPrm->u4PicH > 16)) //when width or height is less than 16,should be set MC out @mtk40343 { - printk("<vdec> PP enable %s, %d!\n", __FUNCTION__, __LINE__); + printk("<vdec> PP enable %s, %d!\n", __func__, __LINE__); vVDecWriteMC(u4VDecID, RW_MC_PP_ENABLE, 1); vVDecWriteMC(u4VDecID, 0x834, u4VDecReadMC(u4VDecID, 0x834) & (~(0x1))); // pp out buffer enable vVDecWriteMC(u4VDecID, RW_MC_PP_DBLK_MODE, 0);//turn off de-blocking diff --git a/drivers/misc/mediatek/vdec/vdec.c b/drivers/misc/mediatek/vdec/vdec.c index 21b17fee7..ffd5070f6 100644 --- a/drivers/misc/mediatek/vdec/vdec.c +++ b/drivers/misc/mediatek/vdec/vdec.c @@ -1195,7 +1195,7 @@ static int uvvp_vdec_ioctl(struct file *file, vVDecVerifyThread(param); //MPV_thread = kthread_run(vVDecVerifyThread, param, "Vdec_thread"); if (IS_ERR(MPV_thread)) { - printk("[%s]: failed to create MPV thread\n", __FUNCTION__); + printk("[%s]: failed to create MPV thread\n", __func__); return 0; } else @@ -1212,7 +1212,7 @@ static int uvvp_vdec_ioctl(struct file *file, MPV_thread = kthread_run(vVDecVerifyThread, param1, "Vdec_thread"); if (IS_ERR(MPV_thread)) { - printk("[%s]: failed to create MPV thread\n", __FUNCTION__); + printk("[%s]: failed to create MPV thread\n", __func__); return 0; } else diff --git a/drivers/misc/mediatek/vdec/verify/vdec_verify_file_common.c b/drivers/misc/mediatek/vdec/verify/vdec_verify_file_common.c index 2dc18fc2d..5a39793dc 100644 --- a/drivers/misc/mediatek/vdec/verify/vdec_verify_file_common.c +++ b/drivers/misc/mediatek/vdec/verify/vdec_verify_file_common.c @@ -367,7 +367,7 @@ BOOL fgOpenHDDFileEx(UINT32 u4InstID, char *strFileName , char *strMode, VDEC_IN else { //vVDecOutputDebugString("\n NULL \n"); - printk("<vdec> %s(%s) return FALSE!!!!! @( %s, %d)\n", __FUNCTION__, strFileName, szFile, i4Line); + printk("<vdec> %s(%s) return FALSE!!!!! @( %s, %d)\n", __func__, strFileName, szFile, i4Line); return FALSE; } } diff --git a/drivers/misc/mediatek/vdec/verify/vdec_verify_file_common.h b/drivers/misc/mediatek/vdec/verify/vdec_verify_file_common.h index 0c4d97904..8f1950b88 100644 --- a/drivers/misc/mediatek/vdec/verify/vdec_verify_file_common.h +++ b/drivers/misc/mediatek/vdec/verify/vdec_verify_file_common.h @@ -28,7 +28,7 @@ BOOL fgOverWrData2PC(void *pvAddr, UINT32 u4Size, UINT32 u4Mode, char *strFileNa /// IDE HDD BOOL fgOpenHDDFileEx(UINT32 u4InstID, char *strFileName , char *strMode, VDEC_INFO_VERIFY_FILE_INFO_T *ptFileInfo, const char *szFile, INT32 i4Line); -#define fgOpenHDDFile(u4InstID, strFileName, strMode, ptFileInfo) fgOpenHDDFileEx(u4InstID, strFileName, strMode, ptFileInfo, __FUNCTION__, __LINE__) +#define fgOpenHDDFile(u4InstID, strFileName, strMode, ptFileInfo) fgOpenHDDFileEx(u4InstID, strFileName, strMode, ptFileInfo, __func__, __LINE__) BOOL fgReadHDDFile(UINT32 u4InstID, BOOL fgReadInfo, void *pvAddr, UINT32 u4Size, char *strFileName, UINT32 u4OffSet, UINT32 *pu4RealReadSize, UINT32 *pu4FileLength, ULONG *pi4FileId); @@ -40,7 +40,7 @@ BOOL fgWrData2PC(void *pvAddr, UINT32 u4Size, UINT32 u4Mode, char *strFileName); BOOL fgOpenFileEx(UINT32 u4InstID, char *strFileName , char *strMode, VDEC_INFO_VERIFY_FILE_INFO_T *ptFileInfo, const char *szFunction, INT32 i4Line); -#define fgOpenFile(u4InstID, strFileName, strMode, ptFileInfo) fgOpenFileEx(u4InstID, strFileName, strMode, ptFileInfo, __FUNCTION__, __LINE__) +#define fgOpenFile(u4InstID, strFileName, strMode, ptFileInfo) fgOpenFileEx(u4InstID, strFileName, strMode, ptFileInfo, __func__, __LINE__) /// #ifdef IDE_WRITE_SUPPORT diff --git a/drivers/misc/mediatek/vdec/verify/vdec_verify_filesetting.c b/drivers/misc/mediatek/vdec/verify/vdec_verify_filesetting.c index 7f97fb473..b048e2dd9 100644 --- a/drivers/misc/mediatek/vdec/verify/vdec_verify_filesetting.c +++ b/drivers/misc/mediatek/vdec/verify/vdec_verify_filesetting.c @@ -576,7 +576,7 @@ void vMPEGWrData2PC(UINT32 u4InstID, UCHAR *ptAddr, UINT32 u4Size) BOOL fgDecCheckCRCErr = FALSE; - printk("<vdec> %s, %d\n", __FUNCTION__, __LINE__); + printk("<vdec> %s, %d\n", __func__, __LINE__); strncpy(_tFileListRecInfo[u4InstID].bFileName, _FileList_Rec[u4InstID], sizeof(_FileList_Rec[u4InstID])); #ifdef REDEC @@ -6339,9 +6339,9 @@ BOOL fgVdecReadFileName(UINT32 u4InstID, VDEC_INFO_VERIFY_FILE_INFO_T *ptFileLis const char *p = _bFileStr1[u4InstID][8]; #if 1 // for MT8320 _bFileStr1[u4InstID][0][u4FileNameCnt1 - (u4SubNameCnt)] = '/'; - //printk("<vdec> _bFileStr1[%d][%d] = (%s), (%s, %d)\n", u4InstID, 0, _bFileStr1[u4InstID][0], __FUNCTION__, __LINE__); + //printk("<vdec> _bFileStr1[%d][%d] = (%s), (%s, %d)\n", u4InstID, 0, _bFileStr1[u4InstID][0], __func__, __LINE__); sprintf(_bFileStr1[u4InstID][0] + u4FileNameCnt1 - (u4SubNameCnt - 1), "%s_", p + 1); - //printk("<vdec> _bFileStr1[%d][%d] = (%s), (%s, %d)\n", u4InstID, 0, _bFileStr1[u4InstID][0], __FUNCTION__, __LINE__); + //printk("<vdec> _bFileStr1[%d][%d] = (%s), (%s, %d)\n", u4InstID, 0, _bFileStr1[u4InstID][0], __func__, __LINE__); #else _bFileStr1[u4InstID][0][u4FileNameCnt1 - (u4SubNameCnt)] = '\\'; _bFileStr1[u4InstID][0][u4FileNameCnt1 - (u4SubNameCnt - 1)] = 'P'; diff --git a/drivers/misc/mediatek/vdec/verify/vdec_verify_mm_map.c b/drivers/misc/mediatek/vdec/verify/vdec_verify_mm_map.c index b0d9a124b..b02a36bc1 100644 --- a/drivers/misc/mediatek/vdec/verify/vdec_verify_mm_map.c +++ b/drivers/misc/mediatek/vdec/verify/vdec_verify_mm_map.c @@ -37,7 +37,7 @@ int vdecwriteFile(int fp, char *buf, int writelen); extern void vHEVCInitROM(UINT32 u4InstID); -#define x_alloc_aligned_verify_mem(u4Size, u4Align, fgChannelA) x_alloc_aligned_verify_mem_ex(u4Size, u4Align, fgChannelA, __FUNCTION__, __LINE__) +#define x_alloc_aligned_verify_mem(u4Size, u4Align, fgChannelA) x_alloc_aligned_verify_mem_ex(u4Size, u4Align, fgChannelA, __func__, __LINE__) #if VMMU_SUPPORT static const UCHAR *g_pu1AllocSA = VMMU_SA; // need 64k align diff --git a/drivers/misc/mediatek/vdec/verify/vdec_verify_vparser_h265.c b/drivers/misc/mediatek/vdec/verify/vdec_verify_vparser_h265.c index bd7a0bc58..edb9d8788 100644 --- a/drivers/misc/mediatek/vdec/verify/vdec_verify_vparser_h265.c +++ b/drivers/misc/mediatek/vdec/verify/vdec_verify_vparser_h265.c @@ -1151,7 +1151,7 @@ void vHEVCResetFBAddr(UINT32 u4InstID, UINT32 u4FBindex) _tVerMpvDecPrm[u4InstID].SpecDecPrm.rVDecH265DecPrm.prSPS->u4BitDepthChromaMinus8 > 0) { // Main10 profile, 10 bits mode - printk("[INFO][%s] Main10 prfile!!; LCU size: %d; Tile: %d; UFO: %d \n", __FUNCTION__, max_cu_size, prPPS->bTilesEnabledFlag, bIsUFO); + printk("[INFO][%s] Main10 prfile!!; LCU size: %d; Tile: %d; UFO: %d \n", __func__, max_cu_size, prPPS->bTilesEnabledFlag, bIsUFO); u4DramPicSize = u4DramPicSize * 5 / 4; if (bIsUFO) { @@ -1172,7 +1172,7 @@ void vHEVCResetFBAddr(UINT32 u4InstID, UINT32 u4FBindex) else { // Main profile, 8 bits mode - printk("[INFO][%s] Main prfile!!; LCU size: %d; Tile: %d; UFO: %d \n", __FUNCTION__, max_cu_size, prPPS->bTilesEnabledFlag, bIsUFO); + printk("[INFO][%s] Main prfile!!; LCU size: %d; Tile: %d; UFO: %d \n", __func__, max_cu_size, prPPS->bTilesEnabledFlag, bIsUFO); if (bIsUFO) { u4UFOLenYsize = ((((u4DramPicSize + 255) >> 8) + 63) >> 6) << 6; @@ -1259,7 +1259,7 @@ void vHEVCPartitionDPB(UINT32 u4InstID) _tVerMpvDecPrm[u4InstID].SpecDecPrm.rVDecH265DecPrm.prSPS->u4BitDepthChromaMinus8 > 0) { // Main10 profile, 10 bits mode - printk("[INFO][%s] Main10 prfile!!; LCU size: %d; Tile: %d; UFO: %d \n", __FUNCTION__, max_cu_size, prPPS->bTilesEnabledFlag, bIsUFO); + printk("[INFO][%s] Main10 prfile!!; LCU size: %d; Tile: %d; UFO: %d \n", __func__, max_cu_size, prPPS->bTilesEnabledFlag, bIsUFO); u4DramPicSize = u4DramPicSize * 5 / 4; if (bIsUFO) { @@ -1280,7 +1280,7 @@ void vHEVCPartitionDPB(UINT32 u4InstID) else { // Main profile, 8 bits mode - printk("[INFO][%s] Main prfile!!; LCU size: %d; Tile: %d; UFO: %d \n", __FUNCTION__, max_cu_size, prPPS->bTilesEnabledFlag, bIsUFO); + printk("[INFO][%s] Main prfile!!; LCU size: %d; Tile: %d; UFO: %d \n", __func__, max_cu_size, prPPS->bTilesEnabledFlag, bIsUFO); if (bIsUFO) { u4UFOLenYsize = ((((u4DramPicSize + 255) >> 8) + 63) >> 6) << 6; diff --git a/drivers/misc/mediatek/vdec/verify/vdec_verify_vparser_mpeg.c b/drivers/misc/mediatek/vdec/verify/vdec_verify_vparser_mpeg.c index 609f937d7..449a2f95a 100644 --- a/drivers/misc/mediatek/vdec/verify/vdec_verify_vparser_mpeg.c +++ b/drivers/misc/mediatek/vdec/verify/vdec_verify_vparser_mpeg.c @@ -51,7 +51,7 @@ UINT32 u4VParserMPEG12(UINT32 u4InstID, BOOL fgInquiry) vVDEC_HAL_MPEG_SetMPEG4Flag(u4InstID, FALSE); // finding the first start code will be used - printk("<vdec> Input window is 0x%x (%s, %d)\n", u4VDecReadVLD(u4InstID, 0x00), __FUNCTION__, __LINE__); + printk("<vdec> Input window is 0x%x (%s, %d)\n", u4VDecReadVLD(u4InstID, 0x00), __func__, __LINE__); do { @@ -76,7 +76,7 @@ UINT32 u4VParserMPEG12(UINT32 u4InstID, BOOL fgInquiry) if (_u4Datain[u4InstID] == SEQUENCE_HEADER_CODE) { u4Retry = 0; - printk("<vdec> SEQUENCE_HEADER_CODE\n" /*, __FUNCTION__, __LINE__*/); + printk("<vdec> SEQUENCE_HEADER_CODE\n" /*, __func__, __LINE__*/); do { @@ -205,7 +205,7 @@ UINT32 u4VParserMPEG12(UINT32 u4InstID, BOOL fgInquiry) _u4Datain[u4InstID] = u4VDEC_HAL_MPEG_ShiftGetBitStream(_u4BSID[u4InstID], u4InstID, 0); if (_u4Datain[u4InstID] == GROUP_START_CODE) { - printk("<vdec> GROUP_START_CODE\n"/*, __FUNCTION__, __LINE__*/); + printk("<vdec> GROUP_START_CODE\n"/*, __func__, __LINE__*/); u4Retry = 0; do diff --git a/drivers/misc/mediatek/vdec/verify/vdec_verify_vparser_rm.c b/drivers/misc/mediatek/vdec/verify/vdec_verify_vparser_rm.c index bc99b8280..1af910054 100644 --- a/drivers/misc/mediatek/vdec/verify/vdec_verify_vparser_rm.c +++ b/drivers/misc/mediatek/vdec/verify/vdec_verify_vparser_rm.c @@ -950,7 +950,7 @@ UINT32 u4RM_FindIPic(UINT32 u4InstID, UINT32 u4EndFrm) for (i = 0; i < u4EndFrm; i++) { - fgGetRvPic(u4InstID, __FUNCTION__, __LINE__); + fgGetRvPic(u4InstID, __func__, __LINE__); if (prPic->ePtype == RM_INTRAPIC) { u4IFrmIdx = i; @@ -958,7 +958,7 @@ UINT32 u4RM_FindIPic(UINT32 u4InstID, UINT32 u4EndFrm) _tVerMpvDecPrm[u4InstID].SpecDecPrm.rVDecRMDecPrm.rRMParsPicInfo.u4DecodedPicCnt++; } - printk("<vdec> %s(%u, %u) return %u.\n", __FUNCTION__, u4InstID, u4EndFrm, u4IFrmIdx); + printk("<vdec> %s(%u, %u) return %u.\n", __func__, u4InstID, u4EndFrm, u4IFrmIdx); _tVerMpvDecPrm[u4InstID].SpecDecPrm.rVDecRMDecPrm.rRMParsPicInfo.u4DecodedPicCnt = u4IFrmIdx; @@ -971,7 +971,7 @@ UINT32 u4RM_PreParseIPic(UINT32 u4InstID, UINT32 u4EndFrm) for (i = 0; i < u4EndFrm; i++) { - fgGetRvPic(u4InstID, __FUNCTION__, __LINE__); + fgGetRvPic(u4InstID, __func__, __LINE__); _tVerMpvDecPrm[u4InstID].SpecDecPrm.rVDecRMDecPrm.rRMParsPicInfo.u4DecodedPicCnt++; } @@ -1135,7 +1135,7 @@ void vRM_VParser(UINT32 u4InstID) _tVerMpvDecPrm[u4InstID].SpecDecPrm.rVDecRMDecPrm.fgRPRRacingModeEnable = FALSE; //Parsing First Pic Info - fgGetRvPic(u4InstID, __FUNCTION__, __LINE__); + fgGetRvPic(u4InstID, __func__, __LINE__); memcpy((void *)(&_tVerMpvDecPrm[u4InstID].SpecDecPrm.rVDecRMDecPrm.rRMPicInfo_Preparsing), (void *)(&_tVerMpvDecPrm[u4InstID].SpecDecPrm.rVDecRMDecPrm.rRMPicInfo), @@ -1147,7 +1147,7 @@ void vRM_VParser(UINT32 u4InstID) //Search Next I or P for (u4SearchLoop = 0; u4SearchLoop < RPR_RAC_PREPARSING_CNT; u4SearchLoop++) { - if (fgGetRvPic(u4InstID, __FUNCTION__, __LINE__) == FALSE) + if (fgGetRvPic(u4InstID, __func__, __LINE__) == FALSE) { break; } @@ -1245,7 +1245,7 @@ void vRM_VParser(UINT32 u4InstID) } } #else //RM_SKIPFRAME_Test - fgGetRvPic(u4InstID, __FUNCTION__, __LINE__); + fgGetRvPic(u4InstID, __func__, __LINE__); #endif //RM_SKIPFRAME_Test #endif //RM_LOOPDECODE_FLOW @@ -1694,7 +1694,7 @@ void vRM_VParserEx(UINT32 u4InstID) _tVerMpvDecPrm[u4InstID].SpecDecPrm.rVDecRMDecPrm.fgRPRRacingModeEnable = FALSE; //Parsing First Pic Info - fgGetRvPic(u4InstID, __FUNCTION__, __LINE__); + fgGetRvPic(u4InstID, __func__, __LINE__); memcpy((void *)(&_tVerMpvDecPrm[u4InstID].SpecDecPrm.rVDecRMDecPrm.rRMPicInfo_Preparsing), (void *)(&_tVerMpvDecPrm[u4InstID].SpecDecPrm.rVDecRMDecPrm.rRMPicInfo), @@ -1707,7 +1707,7 @@ void vRM_VParserEx(UINT32 u4InstID) //Search Next I or P for (u4SearchLoop = 0; u4SearchLoop < RPR_RAC_PREPARSING_CNT; u4SearchLoop++) { - if (fgGetRvPic(u4InstID, __FUNCTION__, __LINE__) == FALSE) + if (fgGetRvPic(u4InstID, __func__, __LINE__) == FALSE) { break; } @@ -1756,13 +1756,13 @@ void vRM_VParserEx(UINT32 u4InstID) _tVerMpvDecPrm[u4InstID].SpecDecPrm.rVDecRMDecPrm.rRMParsPicInfo.u4DecodedPicCnt = u4LoopDecodeFrmCnt - 1; for (u4Loop = 0; u4Loop < u4LoopDecodeFrmCnt; u4Loop++) { - fgGetRvPic(u4InstID, __FUNCTION__, __LINE__); + fgGetRvPic(u4InstID, __func__, __LINE__); } } else { _tVerMpvDecPrm[u4InstID].SpecDecPrm.rVDecRMDecPrm.rRMParsPicInfo.u4DecodedPicCnt = 0; - fgGetRvPic(u4InstID, __FUNCTION__, __LINE__); + fgGetRvPic(u4InstID, __func__, __LINE__); } u4LoopDecodeFirstFlag = 0; } @@ -1770,7 +1770,7 @@ void vRM_VParserEx(UINT32 u4InstID) { if (u4LoopDecodeTargetCnt >= u4LoopDecodeFrmCnt) { - fgGetRvPic(u4InstID, __FUNCTION__, __LINE__); + fgGetRvPic(u4InstID, __func__, __LINE__); //u4LoopDecodeFrmCnt++; } else @@ -1790,7 +1790,7 @@ void vRM_VParserEx(UINT32 u4InstID) { for (u4SkipIdx = 0; u4SkipIdx < u4SkipFrameNum; u4SkipIdx++) { - fgGetRvPic(u4InstID, __FUNCTION__, __LINE__); + fgGetRvPic(u4InstID, __func__, __LINE__); } _tVerMpvDecPrm[u4InstID].SpecDecPrm.rVDecRMDecPrm.rRMParsPicInfo.u4DecodedPicCnt = u4SkipFrameNum - 1; @@ -1800,11 +1800,11 @@ void vRM_VParserEx(UINT32 u4InstID) } else { - fgGetRvPic(u4InstID, __FUNCTION__, __LINE__); + fgGetRvPic(u4InstID, __func__, __LINE__); } } #else //RM_SKIPFRAME_Test - fgGetRvPic(u4InstID, __FUNCTION__, __LINE__); + fgGetRvPic(u4InstID, __func__, __LINE__); #endif //RM_SKIPFRAME_Test #endif //RM_LOOPDECODE_FLOW @@ -4314,7 +4314,7 @@ void vRM_GenerateDownScalerGolden(UINT32 u4InstID, UINT32 DecYAddr, UINT32 DecCA static void vDumpVldCkSum(void) { - printk("\n<vdec> %s\n", __FUNCTION__); + printk("\n<vdec> %s\n", __func__); u4VDecReadRMVLD(0, 33 * 4); u4VDecReadRMVLD(0, 34 * 4); u4VDecReadRMVLD(0, 35 * 4); @@ -4357,7 +4357,7 @@ static void vDumpVldCkSum(void) static void vDumpAvcMvCkSum(void) { - printk("\n<vdec> %s\n", __FUNCTION__); + printk("\n<vdec> %s\n", __func__); u4VDecReadRMMV(0, 148 * 4); u4VDecReadRMMV(0, 149 * 4); u4VDecReadRMMV(0, 150 * 4); @@ -4373,7 +4373,7 @@ static void vDumpAvcMvCkSum(void) void vDumpMCPerformance(void) { - printk("\n<vdec> %s\n", __FUNCTION__); + printk("\n<vdec> %s\n", __func__); u4VDecReadMC(0, 474 * 4); u4VDecReadMC(0, 476 * 4); u4VDecReadMC(0, 477 * 4); @@ -4391,7 +4391,7 @@ void vDumpMCPerformance(void) static void vDumpMcCkSum(void) { - printk("\n<vdec> %s\n", __FUNCTION__); + printk("\n<vdec> %s\n", __func__); u4VDecReadMC(0, 378 * 4); u4VDecReadMC(0, 379 * 4); u4VDecReadMC(0, 380 * 4); @@ -4426,7 +4426,7 @@ static void vDumpPpCkSum(void) { int i; - printk("\n<vdec> %s\n", __FUNCTION__); + printk("\n<vdec> %s\n", __func__); u4VDecReadRMPP(0, 5 * 4); u4VDecReadRMPP(0, 6 * 4); u4VDecReadRMPP(0, 67 * 4); @@ -4470,7 +4470,7 @@ static void vDumpReg(void) { INT32 i; - printk("\n<vdec> %s\n", __FUNCTION__); + printk("\n<vdec> %s\n", __func__); u4VDecReadRMMV(0, 131 * 4); u4VDecReadRMMV(0, 134 * 4); u4VDecReadRMMV(0, 135 * 4); diff --git a/drivers/misc/mediatek/vdec/verify/vdec_verify_vparser_vp6.c b/drivers/misc/mediatek/vdec/verify/vdec_verify_vparser_vp6.c index a3fee0a03..7d77143b5 100644 --- a/drivers/misc/mediatek/vdec/verify/vdec_verify_vparser_vp6.c +++ b/drivers/misc/mediatek/vdec/verify/vdec_verify_vparser_vp6.c @@ -282,7 +282,7 @@ INT32 i4VP6_Parse_Frame_Header(UINT32 u4BsId, UINT32 u4InstID, VDEC_INFO_VP6_FRM UINT32 u4Datain;//, u4VldBit; UINT32 u4FrameHeader; - printk("<vdec> Input window is 0x%x (%s, %d)\n", u4VDecReadVP6VLD(u4InstID, 0xF0), __FUNCTION__, __LINE__); + printk("<vdec> Input window is 0x%x (%s, %d)\n", u4VDecReadVP6VLD(u4InstID, 0xF0), __func__, __LINE__); //u4VDecReadVldRPtr(u4BsId, u4InstID, &u4VldBit, PHYSICAL((UINT32)_pucVFifo[u4InstID])); prVDecVp6FrmHdr->u2Buff2Offset = 0; @@ -394,7 +394,7 @@ INT32 i4VP6_Parse_Frame_Header(UINT32 u4BsId, UINT32 u4InstID, VDEC_INFO_VP6_FRM i4VDEC_HAL_VP6_InitBarrelShifter2(1, u4InstID, &rVp6BSInitPrm, prVDecVp6FrmHdr); u4VDEC_HAL_VP6_InitBoolCoder(1, u4InstID, 0); //vp56_init_range_decoder(&s->cc, buf+coeff_offset, buf_size-coeff_offset); u4VDEC_HAL_VP6_VDec_SetByteCount(1, u4InstID, prVDecVp6FrmHdr->u4FrameSize - prVDecVp6FrmHdr->u2Buff2Offset); - printk("<vdec> u4VDEC_HAL_VP6_VDec_SetByteCount @(%s, %d)\n", __FUNCTION__, __LINE__); + printk("<vdec> u4VDEC_HAL_VP6_VDec_SetByteCount @(%s, %d)\n", __func__, __LINE__); //u4VDEC_HAL_VP6_InitBoolCoder(u4BsId, u4InstID, 0); //vp56_init_range_decoder(&s->cc, buf+coeff_offset, buf_size-coeff_offset); //s->ccp = &s->cc; } @@ -460,12 +460,12 @@ INT32 i4VP6_Parse_Intra_Header(UINT32 u4BsId, UINT32 u4InstID, VDEC_INFO_VP6_FRM if (prVDecVp6FrmHdr->u2Buff2Offset) { u4VDEC_HAL_VP6_VDec_SetByteCount(u4BsId, u4InstID, prVDecVp6FrmHdr->u2Buff2Offset - 6); - printk("<vdec> u4VDEC_HAL_VP6_VDec_SetByteCount @(%s, %d)\n", __FUNCTION__, __LINE__); + printk("<vdec> u4VDEC_HAL_VP6_VDec_SetByteCount @(%s, %d)\n", __func__, __LINE__); } else { u4VDEC_HAL_VP6_VDec_SetByteCount(u4BsId, u4InstID, prVDecVp6FrmHdr->u4FrameSize - 6); - printk("<vdec> u4VDEC_HAL_VP6_VDec_SetByteCount @(%s, %d)\n", __FUNCTION__, __LINE__); + printk("<vdec> u4VDEC_HAL_VP6_VDec_SetByteCount @(%s, %d)\n", __func__, __LINE__); } #endif @@ -513,12 +513,12 @@ INT32 i4VP6_Parse_Inter_Header(UINT32 u4BsId, UINT32 u4InstID, VDEC_INFO_VP6_FRM if (prVDecVp6FrmHdr->u2Buff2Offset) { u4VDEC_HAL_VP6_VDec_SetByteCount(u4BsId, u4InstID, prVDecVp6FrmHdr->u2Buff2Offset - 1); - printk("<vdec> u4VDEC_HAL_VP6_VDec_SetByteCount @(%s, %d)\n", __FUNCTION__, __LINE__); + printk("<vdec> u4VDEC_HAL_VP6_VDec_SetByteCount @(%s, %d)\n", __func__, __LINE__); } else { u4VDEC_HAL_VP6_VDec_SetByteCount(u4BsId, u4InstID, prVDecVp6FrmHdr->u4FrameSize - 1); - printk("<vdec> u4VDEC_HAL_VP6_VDec_SetByteCount @(%s, %d)\n", __FUNCTION__, __LINE__); + printk("<vdec> u4VDEC_HAL_VP6_VDec_SetByteCount @(%s, %d)\n", __func__, __LINE__); } #endif @@ -1514,7 +1514,7 @@ void vVP6WrData2PC(UINT32 u4InstID, UCHAR *ptAddr, UINT32 u4Size, BOOL *fgNextFr { //UINT8 *p = (UINT8 *)u4NonSwapYBase; - //printk("<vdec> data test addr=0x%08x, @(%s, %d)===============\n", p, __FUNCTION__, __LINE__); + //printk("<vdec> data test addr=0x%08x, @(%s, %d)===============\n", p, __func__, __LINE__); //printk("<vdec> %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x\n", // p[0], p[1], p[2], p[3], p[4], p[5], p[6], p[7], p[8], p[9], p[10], p[11], p[12], p[13], p[14], p[15]); } @@ -1578,7 +1578,7 @@ void vVP6WrData2PC(UINT32 u4InstID, UCHAR *ptAddr, UINT32 u4Size, BOOL *fgNextFr { //UINT8 *p = (UINT8 *)u4NonSwapYBase; - //printk("<vdec> data test addr=0x%08x, @(%s, %d)===============\n", p, __FUNCTION__, __LINE__); + //printk("<vdec> data test addr=0x%08x, @(%s, %d)===============\n", p, __func__, __LINE__); //printk("%02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x\n", // p[0], p[1], p[2], p[3], p[4], p[5], p[6], p[7], p[8], p[9], p[10], p[11], p[12], p[13], p[14], p[15]); } diff --git a/drivers/misc/mediatek/vibrator/thunderquake_engine.c b/drivers/misc/mediatek/vibrator/thunderquake_engine.c index 3e6b4cc01..7d5c09e3c 100644 --- a/drivers/misc/mediatek/vibrator/thunderquake_engine.c +++ b/drivers/misc/mediatek/vibrator/thunderquake_engine.c @@ -94,7 +94,7 @@ static int vibr_level_control_init(void) if (!vibr_level_control_kobj) { pr_err("%s Interface create failed!\n", - __FUNCTION__); + __func__); return -ENOMEM; } @@ -102,7 +102,7 @@ static int vibr_level_control_init(void) &vibr_level_control_attr_group); if (sysfs_result) { - pr_info("%s sysfs create failed!\n", __FUNCTION__); + pr_info("%s sysfs create failed!\n", __func__); kobject_put(vibr_level_control_kobj); } return sysfs_result; diff --git a/drivers/misc/mediatek/videox/mt6735/debug.h b/drivers/misc/mediatek/videox/mt6735/debug.h index bd2deb8f2..50249cc80 100644 --- a/drivers/misc/mediatek/videox/mt6735/debug.h +++ b/drivers/misc/mediatek/videox/mt6735/debug.h @@ -143,13 +143,13 @@ static inline void dbg_print(int level, const char *fmt, ...) #define DBGPRINT dbg_print #define DBGENTER(level) do { \ - dbg_print(level, "%s: Enter\n", __FUNCTION__); \ + dbg_print(level, "%s: Enter\n", __func__); \ dbg_indent++; \ } while (0) #define DBGLEAVE(level) do { \ dbg_indent--; \ - dbg_print(level, "%s: Leave\n", __FUNCTION__); \ + dbg_print(level, "%s: Leave\n", __func__); \ } while (0) // Debug Macros @@ -168,8 +168,8 @@ static inline void dbg_print(int level, const char *fmt, ...) } \ } while (0) -#define MSG_FUNC_ENTER(f) MSG(FUNC, "<FB_ENTER>: %s\n", __FUNCTION__) -#define MSG_FUNC_LEAVE(f) MSG(FUNC, "<FB_LEAVE>: %s\n", __FUNCTION__) +#define MSG_FUNC_ENTER(f) MSG(FUNC, "<FB_ENTER>: %s\n", __func__) +#define MSG_FUNC_LEAVE(f) MSG(FUNC, "<FB_LEAVE>: %s\n", __func__) #else /* MTKFB_DBG */ diff --git a/drivers/misc/mediatek/videox/mt6735/disp_assert_layer.c b/drivers/misc/mediatek/videox/mt6735/disp_assert_layer.c index e1c81459a..6af302298 100644 --- a/drivers/misc/mediatek/videox/mt6735/disp_assert_layer.c +++ b/drivers/misc/mediatek/videox/mt6735/disp_assert_layer.c @@ -38,7 +38,7 @@ do { \ if (down_interruptible(&dal_sem)) { \ pr_warn("DISP/DAL " "Can't get semaphore in %s()\n", \ - __FUNCTION__); \ + __func__); \ return DAL_STATUS_LOCK_FAIL; \ } \ } while (0) @@ -55,7 +55,7 @@ if (MFC_STATUS_OK != ret) { \ pr_warn("DISP/DAL " "Warning: call MFC_XXX function failed " \ "in %s(), line: %d, ret: %x\n", \ - __FUNCTION__, __LINE__, ret); \ + __func__, __LINE__, ret); \ return ret; \ } \ } while (0) @@ -67,7 +67,7 @@ if (DISP_STATUS_OK != ret) { \ pr_warn("DISP/DAL " "Warning: call DISP_XXX function failed " \ "in %s(), line: %d, ret: %x\n", \ - __FUNCTION__, __LINE__, ret); \ + __func__, __LINE__, ret); \ return ret; \ } \ } while (0) diff --git a/drivers/misc/mediatek/videox/mt6735/mtkfb_console.c b/drivers/misc/mediatek/videox/mt6735/mtkfb_console.c index 6d7332524..469a5a629 100644 --- a/drivers/misc/mediatek/videox/mt6735/mtkfb_console.c +++ b/drivers/misc/mediatek/videox/mt6735/mtkfb_console.c @@ -35,7 +35,7 @@ do { \ if (down_interruptible(&ctxt->sem)) { \ printk("[MFC] ERROR: Can't get semaphore in %s()\n", \ - __FUNCTION__); \ + __func__); \ ASSERT(0); \ return MFC_STATUS_LOCK_FAIL; \ } \ diff --git a/drivers/misc/mediatek/videox/mt6735/primary_display.c b/drivers/misc/mediatek/videox/mt6735/primary_display.c index 37423cdf7..6111f0176 100755 --- a/drivers/misc/mediatek/videox/mt6735/primary_display.c +++ b/drivers/misc/mediatek/videox/mt6735/primary_display.c @@ -3005,7 +3005,7 @@ static int _convert_disp_input_to_ovl(OVL_CONFIG_STRUCT *dst, disp_input_config if(!src || !dst) { DISP_FATAL_ERR("display", "%s src(0x%p) or dst(0x%p) is null\n", - __FUNCTION__, src, dst); + __func__, src, dst); return -1; } @@ -3097,7 +3097,7 @@ static int _convert_disp_input_to_rdma(RDMA_CONFIG_STRUCT *dst, disp_input_confi if(!src || !dst) { DISP_FATAL_ERR("display", "%s src(0x%p) or dst(0x%p) is null\n", - __FUNCTION__, src, dst); + __func__, src, dst); return -1; } diff --git a/drivers/misc/mediatek/wdk/timer_test.c b/drivers/misc/mediatek/wdk/timer_test.c index 9fed2743a..eaa39e028 100644 --- a/drivers/misc/mediatek/wdk/timer_test.c +++ b/drivers/misc/mediatek/wdk/timer_test.c @@ -468,7 +468,7 @@ void cpuxgpt_run_case(int testcase) generic_timer_ppi_check(); break; default: - printk("[%s] invalid testcase\n", __FUNCTION__); + printk("[%s] invalid testcase\n", __func__); } test_case = 0; } diff --git a/drivers/misc/mediatek/wdt/mt6735/mpcore_wdt.c b/drivers/misc/mediatek/wdt/mt6735/mpcore_wdt.c index 351b05631..fa362a0df 100644 --- a/drivers/misc/mediatek/wdt/mt6735/mpcore_wdt.c +++ b/drivers/misc/mediatek/wdt/mt6735/mpcore_wdt.c @@ -70,7 +70,7 @@ static DEFINE_SPINLOCK(wdt_lock); #define mpcore_wdt_print(fmt, arg...) \ do {\ printk(DEBUG_INFO fmt, ##arg);\ - printk(DEBUG_INFO"%s, %d\n", __FUNCTION__, __LINE__);\ + printk(DEBUG_INFO"%s, %d\n", __func__, __LINE__);\ } while(0) #else #define mpcore_wdt_print(fmt, arg...) do{} while(0) @@ -323,7 +323,7 @@ static int mpcore_wdt_open(struct inode *inode, struct file *file) { struct mpcore_wdt *wdt = platform_get_drvdata(mpcore_wdt_dev); - mpcore_wdt_print("enter %s\n", __FUNCTION__); + mpcore_wdt_print("enter %s\n", __func__); if (test_and_set_bit(0, &wdt->timer_alive)) return -EBUSY; @@ -357,7 +357,7 @@ static int mpcore_wdt_release(struct inode *inode, struct file *file) } clear_bit(0, &wdt->timer_alive); wdt->expect_close = 0; - mpcore_wdt_print("enter %s\n", __FUNCTION__); + mpcore_wdt_print("enter %s\n", __func__); return 0; } @@ -387,7 +387,7 @@ static ssize_t mpcore_wdt_write(struct file *file, const char *data, } mpcore_wdt_keepalive(wdt); } - mpcore_wdt_print("enter %s\n", __FUNCTION__); + mpcore_wdt_print("enter %s\n", __func__); return len; } diff --git a/drivers/staging/android/ion/ion.c b/drivers/staging/android/ion/ion.c index d6fa9f639..d30408651 100644 --- a/drivers/staging/android/ion/ion.c +++ b/drivers/staging/android/ion/ion.c @@ -628,7 +628,7 @@ struct ion_handle *__ion_alloc(struct ion_client *client, size_t len, //add by k.zhang for sgtable_init KE bug if ((len > 1024*1024*1024)) { - IONMSG("%s error: size (%zu) is more than 1G !!\n", __FUNCTION__,len); + IONMSG("%s error: size (%zu) is more than 1G !!\n", __func__,len); return ERR_PTR(-EINVAL); } MMProfileLogEx(ION_MMP_Events[PROFILE_ALLOC], MMProfileFlagStart, len, 0); @@ -2102,13 +2102,13 @@ struct ion_handle* ion_drv_get_handle(struct ion_client* client, int user_handle handle = kernel_handle; if (IS_ERR_OR_NULL(handle)) { - IONMSG("%s handle invalid, handle = 0x%pK.\n", __FUNCTION__, handle); + IONMSG("%s handle invalid, handle = 0x%pK.\n", __func__, handle); return ERR_PTR(-EINVAL); } mutex_lock(&client->lock); if (!ion_handle_validate(client, handle)) { - IONMSG("%s handle invalid, handle=0x%pK\n", __FUNCTION__, handle); + IONMSG("%s handle invalid, handle=0x%pK\n", __func__, handle); mutex_unlock(&client->lock); return ERR_PTR(-EINVAL); } @@ -2117,7 +2117,7 @@ struct ion_handle* ion_drv_get_handle(struct ion_client* client, int user_handle } else { handle = ion_handle_get_by_id(client, user_handle); if (!handle) { - IONMSG("%s handle invalid, handle_id=%d\n", __FUNCTION__, user_handle); + IONMSG("%s handle invalid, handle_id=%d\n", __func__, user_handle); return ERR_PTR(-EINVAL); } } @@ -2331,7 +2331,7 @@ static int ion_debugdb_show_backtrace(struct seq_file *s, struct ion_record_basi backtrace_count = tmp->numEntries; } - //printk("%s [%d] backtrace_count = (%d)\n",__FUNCTION__,__LINE__,backtrace_count); + //printk("%s [%d] backtrace_count = (%d)\n",__func__,__LINE__,backtrace_count); if (backtrace_count != 0) { seq_printf(s, "%19s\n", "[BACKTRACE]"); } diff --git a/drivers/staging/android/ion/mtk/ion_history.c b/drivers/staging/android/ion/mtk/ion_history.c index ef801d7bc..1817824b3 100644 --- a/drivers/staging/android/ion/mtk/ion_history.c +++ b/drivers/staging/android/ion/mtk/ion_history.c @@ -98,7 +98,7 @@ void* history_record_get_record(struct history_record *history_record) } if(history_record_test_busy(history_record, index)) { - IONMSG("%s: error to get record %d, bitmap is:\n", __FUNCTION__, index); + IONMSG("%s: error to get record %d, bitmap is:\n", __func__, index); history_record_dump_busy(NULL, history_record); spin_unlock(&history_record->lock); return NULL; @@ -214,7 +214,7 @@ static int history_record_open(struct inode *inode, struct file *file) res = seq_open(file, &seq_op); if (res) { - IONMSG("%s fail\n", __FUNCTION__); + IONMSG("%s fail\n", __func__); return res; } @@ -270,13 +270,13 @@ struct history_record * history_record_create(unsigned int record_num, history_record = kzalloc(sizeof(struct history_record) + bitmap_bytes, GFP_KERNEL); if(!history_record) { - IONMSG("%s error to kzalloc %zd.\n", __FUNCTION__, sizeof(struct history_record)); + IONMSG("%s error to kzalloc %zd.\n", __func__, sizeof(struct history_record)); return ERR_PTR(-ENOMEM); } history_record->record = vzalloc(size_align); if(!history_record->record) { - IONMSG("%s error to valloc %zu.\n", __FUNCTION__, size_align); + IONMSG("%s error to valloc %zu.\n", __func__, size_align); kfree(history_record); return ERR_PTR(-ENOMEM); } @@ -310,7 +310,7 @@ void history_record_destroy(struct history_record *history_record) for(i=0; i<bitmap_longs; i++) { if(history_record->bitmap_busy[i]) { /* busy ! */ - IONMSG("warning: %s when busy %d\n", __FUNCTION__, i); + IONMSG("warning: %s when busy %d\n", __func__, i); spin_unlock(&history_record->lock); busy = 1; cond_resched(); @@ -382,7 +382,7 @@ static struct string_struct * string_hash_get(const char* str) /* add string */ string = kzalloc(sizeof(*string) + len + 1, GFP_ATOMIC); if(!string) { - IONMSG("%s: kzalloc fail size=%zd.\n", __FUNCTION__, + IONMSG("%s: kzalloc fail size=%zd.\n", __func__, sizeof(*string) + len + 1); goto out; } @@ -404,7 +404,7 @@ static int string_hash_put(struct string_struct *string) spin_lock(&ion_str_hash_lock); if(!string->ref) { - IONMSG("error %s string_ref is 0!!!\n", __FUNCTION__); + IONMSG("error %s string_ref is 0!!!\n", __func__); spin_unlock(&ion_str_hash_lock); return -EINVAL; } diff --git a/drivers/staging/bcm/DDRInit.c b/drivers/staging/bcm/DDRInit.c index 8c696b64a..1de6c4763 100644 --- a/drivers/staging/bcm/DDRInit.c +++ b/drivers/staging/bcm/DDRInit.c @@ -828,13 +828,13 @@ int ddr_init(struct bcm_mini_adapter *Adapter) { retval= rdmalt(Adapter,(UINT)0x0f000830, &uiResetValue, sizeof(uiResetValue)); if(retval < 0) { - BCM_DEBUG_PRINT(Adapter,CMHOST, RDM, DBG_LVL_ALL, "%s:%d RDM failed\n", __FUNCTION__, __LINE__); + BCM_DEBUG_PRINT(Adapter,CMHOST, RDM, DBG_LVL_ALL, "%s:%d RDM failed\n", __func__, __LINE__); return retval; } uiResetValue |= 0x44; retval = wrmalt(Adapter,(UINT)0x0f000830, &uiResetValue, sizeof(uiResetValue)); if(retval < 0) { - BCM_DEBUG_PRINT(Adapter,CMHOST, WRM, DBG_LVL_ALL, "%s:%d WRM failed\n", __FUNCTION__, __LINE__); + BCM_DEBUG_PRINT(Adapter,CMHOST, WRM, DBG_LVL_ALL, "%s:%d WRM failed\n", __func__, __LINE__); return retval; } } @@ -972,7 +972,7 @@ int ddr_init(struct bcm_mini_adapter *Adapter) } retval = wrmalt(Adapter, psDDRSetting->ulRegAddress, &value, sizeof(value)); if(STATUS_SUCCESS != retval) { - BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"%s:%d\n", __FUNCTION__, __LINE__); + BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"%s:%d\n", __func__, __LINE__); break; } @@ -992,25 +992,25 @@ int ddr_init(struct bcm_mini_adapter *Adapter) uiResetValue = 0x01010001; retval = wrmalt(Adapter, (UINT)0x0F007018, &uiResetValue, sizeof(uiResetValue)); if(retval < 0) { - BCM_DEBUG_PRINT(Adapter,CMHOST, RDM, DBG_LVL_ALL, "%s:%d RDM failed\n", __FUNCTION__, __LINE__); + BCM_DEBUG_PRINT(Adapter,CMHOST, RDM, DBG_LVL_ALL, "%s:%d RDM failed\n", __func__, __LINE__); return retval; } uiResetValue = 0x00040020; retval = wrmalt(Adapter, (UINT)0x0F007094, &uiResetValue, sizeof(uiResetValue)); if(retval < 0) { - BCM_DEBUG_PRINT(Adapter,CMHOST, RDM, DBG_LVL_ALL, "%s:%d RDM failed\n", __FUNCTION__, __LINE__); + BCM_DEBUG_PRINT(Adapter,CMHOST, RDM, DBG_LVL_ALL, "%s:%d RDM failed\n", __func__, __LINE__); return retval; } uiResetValue = 0x01020101; retval = wrmalt(Adapter, (UINT)0x0F00701c, &uiResetValue, sizeof(uiResetValue)); if(retval < 0) { - BCM_DEBUG_PRINT(Adapter,CMHOST, RDM, DBG_LVL_ALL, "%s:%d RDM failed\n", __FUNCTION__, __LINE__); + BCM_DEBUG_PRINT(Adapter,CMHOST, RDM, DBG_LVL_ALL, "%s:%d RDM failed\n", __func__, __LINE__); return retval; } uiResetValue = 0x01010000; retval = wrmalt(Adapter, (UINT)0x0F007018, &uiResetValue, sizeof(uiResetValue)); if(retval < 0) { - BCM_DEBUG_PRINT(Adapter,CMHOST, RDM, DBG_LVL_ALL, "%s:%d RDM failed\n", __FUNCTION__, __LINE__); + BCM_DEBUG_PRINT(Adapter,CMHOST, RDM, DBG_LVL_ALL, "%s:%d RDM failed\n", __func__, __LINE__); return retval; } } @@ -1026,34 +1026,34 @@ int ddr_init(struct bcm_mini_adapter *Adapter) { retval = rdmalt(Adapter,(UINT)0x0f000c00, &uiResetValue, sizeof(uiResetValue)); if(retval < 0) { - BCM_DEBUG_PRINT(Adapter,CMHOST, RDM, DBG_LVL_ALL, "%s:%d RDM failed\n", __FUNCTION__, __LINE__); + BCM_DEBUG_PRINT(Adapter,CMHOST, RDM, DBG_LVL_ALL, "%s:%d RDM failed\n", __func__, __LINE__); return retval; } retval = rdmalt(Adapter,(UINT)0x0f000c00, &uiResetValue, sizeof(uiResetValue)); if(retval < 0) { - BCM_DEBUG_PRINT(Adapter,CMHOST, RDM, DBG_LVL_ALL, "%s:%d RDM failed\n", __FUNCTION__, __LINE__); + BCM_DEBUG_PRINT(Adapter,CMHOST, RDM, DBG_LVL_ALL, "%s:%d RDM failed\n", __func__, __LINE__); return retval; } uiResetValue = 0x1322a8; retval = wrmalt(Adapter, (UINT)0x0f000d1c, &uiResetValue, sizeof(uiResetValue)); if(retval < 0) { - BCM_DEBUG_PRINT(Adapter,CMHOST, RDM, DBG_LVL_ALL, "%s:%d RDM failed\n", __FUNCTION__, __LINE__); + BCM_DEBUG_PRINT(Adapter,CMHOST, RDM, DBG_LVL_ALL, "%s:%d RDM failed\n", __func__, __LINE__); return retval; } retval = rdmalt(Adapter,(UINT)0x0f000c00, &uiResetValue, sizeof(uiResetValue)); if(retval < 0) { - BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, RDM, DBG_LVL_ALL, "%s:%d RDM failed\n", __FUNCTION__, __LINE__); + BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, RDM, DBG_LVL_ALL, "%s:%d RDM failed\n", __func__, __LINE__); return retval; } retval = rdmalt(Adapter,(UINT)0x0f000c00, &uiResetValue, sizeof(uiResetValue)); if(retval < 0) { - BCM_DEBUG_PRINT(Adapter,CMHOST, RDM, DBG_LVL_ALL, "%s:%d RDM failed\n", __FUNCTION__, __LINE__); + BCM_DEBUG_PRINT(Adapter,CMHOST, RDM, DBG_LVL_ALL, "%s:%d RDM failed\n", __func__, __LINE__); return retval; } uiResetValue = 0x132296; retval = wrmalt(Adapter, (UINT)0x0f000d14, &uiResetValue, sizeof(uiResetValue)); if(retval < 0) { - BCM_DEBUG_PRINT(Adapter,CMHOST, RDM, DBG_LVL_ALL, "%s:%d RDM failed\n", __FUNCTION__, __LINE__); + BCM_DEBUG_PRINT(Adapter,CMHOST, RDM, DBG_LVL_ALL, "%s:%d RDM failed\n", __func__, __LINE__); return retval; } } @@ -1062,34 +1062,34 @@ int ddr_init(struct bcm_mini_adapter *Adapter) retval = rdmalt(Adapter,(UINT)0x0f000c00, &uiResetValue, sizeof(uiResetValue)); if(retval < 0) { - BCM_DEBUG_PRINT(Adapter,CMHOST, RDM, DBG_LVL_ALL, "%s:%d RDM failed\n", __FUNCTION__, __LINE__); + BCM_DEBUG_PRINT(Adapter,CMHOST, RDM, DBG_LVL_ALL, "%s:%d RDM failed\n", __func__, __LINE__); return retval; } retval = rdmalt(Adapter,(UINT)0x0f000c00, &uiResetValue, sizeof(uiResetValue)); if(retval < 0) { - BCM_DEBUG_PRINT(Adapter,CMHOST, RDM, DBG_LVL_ALL, "%s:%d RDM failed\n", __FUNCTION__, __LINE__); + BCM_DEBUG_PRINT(Adapter,CMHOST, RDM, DBG_LVL_ALL, "%s:%d RDM failed\n", __func__, __LINE__); return retval; } uiResetValue = 0x6003229a; retval = wrmalt(Adapter, (UINT)0x0f000d14, &uiResetValue, sizeof(uiResetValue)); if(retval < 0) { - BCM_DEBUG_PRINT(Adapter,CMHOST, RDM, DBG_LVL_ALL, "%s:%d RDM failed\n", __FUNCTION__, __LINE__); + BCM_DEBUG_PRINT(Adapter,CMHOST, RDM, DBG_LVL_ALL, "%s:%d RDM failed\n", __func__, __LINE__); return retval; } retval = rdmalt(Adapter,(UINT)0x0f000c00, &uiResetValue, sizeof(uiResetValue)); if(retval < 0) { - BCM_DEBUG_PRINT(Adapter,CMHOST, RDM, DBG_LVL_ALL, "%s:%d RDM failed\n", __FUNCTION__, __LINE__); + BCM_DEBUG_PRINT(Adapter,CMHOST, RDM, DBG_LVL_ALL, "%s:%d RDM failed\n", __func__, __LINE__); return retval; } retval = rdmalt(Adapter,(UINT)0x0f000c00, &uiResetValue, sizeof(uiResetValue)); if(retval < 0) { - BCM_DEBUG_PRINT(Adapter,CMHOST, RDM, DBG_LVL_ALL, "%s:%d RDM failed\n", __FUNCTION__, __LINE__); + BCM_DEBUG_PRINT(Adapter,CMHOST, RDM, DBG_LVL_ALL, "%s:%d RDM failed\n", __func__, __LINE__); return retval; } uiResetValue = 0x1322a8; retval = wrmalt(Adapter, (UINT)0x0f000d1c, &uiResetValue, sizeof(uiResetValue)); if(retval < 0) { - BCM_DEBUG_PRINT(Adapter,CMHOST, RDM, DBG_LVL_ALL, "%s:%d RDM failed\n", __FUNCTION__, __LINE__); + BCM_DEBUG_PRINT(Adapter,CMHOST, RDM, DBG_LVL_ALL, "%s:%d RDM failed\n", __func__, __LINE__); return retval; } } @@ -1235,7 +1235,7 @@ int download_ddr_settings(struct bcm_mini_adapter *Adapter) retval = wrmalt(Adapter, ul_ddr_setting_load_addr, &value, sizeof(value)); if(retval) { - BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"%s:%d\n", __FUNCTION__, __LINE__); + BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"%s:%d\n", __func__, __LINE__); return retval; } @@ -1245,7 +1245,7 @@ int download_ddr_settings(struct bcm_mini_adapter *Adapter) retval = wrmalt(Adapter, ul_ddr_setting_load_addr, &value, sizeof(value)); if(retval) { - BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"%s:%d\n", __FUNCTION__, __LINE__); + BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"%s:%d\n", __func__, __LINE__); return retval; } @@ -1264,7 +1264,7 @@ int download_ddr_settings(struct bcm_mini_adapter *Adapter) value = (psDDRSetting->ulRegValue |(1<<8)); if(STATUS_SUCCESS != wrmalt(Adapter, ul_ddr_setting_load_addr, &value, sizeof(value))){ - BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"%s:%d\n", __FUNCTION__, __LINE__); + BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"%s:%d\n", __func__, __LINE__); break; } } @@ -1274,7 +1274,7 @@ int download_ddr_settings(struct bcm_mini_adapter *Adapter) if(STATUS_SUCCESS != wrmalt(Adapter, ul_ddr_setting_load_addr , &value, sizeof(value))){ - BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"%s:%d\n", __FUNCTION__, __LINE__); + BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"%s:%d\n", __func__, __LINE__); break; } } diff --git a/drivers/staging/bcm/Qos.c b/drivers/staging/bcm/Qos.c index 8d142a547..4bc5727b2 100644 --- a/drivers/staging/bcm/Qos.c +++ b/drivers/staging/bcm/Qos.c @@ -655,7 +655,7 @@ static BOOLEAN EthCSMatchSrcMACAddress(struct bcm_classifier_rule *pstClassifier struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(gblpnetdev); if(pstClassifierRule->ucEthCSSrcMACLen==0) return TRUE; - BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL, "%s \n",__FUNCTION__); + BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL, "%s \n",__func__); for(i=0;i<MAC_ADDRESS_SIZE;i++) { BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL, "SRC MAC[%x] = %x ClassifierRuleSrcMAC = %x Mask : %x\n",i,Mac[i],pstClassifierRule->au8EThCSSrcMAC[i],pstClassifierRule->au8EThCSSrcMACMask[i]); @@ -672,7 +672,7 @@ static BOOLEAN EthCSMatchDestMACAddress(struct bcm_classifier_rule *pstClassifie struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(gblpnetdev); if(pstClassifierRule->ucEthCSDestMACLen==0) return TRUE; - BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL, "%s \n",__FUNCTION__); + BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL, "%s \n",__func__); for(i=0;i<MAC_ADDRESS_SIZE;i++) { BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL, "SRC MAC[%x] = %x ClassifierRuleSrcMAC = %x Mask : %x\n",i,Mac[i],pstClassifierRule->au8EThCSDestMAC[i],pstClassifierRule->au8EThCSDestMACMask[i]); @@ -690,10 +690,10 @@ static BOOLEAN EthCSMatchEThTypeSAP(struct bcm_classifier_rule *pstClassifierRul (pstClassifierRule->au8EthCSEtherType[0] == 0)) return TRUE; - BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL, "%s SrcEtherType:%x CLS EtherType[0]:%x\n",__FUNCTION__,pstEthCsPktInfo->usEtherType,pstClassifierRule->au8EthCSEtherType[0]); + BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL, "%s SrcEtherType:%x CLS EtherType[0]:%x\n",__func__,pstEthCsPktInfo->usEtherType,pstClassifierRule->au8EthCSEtherType[0]); if(pstClassifierRule->au8EthCSEtherType[0] == 1) { - BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL, "%s CLS EtherType[1]:%x EtherType[2]:%x\n",__FUNCTION__,pstClassifierRule->au8EthCSEtherType[1],pstClassifierRule->au8EthCSEtherType[2]); + BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL, "%s CLS EtherType[1]:%x EtherType[2]:%x\n",__func__,pstClassifierRule->au8EthCSEtherType[1],pstClassifierRule->au8EthCSEtherType[2]); if(memcmp(&pstEthCsPktInfo->usEtherType,&pstClassifierRule->au8EthCSEtherType[1],2)==0) return TRUE; @@ -706,7 +706,7 @@ static BOOLEAN EthCSMatchEThTypeSAP(struct bcm_classifier_rule *pstClassifierRul if(eEth802LLCFrame != pstEthCsPktInfo->eNwpktEthFrameType) return FALSE; - BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL, "%s EthCS DSAP:%x EtherType[2]:%x\n",__FUNCTION__,pstEthCsPktInfo->ucDSAP,pstClassifierRule->au8EthCSEtherType[2]); + BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL, "%s EthCS DSAP:%x EtherType[2]:%x\n",__func__,pstEthCsPktInfo->ucDSAP,pstClassifierRule->au8EthCSEtherType[2]); if(pstEthCsPktInfo->ucDSAP == pstClassifierRule->au8EthCSEtherType[2]) return TRUE; else @@ -725,7 +725,7 @@ static BOOLEAN EthCSMatchVLANRules(struct bcm_classifier_rule *pstClassifierRule B_UINT8 uPriority = 0; struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(gblpnetdev); - BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL, "%s CLS UserPrio:%x CLS VLANID:%x\n",__FUNCTION__,ntohs(*((USHORT *)pstClassifierRule->usUserPriority)),pstClassifierRule->usVLANID); + BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL, "%s CLS UserPrio:%x CLS VLANID:%x\n",__func__,ntohs(*((USHORT *)pstClassifierRule->usUserPriority)),pstClassifierRule->usVLANID); /* In case FW didn't receive the TLV, the priority field should be ignored */ if(pstClassifierRule->usValidityBitMap & (1<<PKT_CLASSIFICATION_USER_PRIORITY_VALID)) @@ -753,7 +753,7 @@ static BOOLEAN EthCSMatchVLANRules(struct bcm_classifier_rule *pstClassifierRule usVLANID = ntohs(*(USHORT *)(skb->data + sizeof(struct bcm_eth_header))) & 0xFFF; - BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL, "%s Pkt VLANID %x Priority: %d\n",__FUNCTION__,usVLANID, uPriority); + BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL, "%s Pkt VLANID %x Priority: %d\n",__func__,usVLANID, uPriority); if(usVLANID == ((pstClassifierRule->usVLANID & 0xFFF0) >> 4)) bClassificationSucceed = TRUE; diff --git a/drivers/staging/csr/netdev.c b/drivers/staging/csr/netdev.c index a0177d998..3ad026b98 100644 --- a/drivers/staging/csr/netdev.c +++ b/drivers/staging/csr/netdev.c @@ -576,7 +576,7 @@ uf_net_open(struct net_device *dev) /* If we haven't finished UniFi initialisation, we can't start */ if (priv->init_progress != UNIFI_INIT_COMPLETED) { - unifi_warning(priv, "%s: unifi not ready, failing net_open\n", __FUNCTION__); + unifi_warning(priv, "%s: unifi not ready, failing net_open\n", __func__); return -EINVAL; } @@ -601,7 +601,7 @@ uf_net_open(struct net_device *dev) #ifdef CSR_SUPPORT_WEXT if (interfacePriv->wait_netdev_change) { unifi_trace(priv, UDBG1, "%s: Waiting for NETDEV_CHANGE, assume connected\n", - __FUNCTION__); + __func__); interfacePriv->connected = UnifiConnected; interfacePriv->wait_netdev_change = FALSE; } @@ -768,7 +768,7 @@ get_packet_priority(unifi_priv_t *priv, struct sk_buff *skb, const struct ethhdr break; #endif default: - unifi_trace(priv, UDBG3, " mode unknown in %s func, mode=%x\n", __FUNCTION__, interfaceMode); + unifi_trace(priv, UDBG3, " mode unknown in %s func, mode=%x\n", __func__, interfaceMode); } unifi_trace(priv, UDBG5, "priority = %x\n", priority); @@ -1278,7 +1278,7 @@ int prepare_and_add_macheader(unifi_priv_t *priv, struct sk_buff *skb, struct sk csrResult = unifi_net_data_malloc(priv, &data_ptrs.d[0], skb->len + macHeaderLengthInBytes); if (csrResult != CSR_RESULT_SUCCESS) { - unifi_error(priv, " failed to allocate request_data. in %s func\n", __FUNCTION__); + unifi_error(priv, " failed to allocate request_data. in %s func\n", __func__); return -1; } newSkb = (struct sk_buff *)(data_ptrs.d[0].os_net_buf_ptr); @@ -2152,7 +2152,7 @@ unifi_rx(unifi_priv_t *priv, CSR_SIGNAL *signal, bulk_data_param_t *bulkdata) /* Sanity check that the VIF refers to a sensible interface */ if (interfaceTag >= CSR_WIFI_NUM_INTERFACES) { - unifi_error(priv, "%s: MA-PACKET indication with bad interfaceTag %d\n", __FUNCTION__, interfaceTag); + unifi_error(priv, "%s: MA-PACKET indication with bad interfaceTag %d\n", __func__, interfaceTag); unifi_net_data_free(priv,&bulkdata->d[0]); return; } @@ -2160,13 +2160,13 @@ unifi_rx(unifi_priv_t *priv, CSR_SIGNAL *signal, bulk_data_param_t *bulkdata) /* Sanity check that the VIF refers to an allocated netdev */ if (!interfacePriv->netdev_registered) { - unifi_error(priv, "%s: MA-PACKET indication with unallocated interfaceTag %d\n", __FUNCTION__, interfaceTag); + unifi_error(priv, "%s: MA-PACKET indication with unallocated interfaceTag %d\n", __func__, interfaceTag); unifi_net_data_free(priv, &bulkdata->d[0]); return; } if (bulkdata->d[0].data_length == 0) { - unifi_warning(priv, "%s: MA-PACKET indication with zero bulk data\n", __FUNCTION__); + unifi_warning(priv, "%s: MA-PACKET indication with zero bulk data\n", __func__); unifi_net_data_free(priv,&bulkdata->d[0]); return; } @@ -2189,7 +2189,7 @@ unifi_rx(unifi_priv_t *priv, CSR_SIGNAL *signal, bulk_data_param_t *bulkdata) dataFrameType =((frameControl & 0x00f0) >> 4); unifi_trace(priv, UDBG6, - "%s: Receive Data Frame Type %d \n", __FUNCTION__,dataFrameType); + "%s: Receive Data Frame Type %d \n", __func__,dataFrameType); switch(dataFrameType) { @@ -2285,7 +2285,7 @@ unifi_rx(unifi_priv_t *priv, CSR_SIGNAL *signal, bulk_data_param_t *bulkdata) CsrWifiMacAddress peerMacAddress; /* Unknown data PDU */ memcpy(peerMacAddress.a,sa,ETH_ALEN); - unifi_trace(priv, UDBG1, "%s: Unexpected frame from peer = %x:%x:%x:%x:%x:%x\n", __FUNCTION__, + unifi_trace(priv, UDBG1, "%s: Unexpected frame from peer = %x:%x:%x:%x:%x:%x\n", __func__, sa[0], sa[1],sa[2], sa[3], sa[4],sa[5]); CsrWifiRouterCtrlUnexpectedFrameIndSend(priv->CSR_WIFI_SME_IFACEQUEUE,0,interfaceTag,peerMacAddress); unifi_net_data_free(priv, &bulkdata->d[0]); @@ -2298,19 +2298,19 @@ unifi_rx(unifi_priv_t *priv, CSR_SIGNAL *signal, bulk_data_param_t *bulkdata) CsrWifiMacAddress peerMacAddress; memcpy(peerMacAddress.a,sa,ETH_ALEN); unifi_trace(priv, UDBG3, "%s: Port is not open: unexpected frame from peer = %x:%x:%x:%x:%x:%x\n", - __FUNCTION__, sa[0], sa[1],sa[2], sa[3], sa[4],sa[5]); + __func__, sa[0], sa[1],sa[2], sa[3], sa[4],sa[5]); CsrWifiRouterCtrlUnexpectedFrameIndSend(priv->CSR_WIFI_SME_IFACEQUEUE,0,interfaceTag,peerMacAddress); interfacePriv->stats.rx_dropped++; unifi_net_data_free(priv, &bulkdata->d[0]); - unifi_notice(priv, "%s: Dropping packet, proto=0x%04x, %s port\n", __FUNCTION__, + unifi_notice(priv, "%s: Dropping packet, proto=0x%04x, %s port\n", __func__, proto, queue ? "Controlled" : "Un-controlled"); return; } /* Qos NULL/Data NULL are freed here and not processed further */ if((dataFrameType == QOS_DATA_NULL) || (dataFrameType == DATA_NULL)){ - unifi_trace(priv, UDBG5, "%s: Null Frame Received and Freed\n", __FUNCTION__); + unifi_trace(priv, UDBG5, "%s: Null Frame Received and Freed\n", __func__); unifi_net_data_free(priv, &bulkdata->d[0]); return; } @@ -2356,7 +2356,7 @@ unifi_rx(unifi_priv_t *priv, CSR_SIGNAL *signal, bulk_data_param_t *bulkdata) interfacePriv->stats.rx_dropped++; unifi_net_data_free(priv, &bulkdata->d[0]); unifi_notice(priv, "%s: Dropping packet, proto=0x%04x, %s port\n", - __FUNCTION__, proto, queue ? "controlled" : "uncontrolled"); + __func__, proto, queue ? "controlled" : "uncontrolled"); return; } else if ( (port_action == CSR_WIFI_ROUTER_CTRL_PORT_ACTION_8021X_PORT_CLOSED_BLOCK) || (interfacePriv->connected != UnifiConnected) ) { @@ -2369,7 +2369,7 @@ unifi_rx(unifi_priv_t *priv, CSR_SIGNAL *signal, bulk_data_param_t *bulkdata) GFP_KERNEL); if (rx_q_item == NULL) { unifi_error(priv, "%s: Failed to allocate %d bytes for rx packet record\n", - __FUNCTION__, sizeof(rx_buffered_packets_t)); + __func__, sizeof(rx_buffered_packets_t)); interfacePriv->stats.rx_dropped++; unifi_net_data_free(priv, &bulkdata->d[0]); return; @@ -2382,7 +2382,7 @@ unifi_rx(unifi_priv_t *priv, CSR_SIGNAL *signal, bulk_data_param_t *bulkdata) memcpy(rx_q_item->sa.a, sa, ETH_ALEN); memcpy(rx_q_item->da.a, da, ETH_ALEN); unifi_trace(priv, UDBG2, "%s: Blocked skb=%p, bulkdata=%p\n", - __FUNCTION__, rx_q_item->skb, &rx_q_item->bulkdata); + __func__, rx_q_item->skb, &rx_q_item->bulkdata); if (queue == UF_CONTROLLED_PORT_Q) { rx_list = &interfacePriv->rx_controlled_list; @@ -2415,7 +2415,7 @@ static void process_ma_packet_cfm(unifi_priv_t *priv, CSR_SIGNAL *signal, bulk_d /* Sanity check that the VIF refers to a sensible interface */ if (interfaceTag >= CSR_WIFI_NUM_INTERFACES) { - unifi_error(priv, "%s: MA-PACKET confirm with bad interfaceTag %d\n", __FUNCTION__, interfaceTag); + unifi_error(priv, "%s: MA-PACKET confirm with bad interfaceTag %d\n", __func__, interfaceTag); return; } #ifdef CSR_SUPPORT_SME @@ -2429,7 +2429,7 @@ static void process_ma_packet_cfm(unifi_priv_t *priv, CSR_SIGNAL *signal, bulk_d CsrWifiMacAddress peerMacAddress; memcpy(peerMacAddress.a, interfacePriv->m4_signal.u.MaPacketRequest.Ra.x, ETH_ALEN); - unifi_trace(priv, UDBG1, "%s: Sending M4 Transmit CFM\n", __FUNCTION__); + unifi_trace(priv, UDBG1, "%s: Sending M4 Transmit CFM\n", __func__); CsrWifiRouterCtrlM4TransmittedIndSend(priv->CSR_WIFI_SME_IFACEQUEUE, 0, interfaceTag, peerMacAddress, @@ -2485,7 +2485,7 @@ static void process_ma_packet_ind(unifi_priv_t *priv, CSR_SIGNAL *signal, bulk_d /* Sanity check that the VIF refers to a sensible interface */ if (interfaceTag >= CSR_WIFI_NUM_INTERFACES) { - unifi_error(priv, "%s: MA-PACKET indication with bad interfaceTag %d\n", __FUNCTION__, interfaceTag); + unifi_error(priv, "%s: MA-PACKET indication with bad interfaceTag %d\n", __func__, interfaceTag); unifi_net_data_free(priv,&bulkdata->d[0]); return; } @@ -2493,13 +2493,13 @@ static void process_ma_packet_ind(unifi_priv_t *priv, CSR_SIGNAL *signal, bulk_d /* Sanity check that the VIF refers to an allocated netdev */ if (!interfacePriv->netdev_registered) { - unifi_error(priv, "%s: MA-PACKET indication with unallocated interfaceTag %d\n", __FUNCTION__, interfaceTag); + unifi_error(priv, "%s: MA-PACKET indication with unallocated interfaceTag %d\n", __func__, interfaceTag); unifi_net_data_free(priv, &bulkdata->d[0]); return; } if (bulkdata->d[0].data_length == 0) { - unifi_warning(priv, "%s: MA-PACKET indication with zero bulk data\n", __FUNCTION__); + unifi_warning(priv, "%s: MA-PACKET indication with zero bulk data\n", __func__); unifi_net_data_free(priv,&bulkdata->d[0]); return; } @@ -2508,7 +2508,7 @@ static void process_ma_packet_ind(unifi_priv_t *priv, CSR_SIGNAL *signal, bulk_d /* MIC failure is already taken care of so no need to send the PDUs which are not successfully received in non-monitor mode*/ if(pkt_ind->ReceptionStatus != CSR_RX_SUCCESS) { - unifi_warning(priv, "%s: MA-PACKET indication with status = %d\n",__FUNCTION__, pkt_ind->ReceptionStatus); + unifi_warning(priv, "%s: MA-PACKET indication with status = %d\n",__func__, pkt_ind->ReceptionStatus); unifi_net_data_free(priv,&bulkdata->d[0]); return; } @@ -2543,24 +2543,24 @@ static void process_ma_packet_ind(unifi_priv_t *priv, CSR_SIGNAL *signal, bulk_d (le16_to_cpu(*((u16*)(bulkdata->d[0].os_data_ptr + IEEE802_11_SEQUENCE_CONTROL_OFFSET))) >> 4) & 0xfff); if(frameType == IEEE802_11_FRAMETYPE_CONTROL){ #ifdef CSR_SUPPORT_SME - unifi_trace(priv, UDBG6, "%s: Received Control Frame\n", __FUNCTION__); + unifi_trace(priv, UDBG6, "%s: Received Control Frame\n", __func__); if((frameControl & 0x00f0) == 0x00A0){ /* This is a PS-POLL request */ u8 pmBit = (frameControl & 0x1000)?0x01:0x00; - unifi_trace(priv, UDBG6, "%s: Received PS-POLL Frame\n", __FUNCTION__); + unifi_trace(priv, UDBG6, "%s: Received PS-POLL Frame\n", __func__); uf_process_ps_poll(priv,sa,da,pmBit,interfaceTag); } else { - unifi_warning(priv, "%s: Non PS-POLL control frame is received\n", __FUNCTION__); + unifi_warning(priv, "%s: Non PS-POLL control frame is received\n", __func__); } #endif unifi_net_data_free(priv,&bulkdata->d[0]); return; } if(frameType != IEEE802_11_FRAMETYPE_DATA) { - unifi_warning(priv, "%s: Non control Non Data frame is received\n",__FUNCTION__); + unifi_warning(priv, "%s: Non control Non Data frame is received\n",__func__); unifi_net_data_free(priv,&bulkdata->d[0]); return; } @@ -2575,7 +2575,7 @@ static void process_ma_packet_ind(unifi_priv_t *priv, CSR_SIGNAL *signal, bulk_d CsrWifiMacAddress peerMacAddress; /* Unknown data PDU */ memcpy(peerMacAddress.a,sa,ETH_ALEN); - unifi_trace(priv, UDBG1, "%s: Unexpected frame from peer = %x:%x:%x:%x:%x:%x\n", __FUNCTION__, + unifi_trace(priv, UDBG1, "%s: Unexpected frame from peer = %x:%x:%x:%x:%x:%x\n", __func__, sa[0], sa[1],sa[2], sa[3], sa[4],sa[5]); CsrWifiRouterCtrlUnexpectedFrameIndSend(priv->CSR_WIFI_SME_IFACEQUEUE,0,interfaceTag,peerMacAddress); unifi_net_data_free(priv, &bulkdata->d[0]); @@ -2616,7 +2616,7 @@ static void process_ma_packet_ind(unifi_priv_t *priv, CSR_SIGNAL *signal, bulk_d else{ qosControl = CSR_GET_UINT16_FROM_LITTLE_ENDIAN(pData->os_data_ptr + 24); } - unifi_trace(priv, UDBG5, "%s: Check if U-APSD operations are triggered for qosControl: 0x%x\n",__FUNCTION__,qosControl); + unifi_trace(priv, UDBG5, "%s: Check if U-APSD operations are triggered for qosControl: 0x%x\n",__func__,qosControl); uf_process_wmm_deliver_ac_uapsd(priv,srcStaInfo,qosControl,interfaceTag); } } @@ -2648,7 +2648,7 @@ static void process_ma_packet_ind(unifi_priv_t *priv, CSR_SIGNAL *signal, bulk_d frame_desc.signal = *signal; frame_desc.sn = (le16_to_cpu(*((u16*)(bulkdata->d[0].os_data_ptr + IEEE802_11_SEQUENCE_CONTROL_OFFSET))) >> 4) & 0xfff; frame_desc.active = TRUE; - unifi_trace(priv, UDBG6, "%s: calling process_ba_frame (session=%d)\n", __FUNCTION__, ba_session_idx); + unifi_trace(priv, UDBG6, "%s: calling process_ba_frame (session=%d)\n", __func__, ba_session_idx); process_ba_frame(priv, interfacePriv, ba_session, &frame_desc); up(&priv->ba_mutex); process_ba_complete(priv, interfacePriv); @@ -2658,7 +2658,7 @@ static void process_ma_packet_ind(unifi_priv_t *priv, CSR_SIGNAL *signal, bulk_d } if (ba_session_idx == MAX_SUPPORTED_BA_SESSIONS_RX){ up(&priv->ba_mutex); - unifi_trace(priv, UDBG6, "%s: calling process_amsdu()", __FUNCTION__); + unifi_trace(priv, UDBG6, "%s: calling process_amsdu()", __func__); process_amsdu(priv, signal, bulkdata); } } else { @@ -2951,7 +2951,7 @@ static void frameControl = le16_to_cpu(*((u16*)dot11_hdr_ptr)); qos_control_ptr = dot11_hdr_ptr + (((frameControl & IEEE802_11_FC_TO_DS_MASK) && (frameControl & IEEE802_11_FC_FROM_DS_MASK))?30: 24); if(!(*qos_control_ptr & IEEE802_11_QC_A_MSDU_PRESENT)) { - unifi_trace(priv, UDBG6, "%s: calling unifi_rx()", __FUNCTION__); + unifi_trace(priv, UDBG6, "%s: calling unifi_rx()", __func__); unifi_rx(priv, signal, bulkdata); return; } @@ -2963,7 +2963,7 @@ static void while(length > (offset + sizeof(struct ethhdr) + sizeof(llc_snap_hdr_t))) { subframe_body_length = ntohs(((struct ethhdr*)ptr)->h_proto); if(subframe_body_length > IEEE802_11_MAX_DATA_LEN) { - unifi_error(priv, "%s: bad subframe_body_length = %d\n", __FUNCTION__, subframe_body_length); + unifi_error(priv, "%s: bad subframe_body_length = %d\n", __func__, subframe_body_length); break; } subframe_length = sizeof(struct ethhdr) + subframe_body_length; @@ -2972,7 +2972,7 @@ static void csrResult = unifi_net_data_malloc(priv, &subframe_bulkdata.d[0], dot11_hdr_size + subframe_body_length); if (csrResult != CSR_RESULT_SUCCESS) { - unifi_error(priv, "%s: unifi_net_data_malloc failed\n", __FUNCTION__); + unifi_error(priv, "%s: unifi_net_data_malloc failed\n", __func__); break; } @@ -2992,7 +2992,7 @@ static void memcpy((u8*)subframe_bulkdata.d[0].os_data_ptr + dot11_hdr_size, ptr + sizeof(struct ethhdr), subframe_body_length); - unifi_trace(priv, UDBG6, "%s: calling unifi_rx. length = %d subframe_length = %d\n", __FUNCTION__, length, subframe_length); + unifi_trace(priv, UDBG6, "%s: calling unifi_rx. length = %d subframe_length = %d\n", __func__, length, subframe_length); unifi_rx(priv, signal, &subframe_bulkdata); subframe_length = (subframe_length + 3)&(~0x3); @@ -3037,16 +3037,16 @@ static void update_expected_sn(unifi_priv_t *priv, u16 gap; gap = (sn - ba_session->expected_sn) & 0xFFF; - unifi_trace(priv, UDBG6, "%s: process the frames up to new_expected_sn = %d gap = %d\n", __FUNCTION__, sn, gap); + unifi_trace(priv, UDBG6, "%s: process the frames up to new_expected_sn = %d gap = %d\n", __func__, sn, gap); for(j = 0; j < gap && j < ba_session->wind_size; j++) { i = SN_TO_INDEX(ba_session, ba_session->expected_sn); - unifi_trace(priv, UDBG6, "%s: process the slot index = %d\n", __FUNCTION__, i); + unifi_trace(priv, UDBG6, "%s: process the slot index = %d\n", __func__, i); if(ba_session->buffer[i].active) { add_frame_to_ba_complete(priv, interfacePriv, &ba_session->buffer[i]); - unifi_trace(priv, UDBG6, "%s: process the frame at index = %d expected_sn = %d\n", __FUNCTION__, i, ba_session->expected_sn); + unifi_trace(priv, UDBG6, "%s: process the frame at index = %d expected_sn = %d\n", __func__, i, ba_session->expected_sn); FREE_BUFFER_SLOT(ba_session, i); } else { - unifi_trace(priv, UDBG6, "%s: empty slot at index = %d\n", __FUNCTION__, i); + unifi_trace(priv, UDBG6, "%s: empty slot at index = %d\n", __func__, i); ADVANCE_EXPECTED_SN(ba_session); } } @@ -3063,7 +3063,7 @@ static void complete_ready_sequence(unifi_priv_t *priv, i = SN_TO_INDEX(ba_session, ba_session->expected_sn); while (ba_session->buffer[i].active) { add_frame_to_ba_complete(priv, interfacePriv, &ba_session->buffer[i]); - unifi_trace(priv, UDBG6, "%s: completed stored frame(expected_sn=%d) at i = %d\n", __FUNCTION__, ba_session->expected_sn, i); + unifi_trace(priv, UDBG6, "%s: completed stored frame(expected_sn=%d) at i = %d\n", __func__, ba_session->expected_sn, i); FREE_BUFFER_SLOT(ba_session, i); i = SN_TO_INDEX(ba_session, ba_session->expected_sn); } @@ -3098,24 +3098,24 @@ static int consume_frame_or_get_buffer_index(unifi_priv_t *priv, } sn_temp = ba_session->expected_sn + ba_session->wind_size; - unifi_trace(priv, UDBG6, "%s: new frame: sn=%d\n", __FUNCTION__, sn); + unifi_trace(priv, UDBG6, "%s: new frame: sn=%d\n", __func__, sn); if(!(((sn - sn_temp) & 0xFFF) > 2048)) { u16 new_expected_sn; - unifi_trace(priv, UDBG6, "%s: frame is out of window\n", __FUNCTION__); + unifi_trace(priv, UDBG6, "%s: frame is out of window\n", __func__); sn_temp = (sn - ba_session->wind_size) & 0xFFF; new_expected_sn = (sn_temp + 1) & 0xFFF; update_expected_sn(priv, interfacePriv, ba_session, new_expected_sn); } i = -1; if (sn == ba_session->expected_sn) { - unifi_trace(priv, UDBG6, "%s: sn = ba_session->expected_sn = %d\n", __FUNCTION__, sn); + unifi_trace(priv, UDBG6, "%s: sn = ba_session->expected_sn = %d\n", __func__, sn); ADVANCE_EXPECTED_SN(ba_session); add_frame_to_ba_complete(priv, interfacePriv, frame_desc); } else { i = SN_TO_INDEX(ba_session, sn); - unifi_trace(priv, UDBG6, "%s: sn(%d) != ba_session->expected_sn(%d), i = %d\n", __FUNCTION__, sn, ba_session->expected_sn, i); + unifi_trace(priv, UDBG6, "%s: sn(%d) != ba_session->expected_sn(%d), i = %d\n", __func__, sn, ba_session->expected_sn, i); if (ba_session->buffer[i].active) { - unifi_trace(priv, UDBG6, "%s: free frame at i = %d\n", __FUNCTION__, i); + unifi_trace(priv, UDBG6, "%s: free frame at i = %d\n", __func__, i); i = -1; unifi_net_data_free(priv, &frame_desc->bulkdata.d[0]); } @@ -3123,10 +3123,10 @@ static int consume_frame_or_get_buffer_index(unifi_priv_t *priv, } else { i = -1; if(!ba_session->trigger_ba_after_ssn){ - unifi_trace(priv, UDBG6, "%s: frame before ssn, pass it up: sn=%d\n", __FUNCTION__, sn); + unifi_trace(priv, UDBG6, "%s: frame before ssn, pass it up: sn=%d\n", __func__, sn); add_frame_to_ba_complete(priv, interfacePriv, frame_desc); }else{ - unifi_trace(priv, UDBG6, "%s: old frame, drop: sn=%d, expected_sn=%d\n", __FUNCTION__, sn, ba_session->expected_sn); + unifi_trace(priv, UDBG6, "%s: old frame, drop: sn=%d, expected_sn=%d\n", __func__, sn, ba_session->expected_sn); unifi_net_data_free(priv, &frame_desc->bulkdata.d[0]); } } @@ -3146,16 +3146,16 @@ static void process_ba_frame(unifi_priv_t *priv, if (ba_session->timeout) { mod_timer(&ba_session->timer, (jiffies + usecs_to_jiffies((ba_session->timeout) * 1024))); } - unifi_trace(priv, UDBG6, "%s: got frame(sn=%d)\n", __FUNCTION__, sn); + unifi_trace(priv, UDBG6, "%s: got frame(sn=%d)\n", __func__, sn); i = consume_frame_or_get_buffer_index(priv, interfacePriv, ba_session, sn, frame_desc); if(i >= 0) { - unifi_trace(priv, UDBG6, "%s: store frame(sn=%d) at i = %d\n", __FUNCTION__, sn, i); + unifi_trace(priv, UDBG6, "%s: store frame(sn=%d) at i = %d\n", __func__, sn, i); ba_session->buffer[i] = *frame_desc; ba_session->buffer[i].recv_time = CsrTimeGet(NULL); ba_session->occupied_slots++; } else { - unifi_trace(priv, UDBG6, "%s: frame consumed - sn = %d\n", __FUNCTION__, sn); + unifi_trace(priv, UDBG6, "%s: frame consumed - sn = %d\n", __func__, sn); } complete_ready_sequence(priv, interfacePriv, ba_session); } @@ -3168,7 +3168,7 @@ static void process_ba_complete(unifi_priv_t *priv, netInterface_priv_t *interfa for(i = 0; i < interfacePriv->ba_complete_index; i++) { frame_desc = &interfacePriv->ba_complete[i]; - unifi_trace(priv, UDBG6, "%s: calling process_amsdu()\n", __FUNCTION__); + unifi_trace(priv, UDBG6, "%s: calling process_amsdu()\n", __func__); process_amsdu(priv, &frame_desc->signal, &frame_desc->bulkdata); } interfacePriv->ba_complete_index = 0; @@ -3274,14 +3274,14 @@ static void process_ma_packet_error_ind(unifi_priv_t *priv, CSR_SIGNAL *signal, /* Sanity check that the VIF refers to a sensible interface */ if (interfaceTag >= CSR_WIFI_NUM_INTERFACES) { - unifi_error(priv, "%s: MaPacketErrorIndication indication with bad interfaceTag %d\n", __FUNCTION__, interfaceTag); + unifi_error(priv, "%s: MaPacketErrorIndication indication with bad interfaceTag %d\n", __func__, interfaceTag); return; } interfacePriv = priv->interfacePriv[interfaceTag]; UserPriority = pkt_err_ind->UserPriority; if(UserPriority > 15) { - unifi_error(priv, "%s: MaPacketErrorIndication indication with bad UserPriority=%d\n", __FUNCTION__, UserPriority); + unifi_error(priv, "%s: MaPacketErrorIndication indication with bad UserPriority=%d\n", __func__, UserPriority); } sn = pkt_err_ind->SequenceNumber; diff --git a/drivers/staging/csr/sdio_mmc.c b/drivers/staging/csr/sdio_mmc.c index 30271d35a..6a52899ed 100644 --- a/drivers/staging/csr/sdio_mmc.c +++ b/drivers/staging/csr/sdio_mmc.c @@ -118,7 +118,7 @@ csr_io_rw_direct(struct mmc_card *card, int write, uint8_t fn, } else { if (cmd.resp[0] & R5_ERROR) { printk(KERN_ERR "%s: r5 error 0x%02x\n", - __FUNCTION__, cmd.resp[0]); + __func__, cmd.resp[0]); return -EIO; } if (cmd.resp[0] & R5_FUNCTION_NUMBER) @@ -474,7 +474,7 @@ CsrSdioInterruptEnable(CsrSdioFunction *function) _sdio_release_host(func); if (err) { - printk(KERN_ERR "unifi: %s: error %d writing IENx\n", __FUNCTION__, err); + printk(KERN_ERR "unifi: %s: error %d writing IENx\n", __func__, err); return ConvertSdioToCsrSdioResult(err); } #endif @@ -500,7 +500,7 @@ CsrSdioInterruptDisable(CsrSdioFunction *function) _sdio_release_host(func); if (err) { - printk(KERN_ERR "unifi: %s: error %d writing IENx\n", __FUNCTION__, err); + printk(KERN_ERR "unifi: %s: error %d writing IENx\n", __func__, err); return ConvertSdioToCsrSdioResult(err); } #endif @@ -980,7 +980,7 @@ uf_sdio_mmc_power_event(struct notifier_block *this, unsigned long event, void * switch (event) { case PM_POST_HIBERNATION: case PM_POST_SUSPEND: - printk(KERN_INFO "%s:%d resume\n", __FUNCTION__, __LINE__ ); + printk(KERN_INFO "%s:%d resume\n", __func__, __LINE__ ); if (sdio_func_drv && sdio_func_drv->resume) { sdio_func_drv->resume(notifier_ctx->sdio_ctx); } @@ -988,7 +988,7 @@ uf_sdio_mmc_power_event(struct notifier_block *this, unsigned long event, void * case PM_HIBERNATION_PREPARE: case PM_SUSPEND_PREPARE: - printk(KERN_INFO "%s:%d suspend\n", __FUNCTION__, __LINE__ ); + printk(KERN_INFO "%s:%d suspend\n", __func__, __LINE__ ); if (sdio_func_drv && sdio_func_drv->suspend) { sdio_func_drv->suspend(notifier_ctx->sdio_ctx); } @@ -1065,7 +1065,7 @@ uf_glue_sdio_probe(struct sdio_func *func, #ifdef CONFIG_PM /* Register to get PM events */ if (uf_sdio_mmc_register_pm_notifier(sdio_ctx) == NULL) { - unifi_error(NULL, "%s: Failed to register for PM events\n", __FUNCTION__); + unifi_error(NULL, "%s: Failed to register for PM events\n", __func__); } #endif diff --git a/drivers/staging/csr/sme_sys.c b/drivers/staging/csr/sme_sys.c index b1151a28d..a46e17475 100644 --- a/drivers/staging/csr/sme_sys.c +++ b/drivers/staging/csr/sme_sys.c @@ -1715,7 +1715,7 @@ static void CsrWifiRouterCtrlResetStationRecordList(unifi_priv_t *priv, u16 inte * we expect the entries should be zero here if mode is set as NONE */ unifi_trace(priv, UDBG3, "In %s controlled port entries = %d, uncontrolled port entries = %d\n", - __FUNCTION__, interfacePriv->controlled_data_port.entries_in_use, + __func__, interfacePriv->controlled_data_port.entries_in_use, interfacePriv->uncontrolled_data_port.entries_in_use); } } @@ -2558,12 +2558,12 @@ uf_send_ba_err_wq(struct work_struct *work) priv = ba_session->interfacePriv->privPtr; if (ba_session->interfacePriv->InterfaceTag >= CSR_WIFI_NUM_INTERFACES) { - unifi_error(priv, "%s: invalid interfaceTag\n", __FUNCTION__); + unifi_error(priv, "%s: invalid interfaceTag\n", __func__); return; } unifi_warning(priv, "%s: Calling CsrWifiRouterCtrlBlockAckErrorIndSend(%d, %d, %d, %d, %x:%x:%x:%x:%x:%x, %d)\n", - __FUNCTION__, + __func__, priv->CSR_WIFI_SME_IFACEQUEUE, 0, ba_session->interfacePriv->InterfaceTag, @@ -2601,7 +2601,7 @@ static void ba_session_terminate_timer_func(unsigned long data) priv = ba_session->interfacePriv->privPtr; if (ba_session->interfacePriv->InterfaceTag >= CSR_WIFI_NUM_INTERFACES) { - unifi_error(priv, "%s: invalid interfaceTag\n", __FUNCTION__); + unifi_error(priv, "%s: invalid interfaceTag\n", __func__); return; } @@ -2622,25 +2622,25 @@ u8 blockack_session_stop(unifi_priv_t *priv, int i; if (interfaceTag >= CSR_WIFI_NUM_INTERFACES) { - unifi_error(priv, "%s: bad interfaceTag = %d\n", __FUNCTION__, interfaceTag); + unifi_error(priv, "%s: bad interfaceTag = %d\n", __func__, interfaceTag); return FALSE; } interfacePriv = priv->interfacePriv[interfaceTag]; if(!interfacePriv) { - unifi_error(priv, "%s: bad interfacePriv\n", __FUNCTION__); + unifi_error(priv, "%s: bad interfacePriv\n", __func__); return FALSE; } if(tID > 15) { - unifi_error(priv, "%s: bad tID = %d\n", __FUNCTION__, tID); + unifi_error(priv, "%s: bad tID = %d\n", __func__, tID); return FALSE; } if((role != CSR_WIFI_ROUTER_CTRL_BLOCK_ACK_ORIGINATOR) && (role != CSR_WIFI_ROUTER_CTRL_BLOCK_ACK_RECIPIENT)) { - unifi_error(priv, "%s: bad role = %d\n", __FUNCTION__, role); + unifi_error(priv, "%s: bad role = %d\n", __func__, role); return FALSE; } @@ -2662,7 +2662,7 @@ u8 blockack_session_stop(unifi_priv_t *priv, } if (!ba_session_rx || (ba_session_idx == MAX_SUPPORTED_BA_SESSIONS_RX)) { - unifi_error(priv, "%s: bad ba_session for Rx [tID=%d]\n", __FUNCTION__, tID); + unifi_error(priv, "%s: bad ba_session for Rx [tID=%d]\n", __func__, tID); return FALSE; } @@ -2692,7 +2692,7 @@ u8 blockack_session_stop(unifi_priv_t *priv, } if (!ba_session_tx || (ba_session_idx == MAX_SUPPORTED_BA_SESSIONS_TX)) { - unifi_error(priv, "%s: bad ba_session for Tx [tID=%d]\n", __FUNCTION__, tID); + unifi_error(priv, "%s: bad ba_session for Tx [tID=%d]\n", __func__, tID); return FALSE; } interfacePriv->ba_session_tx[ba_session_idx] = NULL; @@ -2710,7 +2710,7 @@ void CsrWifiRouterCtrlBlockAckDisableReqHandler(void* drvpriv, CsrWifiFsmEvent* u8 r; unifi_priv_t *priv = (unifi_priv_t*)drvpriv; - unifi_trace(priv, UDBG6, "%s: in ok\n", __FUNCTION__); + unifi_trace(priv, UDBG6, "%s: in ok\n", __func__); down(&priv->ba_mutex); r = blockack_session_stop(priv, @@ -2725,7 +2725,7 @@ void CsrWifiRouterCtrlBlockAckDisableReqHandler(void* drvpriv, CsrWifiFsmEvent* req->interfaceTag, r?CSR_RESULT_SUCCESS:CSR_RESULT_FAILURE); - unifi_trace(priv, UDBG6, "%s: out ok\n", __FUNCTION__); + unifi_trace(priv, UDBG6, "%s: out ok\n", __func__); } @@ -2746,31 +2746,31 @@ u8 blockack_session_start(unifi_priv_t *priv, if (interfaceTag >= CSR_WIFI_NUM_INTERFACES) { - unifi_error(priv, "%s: bad interfaceTag = %d\n", __FUNCTION__, interfaceTag); + unifi_error(priv, "%s: bad interfaceTag = %d\n", __func__, interfaceTag); return FALSE; } interfacePriv = priv->interfacePriv[interfaceTag]; if(!interfacePriv) { - unifi_error(priv, "%s: bad interfacePriv\n", __FUNCTION__); + unifi_error(priv, "%s: bad interfacePriv\n", __func__); return FALSE; } if(tID > 15) { - unifi_error(priv, "%s: bad tID=%d\n", __FUNCTION__, tID); + unifi_error(priv, "%s: bad tID=%d\n", __func__, tID); return FALSE; } if(wind_size > MAX_BA_WIND_SIZE) { - unifi_error(priv, "%s: bad wind_size = %d\n", __FUNCTION__, wind_size); + unifi_error(priv, "%s: bad wind_size = %d\n", __func__, wind_size); return FALSE; } if(role != CSR_WIFI_ROUTER_CTRL_BLOCK_ACK_ORIGINATOR && role != CSR_WIFI_ROUTER_CTRL_BLOCK_ACK_RECIPIENT) { - unifi_error(priv, "%s: bad role = %d\n", __FUNCTION__, role); + unifi_error(priv, "%s: bad role = %d\n", __func__, role); return FALSE; } @@ -2778,7 +2778,7 @@ u8 blockack_session_start(unifi_priv_t *priv, "%s: ba session with peer= (%pM)\n", __func__, macAddress.a); - unifi_warning(priv, "%s: ba session for tID=%d timeout=%d role=%d wind_size=%d start_sn=%d\n", __FUNCTION__, + unifi_warning(priv, "%s: ba session for tID=%d timeout=%d role=%d wind_size=%d start_sn=%d\n", __func__, tID, timeout, role, @@ -2793,7 +2793,7 @@ u8 blockack_session_start(unifi_priv_t *priv, ba_session_tx = interfacePriv->ba_session_tx[ba_session_idx]; if (ba_session_tx) { if ((!memcmp(ba_session_tx->macAddress.a, macAddress.a, ETH_ALEN)) && (ba_session_tx->tID == tID)){ - unifi_warning(priv, "%s: ba_session for Tx already exists\n", __FUNCTION__); + unifi_warning(priv, "%s: ba_session for Tx already exists\n", __func__); return TRUE; } } @@ -2809,14 +2809,14 @@ u8 blockack_session_start(unifi_priv_t *priv, } } if (ba_session_idx == MAX_SUPPORTED_BA_SESSIONS_TX){ - unifi_error(priv, "%s: All ba_session used for Tx, NO free session available\n", __FUNCTION__); + unifi_error(priv, "%s: All ba_session used for Tx, NO free session available\n", __func__); return FALSE; } /* create and populate the new BA session structure */ ba_session_tx = kzalloc(sizeof(ba_session_tx_struct), GFP_KERNEL); if (!ba_session_tx) { - unifi_error(priv, "%s: kmalloc failed for ba_session_tx\n", __FUNCTION__); + unifi_error(priv, "%s: kmalloc failed for ba_session_tx\n", __func__); return FALSE; } @@ -2832,7 +2832,7 @@ u8 blockack_session_start(unifi_priv_t *priv, ba_session_rx = interfacePriv->ba_session_rx[ba_session_idx]; if (ba_session_rx) { if ((!memcmp(ba_session_rx->macAddress.a, macAddress.a, ETH_ALEN)) && (ba_session_rx->tID == tID)){ - unifi_warning(priv, "%s: ba_session for Rx[tID = %d] already exists\n", __FUNCTION__, tID); + unifi_warning(priv, "%s: ba_session for Rx[tID = %d] already exists\n", __func__, tID); if(ba_session_rx->wind_size == wind_size && ba_session_rx->timeout == timeout && @@ -2883,7 +2883,7 @@ u8 blockack_session_start(unifi_priv_t *priv, } } if (ba_session_idx == MAX_SUPPORTED_BA_SESSIONS_RX){ - unifi_error(priv, "%s: All ba_session used for Rx, NO free session available\n", __FUNCTION__); + unifi_error(priv, "%s: All ba_session used for Rx, NO free session available\n", __func__); return FALSE; } @@ -2905,7 +2905,7 @@ u8 blockack_session_start(unifi_priv_t *priv, ba_session_rx = kzalloc(sizeof(ba_session_rx_struct), GFP_KERNEL); if (!ba_session_rx) { - unifi_error(priv, "%s: kmalloc failed for ba_session_rx\n", __FUNCTION__); + unifi_error(priv, "%s: kmalloc failed for ba_session_rx\n", __func__); return FALSE; } @@ -2916,7 +2916,7 @@ u8 blockack_session_start(unifi_priv_t *priv, ba_session_rx->buffer = kzalloc(ba_session_rx->wind_size*sizeof(frame_desc_struct), GFP_KERNEL); if (!ba_session_rx->buffer) { kfree(ba_session_rx); - unifi_error(priv, "%s: kmalloc failed for buffer\n", __FUNCTION__); + unifi_error(priv, "%s: kmalloc failed for buffer\n", __func__); return FALSE; } @@ -2944,7 +2944,7 @@ void CsrWifiRouterCtrlBlockAckEnableReqHandler(void* drvpriv, CsrWifiFsmEvent* m u8 r; unifi_priv_t *priv = (unifi_priv_t*)drvpriv; - unifi_trace(priv, UDBG6, ">>%s\n", __FUNCTION__); + unifi_trace(priv, UDBG6, ">>%s\n", __func__); down(&priv->ba_mutex); r = blockack_session_start(priv, req->interfaceTag, @@ -2961,7 +2961,7 @@ void CsrWifiRouterCtrlBlockAckEnableReqHandler(void* drvpriv, CsrWifiFsmEvent* m req->clientData, req->interfaceTag, r?CSR_RESULT_SUCCESS:CSR_RESULT_FAILURE); - unifi_trace(priv, UDBG6, "<<%s: r=%d\n", __FUNCTION__, r); + unifi_trace(priv, UDBG6, "<<%s: r=%d\n", __func__, r); } @@ -2975,7 +2975,7 @@ void CsrWifiRouterCtrlWapiMulticastFilterReqHandler(void* drvpriv, CsrWifiFsmEve if (CSR_WIFI_ROUTER_CTRL_MODE_STA == interfacePriv->interfaceMode) { - unifi_trace(priv, UDBG6, ">>%s\n", __FUNCTION__); + unifi_trace(priv, UDBG6, ">>%s\n", __func__); unifi_trace(priv, UDBG1, "CsrWifiRouterCtrlWapiMulticastFilterReq: req->status = %d\n", req->status); @@ -2983,10 +2983,10 @@ void CsrWifiRouterCtrlWapiMulticastFilterReqHandler(void* drvpriv, CsrWifiFsmEve * status 0 - Filter off */ priv->wapi_multicast_filter = req->status; - unifi_trace(priv, UDBG6, "<<%s\n", __FUNCTION__); + unifi_trace(priv, UDBG6, "<<%s\n", __func__); } else { - unifi_warning(priv, "%s is NOT applicable for interface mode - %d\n", __FUNCTION__,interfacePriv->interfaceMode); + unifi_warning(priv, "%s is NOT applicable for interface mode - %d\n", __func__,interfacePriv->interfaceMode); } #elif defined(UNIFI_DEBUG) @@ -3006,7 +3006,7 @@ void CsrWifiRouterCtrlWapiUnicastFilterReqHandler(void* drvpriv, CsrWifiFsmEvent if (CSR_WIFI_ROUTER_CTRL_MODE_STA == interfacePriv->interfaceMode) { - unifi_trace(priv, UDBG6, ">>%s\n", __FUNCTION__); + unifi_trace(priv, UDBG6, ">>%s\n", __func__); unifi_trace(priv, UDBG1, "CsrWifiRouterCtrlWapiUnicastFilterReq: req->status= %d\n", req->status); @@ -3019,10 +3019,10 @@ void CsrWifiRouterCtrlWapiUnicastFilterReqHandler(void* drvpriv, CsrWifiFsmEvent * status 0 - Filter OFF */ priv->wapi_unicast_filter = req->status; - unifi_trace(priv, UDBG6, "<<%s\n", __FUNCTION__); + unifi_trace(priv, UDBG6, "<<%s\n", __func__); } else { - unifi_warning(priv, "%s is NOT applicable for interface mode - %d\n", __FUNCTION__,interfacePriv->interfaceMode); + unifi_warning(priv, "%s is NOT applicable for interface mode - %d\n", __func__,interfacePriv->interfaceMode); } #elif defined(UNIFI_DEBUG) @@ -3060,17 +3060,17 @@ void CsrWifiRouterCtrlWapiRxPktReqHandler(void* drvpriv, CsrWifiFsmEvent* msg) if (CSR_WIFI_ROUTER_CTRL_MODE_STA == interfacePriv->interfaceMode) { - unifi_trace(priv, UDBG6, ">>%s\n", __FUNCTION__); + unifi_trace(priv, UDBG6, ">>%s\n", __func__); if (req->dataLength == 0 || req->data == NULL) { - unifi_error(priv, "CsrWifiRouterCtrlWapiRxPktReq: invalid request\n",__FUNCTION__); + unifi_error(priv, "CsrWifiRouterCtrlWapiRxPktReq: invalid request\n",__func__); return; } res = unifi_net_data_malloc(priv, &bulkdata.d[0], req->dataLength); if (res != CSR_RESULT_SUCCESS) { - unifi_error(priv, "CsrWifiRouterCtrlWapiRxPktReq: Could not allocate net data\n",__FUNCTION__); + unifi_error(priv, "CsrWifiRouterCtrlWapiRxPktReq: Could not allocate net data\n",__func__); return; } @@ -3086,7 +3086,7 @@ void CsrWifiRouterCtrlWapiRxPktReqHandler(void* drvpriv, CsrWifiFsmEvent* msg) unifi_error(priv,"CsrWifiRouterCtrlWapiRxPktReqHandler: Unknown signal with reception status = %d\n",pkt_ind->ReceptionStatus); return; } else { - unifi_trace(priv, UDBG4,"CsrWifiRouterCtrlWapiRxPktReqHandler: MIC verified , RX_SUCCESS \n",__FUNCTION__); + unifi_trace(priv, UDBG4,"CsrWifiRouterCtrlWapiRxPktReqHandler: MIC verified , RX_SUCCESS \n",__func__); pkt_ind->ReceptionStatus = CSR_RX_SUCCESS; write_pack(&signal, req->signal, &(req->signalLength)); } @@ -3111,9 +3111,9 @@ void CsrWifiRouterCtrlWapiRxPktReqHandler(void* drvpriv, CsrWifiFsmEvent* msg) unifi_net_data_free(priv, &bulkdata.d[0]); } - unifi_trace(priv, UDBG6, "<<%s\n", __FUNCTION__); + unifi_trace(priv, UDBG6, "<<%s\n", __func__); } else { - unifi_warning(priv, "%s is NOT applicable for interface mode - %d\n", __FUNCTION__,interfacePriv->interfaceMode); + unifi_warning(priv, "%s is NOT applicable for interface mode - %d\n", __func__,interfacePriv->interfaceMode); } #elif defined(UNIFI_DEBUG) /*WAPI Disabled*/ @@ -3139,18 +3139,18 @@ void CsrWifiRouterCtrlWapiUnicastTxPktReqHandler(void* drvpriv, CsrWifiFsmEvent* if (CSR_WIFI_ROUTER_CTRL_MODE_STA == interfacePriv->interfaceMode) { - unifi_trace(priv, UDBG6, ">>%s\n", __FUNCTION__); + unifi_trace(priv, UDBG6, ">>%s\n", __func__); if (priv == NULL) { - unifi_error(priv, "CsrWifiRouterCtrlWapiUnicastTxPktReqHandler : invalid priv\n",__FUNCTION__); + unifi_error(priv, "CsrWifiRouterCtrlWapiUnicastTxPktReqHandler : invalid priv\n",__func__); return; } if (priv->smepriv == NULL) { - unifi_error(priv, "CsrWifiRouterCtrlWapiUnicastTxPktReqHandler : invalid sme priv\n",__FUNCTION__); + unifi_error(priv, "CsrWifiRouterCtrlWapiUnicastTxPktReqHandler : invalid sme priv\n",__func__); return; } if (req->data == NULL) { - unifi_error(priv, "CsrWifiRouterCtrlWapiUnicastTxPktReqHandler: invalid request\n",__FUNCTION__); + unifi_error(priv, "CsrWifiRouterCtrlWapiUnicastTxPktReqHandler: invalid request\n",__func__); return; } else { /* If it is QoS data (type = data subtype = QoS), frame header contains QoS control field */ @@ -3159,7 +3159,7 @@ void CsrWifiRouterCtrlWapiUnicastTxPktReqHandler(void* drvpriv, CsrWifiFsmEvent* } } if ( !(req->dataLength>(macHeaderLengthInBytes+appendedCryptoFields)) ) { - unifi_error(priv, "CsrWifiRouterCtrlWapiUnicastTxPktReqHandler: invalid dataLength\n",__FUNCTION__); + unifi_error(priv, "CsrWifiRouterCtrlWapiUnicastTxPktReqHandler: invalid dataLength\n",__func__); return; } @@ -3174,7 +3174,7 @@ void CsrWifiRouterCtrlWapiUnicastTxPktReqHandler(void* drvpriv, CsrWifiFsmEvent* */ result = unifi_net_data_malloc(priv, &bulkdata.d[0], req->dataLength); if (result != CSR_RESULT_SUCCESS) { - unifi_error(priv, "CsrWifiRouterCtrlWapiUnicastTxPktReqHandler: Could not allocate net data\n",__FUNCTION__); + unifi_error(priv, "CsrWifiRouterCtrlWapiUnicastTxPktReqHandler: Could not allocate net data\n",__func__); return; } memcpy((void*)bulkdata.d[0].os_data_ptr, req->data, req->dataLength); @@ -3213,11 +3213,11 @@ void CsrWifiRouterCtrlWapiUnicastTxPktReqHandler(void* drvpriv, CsrWifiFsmEvent* unifi_trace(priv, UDBG1, "CsrWifiRouterCtrlWapiUnicastTxPktReqHandler: (Packet Drop), dropped count = %x\n", interfacePriv->stats.tx_dropped); } - unifi_trace(priv, UDBG6, "<<%s\n", __FUNCTION__); + unifi_trace(priv, UDBG6, "<<%s\n", __func__); } else { - unifi_warning(priv, "%s is NOT applicable for interface mode - %d\n", __FUNCTION__,interfacePriv->interfaceMode); + unifi_warning(priv, "%s is NOT applicable for interface mode - %d\n", __func__,interfacePriv->interfaceMode); } #elif defined(UNIFI_DEBUG) @@ -3238,16 +3238,16 @@ void CsrWifiRouterCtrlWapiFilterReqHandler(void* drvpriv, CsrWifiFsmEvent* msg) if (CSR_WIFI_ROUTER_CTRL_MODE_STA == interfacePriv->interfaceMode) { - unifi_trace(priv, UDBG6, ">>%s\n", __FUNCTION__); + unifi_trace(priv, UDBG6, ">>%s\n", __func__); unifi_trace(priv, UDBG1, "CsrWifiRouterCtrlWapiFilterReq: req->isWapiConnected [0/1] = %d \n",req->isWapiConnected); priv->isWapiConnection = req->isWapiConnected; - unifi_trace(priv, UDBG6, "<<%s\n", __FUNCTION__); + unifi_trace(priv, UDBG6, "<<%s\n", __func__); } else { - unifi_warning(priv, "%s is NOT applicable for interface mode - %d\n", __FUNCTION__,interfacePriv->interfaceMode); + unifi_warning(priv, "%s is NOT applicable for interface mode - %d\n", __func__,interfacePriv->interfaceMode); } #endif diff --git a/drivers/staging/csr/sme_wext.c b/drivers/staging/csr/sme_wext.c index 4129a6436..458bca062 100644 --- a/drivers/staging/csr/sme_wext.c +++ b/drivers/staging/csr/sme_wext.c @@ -24,7 +24,7 @@ #define CHECK_INITED(_priv) \ do { \ if (_priv->init_progress != UNIFI_INIT_COMPLETED) { \ - unifi_trace(_priv, UDBG2, "%s unifi not ready, failing wext call\n", __FUNCTION__); \ + unifi_trace(_priv, UDBG2, "%s unifi not ready, failing wext call\n", __func__); \ return -ENODEV; \ } \ } while (0) diff --git a/drivers/staging/csr/unifi_event.c b/drivers/staging/csr/unifi_event.c index e81a99878..7546cd876 100644 --- a/drivers/staging/csr/unifi_event.c +++ b/drivers/staging/csr/unifi_event.c @@ -233,7 +233,7 @@ static u8 check_routing_pkt_data_ind(unifi_priv_t *priv, unifi_trace(priv, UDBG6, "check_routing_pkt_data_ind - MIC FAILURE : Control Port State - 0x%.4X \n", uf_sme_port_state(priv,srcAddr,UF_CONTROLLED_PORT_Q,interfaceTag)); - unifi_error(priv, "MIC failure in %s\n", __FUNCTION__); + unifi_error(priv, "MIC failure in %s\n", __func__); /*Report the MIC failure to the SME*/ return TRUE; @@ -242,14 +242,14 @@ static u8 check_routing_pkt_data_ind(unifi_priv_t *priv, else { /* Its AP Mode . Just Return */ *freeBulkData = TRUE; - unifi_error(priv, "MIC failure in %s\n", __FUNCTION__); + unifi_error(priv, "MIC failure in %s\n", __func__); return TRUE; } /* AP mode */ }/* MIC error */ #else if (receptionStatus == CSR_MICHAEL_MIC_ERROR) { *freeBulkData = TRUE; - unifi_error(priv, "MIC failure in %s\n", __FUNCTION__); + unifi_error(priv, "MIC failure in %s\n", __func__); return TRUE; } #endif /*CSR_WIFI_SECURITY_WAPI_ENABLE*/ diff --git a/drivers/staging/csr/unifi_os.h b/drivers/staging/csr/unifi_os.h index 56a269820..70ed83076 100644 --- a/drivers/staging/csr/unifi_os.h +++ b/drivers/staging/csr/unifi_os.h @@ -65,7 +65,7 @@ extern int unifi_debug; do { \ if (!(cond)) { \ printk("Assertion failed in %s at %s:%d: %s\n", \ - __FUNCTION__, __FILE__, __LINE__, #cond); \ + __func__, __FILE__, __LINE__, #cond); \ } \ } while (0) diff --git a/drivers/staging/csr/unifi_pdu_processing.c b/drivers/staging/csr/unifi_pdu_processing.c index f9b421b5a..b17ae14ac 100644 --- a/drivers/staging/csr/unifi_pdu_processing.c +++ b/drivers/staging/csr/unifi_pdu_processing.c @@ -323,7 +323,7 @@ void verify_and_accomodate_tx_packet(unifi_priv_t *priv) kfree(tx_q_item); tx_q_item = NULL; if (!priv->noOfPktQueuedInDriver) { - unifi_error(priv, "packets queued in driver 0 still decrementing in %s\n", __FUNCTION__); + unifi_error(priv, "packets queued in driver 0 still decrementing in %s\n", __func__); } else { /* protection provided by spinlock */ priv->noOfPktQueuedInDriver--; @@ -331,7 +331,7 @@ void verify_and_accomodate_tx_packet(unifi_priv_t *priv) } /* Sta Record is available for all unicast (except genericMgt Frames) & in other case its NULL */ if (!staInfo->noOfPktQueued) { - unifi_error(priv, "packets queued in driver per station is 0 still decrementing in %s\n", __FUNCTION__); + unifi_error(priv, "packets queued in driver per station is 0 still decrementing in %s\n", __func__); } else { spin_lock(&priv->staRecord_lock); staInfo->noOfPktQueued--; @@ -642,7 +642,7 @@ void uf_handle_tim_cfm(unifi_priv_t *priv, CSR_MLME_SET_TIM_CONFIRM *cfm, u16 re /* Irrespective of interface the count maintained */ static u8 retryCount = 0; unsigned long lock_flags; - unifi_trace(priv, UDBG3, "entering %s, handle = %x, timSetStatus = %x\n", __FUNCTION__, handle, timSetStatus); + unifi_trace(priv, UDBG3, "entering %s, handle = %x, timSetStatus = %x\n", __func__, handle, timSetStatus); if (interfaceTag >= CSR_WIFI_NUM_INTERFACES) { unifi_warning(priv, "bad interfaceTag = %x\n", interfaceTag); @@ -818,7 +818,7 @@ void uf_handle_tim_cfm(unifi_priv_t *priv, CSR_MLME_SET_TIM_CONFIRM *cfm, u16 re unifi_warning(priv, "tim update request failed resultcode = %x\n", cfm->ResultCode); } - unifi_trace(priv, UDBG2, "leaving %s\n", __FUNCTION__); + unifi_trace(priv, UDBG2, "leaving %s\n", __func__); } /* @@ -1698,9 +1698,9 @@ CsrResult uf_process_ma_packet_req(unifi_priv_t *priv, break; default: /* In case of STA/IBSS/P2PCLI/AMP, no checks needed send the packet down & return */ - unifi_trace(priv, UDBG5, "In %s, interface mode is %x \n", __FUNCTION__, interfacePriv->interfaceMode); + unifi_trace(priv, UDBG5, "In %s, interface mode is %x \n", __func__, interfacePriv->interfaceMode); if (interfacePriv->interfaceMode == CSR_WIFI_ROUTER_CTRL_MODE_NONE) { - unifi_warning(priv, "In %s, interface mode NONE \n", __FUNCTION__); + unifi_warning(priv, "In %s, interface mode NONE \n", __func__); } if ((result = ul_send_signal_unpacked(priv, &signal, bulkdata))) { status = CSR_RESULT_FAILURE; @@ -1825,7 +1825,7 @@ CsrResult uf_process_ma_packet_req(unifi_priv_t *priv, unifi_trace(priv, UDBG5, "data unicast PDU in uf_process_ma_packet_req \n"); /* check peer power state, list status & peer port status */ if(!staRecord) { - unifi_error(priv, "In %s unicast but staRecord = NULL\n", __FUNCTION__); + unifi_error(priv, "In %s unicast but staRecord = NULL\n", __func__); return CSR_RESULT_FAILURE; } else if (queuePacketDozing || isRouterBufferEnabled(priv,priority_q)|| !list_empty(&staRecord->dataPdu[priority_q]) || IS_DTIM_ACTIVE(interfacePriv->dtimActive,interfacePriv->multicastPduHostTag)) { /* peer is in dozing mode, so queue packet in mgt frame list of station record */ @@ -3328,7 +3328,7 @@ void uf_prepare_send_cfm_list_for_queued_pkts(unifi_priv_t * priv, if (!(tx_q_item->transmissionControl & CSR_NO_CONFIRM_REQUIRED) && (tx_q_item->leSenderProcessId != priv->netdev_client->sender_id)){ unifi_trace(priv, UDBG1, "%s: SenderProcessID=%x host tag=%x transmission control=%x\n", - __FUNCTION__, + __func__, tx_q_item->leSenderProcessId, tx_q_item->hostTag, tx_q_item->transmissionControl); @@ -3373,7 +3373,7 @@ void uf_flush_list(unifi_priv_t * priv, struct list_head * list) kfree(tx_q_item); tx_q_item = NULL; if (!priv->noOfPktQueuedInDriver) { - unifi_error(priv, "packets queued in driver 0 still decrementing in %s\n", __FUNCTION__); + unifi_error(priv, "packets queued in driver 0 still decrementing in %s\n", __func__); } else { priv->noOfPktQueuedInDriver--; } diff --git a/drivers/staging/csr/unifi_sme.c b/drivers/staging/csr/unifi_sme.c index 902950356..7ddcfcb1b 100644 --- a/drivers/staging/csr/unifi_sme.c +++ b/drivers/staging/csr/unifi_sme.c @@ -195,7 +195,7 @@ sme_log_event(ul_client_t *pcli, /* Check if this is a confirm for EAPOL M4 frame and we need to send transmistted ind*/ if (interfacePriv->m4_sent && (cfm->HostTag == interfacePriv->m4_hostTag)) { - unifi_trace(priv, UDBG1, "%s: Sending M4 Transmit CFM\n", __FUNCTION__); + unifi_trace(priv, UDBG1, "%s: Sending M4 Transmit CFM\n", __func__); CsrWifiRouterCtrlM4TransmittedIndSend(priv->CSR_WIFI_SME_IFACEQUEUE, 0, interfaceTag, peerMacAddress, @@ -211,7 +211,7 @@ sme_log_event(ul_client_t *pcli, result, (cfm->HostTag & 0x3fffffff), cfm->Rate); } else { - unifi_trace(priv, UDBG1, "%s: M4 received from netdevice\n", __FUNCTION__); + unifi_trace(priv, UDBG1, "%s: M4 received from netdevice\n", __func__); } return; } diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c b/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c index 3251d2e07..d3e47f20c 100644 --- a/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c +++ b/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c @@ -775,7 +775,7 @@ static int ft1000_release (struct inode *inode, struct file *file) // initialize application information ft1000dev->appcnt--; - DEBUG("ft1000_chdev:%s:appcnt = %d\n", __FUNCTION__, ft1000dev->appcnt); + DEBUG("ft1000_chdev:%s:appcnt = %d\n", __func__, ft1000dev->appcnt); ft1000dev->app_info[i].fileobject = NULL; return 0; diff --git a/drivers/staging/keucr/scsiglue.c b/drivers/staging/keucr/scsiglue.c index 48e100534..51b13da6b 100644 --- a/drivers/staging/keucr/scsiglue.c +++ b/drivers/staging/keucr/scsiglue.c @@ -105,7 +105,7 @@ static int queuecommand_lck(struct scsi_cmnd *srb, /* check for state-transition errors */ if (us->srb != NULL) { /* pr_info("Error in %s: us->srb = %p\n" - __FUNCTION__, us->srb); */ + __func__, us->srb); */ return SCSI_MLQUEUE_HOST_BUSY; } diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211.h b/drivers/staging/rtl8192u/ieee80211/ieee80211.h index e1339c338..1a2c97974 100644 --- a/drivers/staging/rtl8192u/ieee80211/ieee80211.h +++ b/drivers/staging/rtl8192u/ieee80211/ieee80211.h @@ -539,7 +539,7 @@ do { if (ieee80211_debug_level & (level)) \ { \ int i; \ u8* pdata = (u8*) data; \ - printk(KERN_DEBUG "ieee80211: %s()\n", __FUNCTION__); \ + printk(KERN_DEBUG "ieee80211: %s()\n", __func__); \ for(i=0; i<(int)(datalen); i++) \ { \ printk("%2x ", pdata[i]); \ diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_ccmp.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_ccmp.c index fec017688..50ec108b2 100644 --- a/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_ccmp.c +++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_ccmp.c @@ -444,7 +444,7 @@ static char * ieee80211_ccmp_print_stats(char *p, void *priv) void ieee80211_ccmp_null(void) { -// printk("============>%s()\n", __FUNCTION__); +// printk("============>%s()\n", __func__); return; } diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_tkip.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_tkip.c index 555eb8038..6231af057 100644 --- a/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_tkip.c +++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_tkip.c @@ -773,6 +773,6 @@ void __exit ieee80211_crypto_tkip_exit(void) void ieee80211_tkip_null(void) { -// printk("============>%s()\n", __FUNCTION__); +// printk("============>%s()\n", __func__); return; } diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_wep.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_wep.c index 3801f125f..9d3a86639 100644 --- a/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_wep.c +++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_wep.c @@ -290,6 +290,6 @@ void __exit ieee80211_crypto_wep_exit(void) void ieee80211_wep_null(void) { -// printk("============>%s()\n", __FUNCTION__); +// printk("============>%s()\n", __func__); return; } diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c index ee7ce5fca..900adc12e 100644 --- a/drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c +++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c @@ -553,7 +553,7 @@ void ieee80211_indicate_packets(struct ieee80211_device *ieee, struct ieee80211_ u8 i = 0 , j=0; u16 ethertype; // if(index > 1) -// IEEE80211_DEBUG(IEEE80211_DL_REORDER,"%s(): hahahahhhh, We indicate packet from reorder list, index is %u\n",__FUNCTION__,index); +// IEEE80211_DEBUG(IEEE80211_DL_REORDER,"%s(): hahahahhhh, We indicate packet from reorder list, index is %u\n",__func__,index); for(j = 0; j<index; j++) { //added by amy for reorder @@ -614,7 +614,7 @@ void RxReorderIndicatePacket( struct ieee80211_device *ieee, u16 WinEnd = (pTS->RxIndicateSeq + WinSize -1)%4096; u8 index = 0; bool bMatchWinStart = false, bPktInBuf = false; - IEEE80211_DEBUG(IEEE80211_DL_REORDER,"%s(): Seq is %d,pTS->RxIndicateSeq is %d, WinSize is %d\n",__FUNCTION__,SeqNum,pTS->RxIndicateSeq,WinSize); + IEEE80211_DEBUG(IEEE80211_DL_REORDER,"%s(): Seq is %d,pTS->RxIndicateSeq is %d, WinSize is %d\n",__func__,SeqNum,pTS->RxIndicateSeq,WinSize); /* Rx Reorder initialize condition.*/ if(pTS->RxIndicateSeq == 0xffff) { pTS->RxIndicateSeq = SeqNum; @@ -667,11 +667,11 @@ void RxReorderIndicatePacket( struct ieee80211_device *ieee, IEEE80211_DEBUG(IEEE80211_DL_REORDER, "Packets indication!! IndicateSeq: %d, NewSeq: %d\n",\ pTS->RxIndicateSeq, SeqNum); prxbIndicateArray[0] = prxb; -// printk("========================>%s(): SeqNum is %d\n",__FUNCTION__,SeqNum); +// printk("========================>%s(): SeqNum is %d\n",__func__,SeqNum); index = 1; } else { /* Current packet is going to be inserted into pending list.*/ - //IEEE80211_DEBUG(IEEE80211_DL_REORDER,"%s(): We RX no ordered packed, insert to ordered list\n",__FUNCTION__); + //IEEE80211_DEBUG(IEEE80211_DL_REORDER,"%s(): We RX no ordered packed, insert to ordered list\n",__func__); if(!list_empty(&ieee->RxReorder_Unused_List)) { pReorderEntry = (PRX_REORDER_ENTRY)list_entry(ieee->RxReorder_Unused_List.next,RX_REORDER_ENTRY,List); list_del_init(&pReorderEntry->List); @@ -679,11 +679,11 @@ void RxReorderIndicatePacket( struct ieee80211_device *ieee, /* Make a reorder entry and insert into a the packet list.*/ pReorderEntry->SeqNum = SeqNum; pReorderEntry->prxb = prxb; - // IEEE80211_DEBUG(IEEE80211_DL_REORDER,"%s(): pREorderEntry->SeqNum is %d\n",__FUNCTION__,pReorderEntry->SeqNum); + // IEEE80211_DEBUG(IEEE80211_DL_REORDER,"%s(): pREorderEntry->SeqNum is %d\n",__func__,pReorderEntry->SeqNum); if(!AddReorderEntry(pTS, pReorderEntry)) { IEEE80211_DEBUG(IEEE80211_DL_REORDER, "%s(): Duplicate packet is dropped!! IndicateSeq: %d, NewSeq: %d\n", - __FUNCTION__, pTS->RxIndicateSeq, SeqNum); + __func__, pTS->RxIndicateSeq, SeqNum); list_add_tail(&pReorderEntry->List,&ieee->RxReorder_Unused_List); { int i; @@ -718,7 +718,7 @@ void RxReorderIndicatePacket( struct ieee80211_device *ieee, /* Check if there is any packet need indicate.*/ while(!list_empty(&pTS->RxPendingPktList)) { - IEEE80211_DEBUG(IEEE80211_DL_REORDER,"%s(): start RREORDER indicate\n",__FUNCTION__); + IEEE80211_DEBUG(IEEE80211_DL_REORDER,"%s(): start RREORDER indicate\n",__func__); pReorderEntry = (PRX_REORDER_ENTRY)list_entry(pTS->RxPendingPktList.prev,RX_REORDER_ENTRY,List); if( SN_LESS(pReorderEntry->SeqNum, pTS->RxIndicateSeq) || SN_EQUAL(pReorderEntry->SeqNum, pTS->RxIndicateSeq)) @@ -737,7 +737,7 @@ void RxReorderIndicatePacket( struct ieee80211_device *ieee, IEEE80211_DEBUG(IEEE80211_DL_REORDER,"Packets indication!! IndicateSeq: %d, NewSeq: %d\n",pTS->RxIndicateSeq, SeqNum); prxbIndicateArray[index] = pReorderEntry->prxb; - // printk("========================>%s(): pReorderEntry->SeqNum is %d\n",__FUNCTION__,pReorderEntry->SeqNum); + // printk("========================>%s(): pReorderEntry->SeqNum is %d\n",__func__,pReorderEntry->SeqNum); index++; list_add_tail(&pReorderEntry->List,&ieee->RxReorder_Unused_List); @@ -763,7 +763,7 @@ void RxReorderIndicatePacket( struct ieee80211_device *ieee, if(bPktInBuf && pTS->RxTimeoutIndicateSeq==0xffff) { // Set new pending timer. - IEEE80211_DEBUG(IEEE80211_DL_REORDER,"%s(): SET rx timeout timer\n", __FUNCTION__); + IEEE80211_DEBUG(IEEE80211_DL_REORDER,"%s(): SET rx timeout timer\n", __func__); pTS->RxTimeoutIndicateSeq = pTS->RxIndicateSeq; if(timer_pending(&pTS->RxPktPendingTimer)) del_timer_sync(&pTS->RxPktPendingTimer); @@ -837,8 +837,8 @@ u8 parse_subframe(struct sk_buff *skb, if(skb->len<(ETHERNET_HEADER_SIZE + nSubframe_Length)) { printk("%s: A-MSDU parse error!! pRfd->nTotalSubframe : %d\n",\ - __FUNCTION__,rxb->nr_subframes); - printk("%s: A-MSDU parse error!! Subframe Length: %d\n",__FUNCTION__, nSubframe_Length); + __func__,rxb->nr_subframes); + printk("%s: A-MSDU parse error!! Subframe Length: %d\n",__func__, nSubframe_Length); printk("nRemain_Length is %d and nSubframe_Length is : %d\n",skb->len,nSubframe_Length); printk("The Packet SeqNum is %d\n",SeqNum); return 0; @@ -1032,7 +1032,7 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb, else { PRX_TS_RECORD pRxTS = NULL; - //IEEE80211_DEBUG(IEEE80211_DL_REORDER,"%s(): QOS ENABLE AND RECEIVE QOS DATA , we will get Ts, tid:%d\n",__FUNCTION__, tid); + //IEEE80211_DEBUG(IEEE80211_DL_REORDER,"%s(): QOS ENABLE AND RECEIVE QOS DATA , we will get Ts, tid:%d\n",__func__, tid); if(GetTs( ieee, (PTS_COMMON_INFO*) &pRxTS, @@ -1042,7 +1042,7 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb, true)) { - // IEEE80211_DEBUG(IEEE80211_DL_REORDER,"%s(): pRxTS->RxLastFragNum is %d,frag is %d,pRxTS->RxLastSeqNum is %d,seq is %d\n",__FUNCTION__,pRxTS->RxLastFragNum,frag,pRxTS->RxLastSeqNum,WLAN_GET_SEQ_SEQ(sc)); + // IEEE80211_DEBUG(IEEE80211_DL_REORDER,"%s(): pRxTS->RxLastFragNum is %d,frag is %d,pRxTS->RxLastSeqNum is %d,seq is %d\n",__func__,pRxTS->RxLastFragNum,frag,pRxTS->RxLastSeqNum,WLAN_GET_SEQ_SEQ(sc)); if( (fc & (1<<11)) && (frag == pRxTS->RxLastFragNum) && (WLAN_GET_SEQ_SEQ(sc) == pRxTS->RxLastSeqNum) ) @@ -1057,7 +1057,7 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb, } else { - IEEE80211_DEBUG(IEEE80211_DL_ERR, "%s(): No TS!! Skip the check!!\n",__FUNCTION__); + IEEE80211_DEBUG(IEEE80211_DL_ERR, "%s(): No TS!! Skip the check!!\n",__func__); goto rx_dropped; } } @@ -1302,7 +1302,7 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb, rxb = kmalloc(sizeof(struct ieee80211_rxb), GFP_ATOMIC); if(rxb == NULL) { - IEEE80211_DEBUG(IEEE80211_DL_ERR,"%s(): kmalloc rxb error\n",__FUNCTION__); + IEEE80211_DEBUG(IEEE80211_DL_ERR,"%s(): kmalloc rxb error\n",__func__); goto rx_dropped; } /* to parse amsdu packets */ @@ -1368,7 +1368,7 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb, } else { - IEEE80211_DEBUG(IEEE80211_DL_REORDER,"%s(): REORDER ENABLE AND PTS not NULL, and we will enter RxReorderIndicatePacket()\n",__FUNCTION__); + IEEE80211_DEBUG(IEEE80211_DL_REORDER,"%s(): REORDER ENABLE AND PTS not NULL, and we will enter RxReorderIndicatePacket()\n",__func__); RxReorderIndicatePacket(ieee, rxb, pTS, SeqNum); } #ifndef JOHN_NOCPY @@ -1934,7 +1934,7 @@ int ieee80211_parse_info_param(struct ieee80211_device *ieee, info_element->data[1] == 0x13 && info_element->data[2] == 0x74)) { - printk("========>%s(): athros AP is exist\n",__FUNCTION__); + printk("========>%s(): athros AP is exist\n",__func__); network->atheros_cap_exist = true; } else diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c index 454f8895d..294e08def 100644 --- a/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c +++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c @@ -279,7 +279,7 @@ inline void softmac_mgmt_xmit(struct sk_buff *skb, struct ieee80211_device *ieee /* as for the completion function, it does not need * to check it any more. * */ - printk("%s():insert to waitqueue!\n",__FUNCTION__); + printk("%s():insert to waitqueue!\n",__func__); skb_queue_tail(&ieee->skb_waitQ[tcb_desc->queue_index], skb); } else { //printk("TX packet!\n"); @@ -677,7 +677,7 @@ inline struct sk_buff *ieee80211_authentication_req(struct ieee80211_network *be auth->algorithm = WLAN_AUTH_SHARED_KEY; else if(ieee->auth_mode == 2) auth->algorithm = WLAN_AUTH_OPEN;//0x80; - printk("=================>%s():auth->algorithm is %d\n",__FUNCTION__,auth->algorithm); + printk("=================>%s():auth->algorithm is %d\n",__func__,auth->algorithm); auth->transaction = cpu_to_le16(ieee->associate_seq); ieee->associate_seq++; @@ -1215,7 +1215,7 @@ inline struct sk_buff *ieee80211_association_req(struct ieee80211_network *beaco memcpy(tag, realtek_ie_buf,realtek_ie_len -2 ); } } -// printk("<=====%s(), %p, %p\n", __FUNCTION__, ieee->dev, ieee->dev->dev_addr); +// printk("<=====%s(), %p, %p\n", __func__, ieee->dev, ieee->dev->dev_addr); // IEEE80211_DEBUG_DATA(IEEE80211_DL_DATA, skb->data, skb->len); return skb; } @@ -1399,7 +1399,7 @@ void ieee80211_associate_procedure_wq(struct work_struct *work) ieee->data_hard_stop(ieee->dev); ieee80211_stop_scan(ieee); - printk("===>%s(), chan:%d\n", __FUNCTION__, ieee->current_network.channel); + printk("===>%s(), chan:%d\n", __func__, ieee->current_network.channel); //ieee->set_chan(ieee->dev, ieee->current_network.channel); HTSetConnectBwMode(ieee, HT_CHANNEL_WIDTH_20, HT_EXTCHNL_OFFSET_NO_EXT); @@ -2635,7 +2635,7 @@ void ieee80211_start_protocol(struct ieee80211_device *ieee) if (ieee->current_network.beacon_interval == 0) ieee->current_network.beacon_interval = 100; -// printk("===>%s(), chan:%d\n", __FUNCTION__, ieee->current_network.channel); +// printk("===>%s(), chan:%d\n", __func__, ieee->current_network.channel); // ieee->set_chan(ieee->dev,ieee->current_network.channel); for(i = 0; i < 17; i++) { diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c index c39e680bb..63c7bb3c2 100644 --- a/drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c +++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c @@ -188,7 +188,7 @@ int ieee80211_encrypt_fragment( if (!(crypt && crypt->ops)) { - printk("=========>%s(), crypt is null\n", __FUNCTION__); + printk("=========>%s(), crypt is null\n", __func__); return -1; } #ifdef CONFIG_IEEE80211_CRYPT_TKIP diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_wx.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_wx.c index e1fe54acb..e84eddd18 100644 --- a/drivers/staging/rtl8192u/ieee80211/ieee80211_wx.c +++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_wx.c @@ -792,7 +792,7 @@ int ieee80211_wx_set_auth(struct ieee80211_device *ieee, break; case IW_AUTH_80211_AUTH_ALG: - //printk("======>%s():data->value is %d\n",__FUNCTION__,data->value); + //printk("======>%s():data->value is %d\n",__func__,data->value); // ieee->open_wep = (data->value&IW_AUTH_ALG_OPEN_SYSTEM)?1:0; if(data->value & IW_AUTH_ALG_SHARED_KEY){ ieee->open_wep = 0; diff --git a/drivers/staging/rtl8192u/ieee80211/rtl819x_BAProc.c b/drivers/staging/rtl8192u/ieee80211/rtl819x_BAProc.c index 69735d320..b50aae141 100644 --- a/drivers/staging/rtl8192u/ieee80211/rtl819x_BAProc.c +++ b/drivers/staging/rtl8192u/ieee80211/rtl819x_BAProc.c @@ -113,7 +113,7 @@ static struct sk_buff* ieee80211_ADDBA(struct ieee80211_device* ieee, u8* Dst, P u16 tmp = 0; u16 len = ieee->tx_headroom + 9; //category(1) + action field(1) + Dialog Token(1) + BA Parameter Set(2) + BA Timeout Value(2) + BA Start SeqCtrl(2)(or StatusCode(2)) - IEEE80211_DEBUG(IEEE80211_DL_TRACE | IEEE80211_DL_BA, "========>%s(), frame(%d) sentd to:%pM, ieee->dev:%p\n", __FUNCTION__, type, Dst, ieee->dev); + IEEE80211_DEBUG(IEEE80211_DL_TRACE | IEEE80211_DL_BA, "========>%s(), frame(%d) sentd to:%pM, ieee->dev:%p\n", __func__, type, Dst, ieee->dev); if (pBA == NULL||ieee == NULL) { IEEE80211_DEBUG(IEEE80211_DL_ERR, "pBA(%p) is NULL or ieee(%p) is NULL\n", pBA, ieee); @@ -201,7 +201,7 @@ static struct sk_buff* ieee80211_DELBA( u16 len = 6 + ieee->tx_headroom; if (net_ratelimit()) - IEEE80211_DEBUG(IEEE80211_DL_TRACE | IEEE80211_DL_BA, "========>%s(), ReasonCode(%d) sentd to:%pM\n", __FUNCTION__, ReasonCode, dst); + IEEE80211_DEBUG(IEEE80211_DL_TRACE | IEEE80211_DL_BA, "========>%s(), ReasonCode(%d) sentd to:%pM\n", __func__, ReasonCode, dst); memset(&DelbaParamSet, 0, 2); @@ -240,7 +240,7 @@ static struct sk_buff* ieee80211_DELBA( IEEE80211_DEBUG_DATA(IEEE80211_DL_DATA|IEEE80211_DL_BA, skb->data, skb->len); if (net_ratelimit()) - IEEE80211_DEBUG(IEEE80211_DL_TRACE | IEEE80211_DL_BA, "<=====%s()\n", __FUNCTION__); + IEEE80211_DEBUG(IEEE80211_DL_TRACE | IEEE80211_DL_BA, "<=====%s()\n", __func__); return skb; } @@ -265,7 +265,7 @@ void ieee80211_send_ADDBAReq(struct ieee80211_device* ieee, u8* dst, PBA_RECORD } else { - IEEE80211_DEBUG(IEEE80211_DL_ERR, "alloc skb error in function %s()\n", __FUNCTION__); + IEEE80211_DEBUG(IEEE80211_DL_ERR, "alloc skb error in function %s()\n", __func__); } return; } @@ -289,7 +289,7 @@ void ieee80211_send_ADDBARsp(struct ieee80211_device* ieee, u8* dst, PBA_RECORD } else { - IEEE80211_DEBUG(IEEE80211_DL_ERR, "alloc skb error in function %s()\n", __FUNCTION__); + IEEE80211_DEBUG(IEEE80211_DL_ERR, "alloc skb error in function %s()\n", __func__); } return; @@ -316,7 +316,7 @@ void ieee80211_send_DELBA(struct ieee80211_device* ieee, u8* dst, PBA_RECORD pBA } else { - IEEE80211_DEBUG(IEEE80211_DL_ERR, "alloc skb error in function %s()\n", __FUNCTION__); + IEEE80211_DEBUG(IEEE80211_DL_ERR, "alloc skb error in function %s()\n", __func__); } return ; } @@ -376,7 +376,7 @@ int ieee80211_rx_ADDBAReq( struct ieee80211_device* ieee, struct sk_buff *skb) true) ) { rc = ADDBA_STATUS_REFUSED; - IEEE80211_DEBUG(IEEE80211_DL_ERR, "can't get TS in %s()\n", __FUNCTION__); + IEEE80211_DEBUG(IEEE80211_DL_ERR, "can't get TS in %s()\n", __func__); goto OnADDBAReq_Fail; } pBA = &pTS->RxAdmittedBARecord; @@ -387,7 +387,7 @@ int ieee80211_rx_ADDBAReq( struct ieee80211_device* ieee, struct sk_buff *skb) if(pBaParamSet->field.BAPolicy == BA_POLICY_DELAYED) { rc = ADDBA_STATUS_INVALID_PARAM; - IEEE80211_DEBUG(IEEE80211_DL_ERR, "BA Policy is not correct in %s()\n", __FUNCTION__); + IEEE80211_DEBUG(IEEE80211_DL_ERR, "BA Policy is not correct in %s()\n", __func__); goto OnADDBAReq_Fail; } // Admit the ADDBA Request @@ -475,7 +475,7 @@ int ieee80211_rx_ADDBARsp( struct ieee80211_device* ieee, struct sk_buff *skb) TX_DIR, false) ) { - IEEE80211_DEBUG(IEEE80211_DL_ERR, "can't get TS in %s()\n", __FUNCTION__); + IEEE80211_DEBUG(IEEE80211_DL_ERR, "can't get TS in %s()\n", __func__); ReasonCode = DELBA_REASON_UNKNOWN_BA; goto OnADDBARsp_Reject; } @@ -599,7 +599,7 @@ int ieee80211_rx_DELBA(struct ieee80211_device* ieee,struct sk_buff *skb) RX_DIR, false) ) { - IEEE80211_DEBUG(IEEE80211_DL_ERR, "can't get TS for RXTS in %s()\n", __FUNCTION__); + IEEE80211_DEBUG(IEEE80211_DL_ERR, "can't get TS for RXTS in %s()\n", __func__); return -1; } @@ -617,7 +617,7 @@ int ieee80211_rx_DELBA(struct ieee80211_device* ieee,struct sk_buff *skb) TX_DIR, false) ) { - IEEE80211_DEBUG(IEEE80211_DL_ERR, "can't get TS for TXTS in %s()\n", __FUNCTION__); + IEEE80211_DEBUG(IEEE80211_DL_ERR, "can't get TS for TXTS in %s()\n", __func__); return -1; } diff --git a/drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c b/drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c index 268b270e9..fc91aa849 100644 --- a/drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c +++ b/drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c @@ -130,7 +130,7 @@ void HTDebugHTCapability(u8* CapIE, u8* TitleString ) if(!memcmp(CapIE, EWC11NHTCap, sizeof(EWC11NHTCap))) { //EWC IE - IEEE80211_DEBUG(IEEE80211_DL_HT, "EWC IE in %s()\n", __FUNCTION__); + IEEE80211_DEBUG(IEEE80211_DL_HT, "EWC IE in %s()\n", __func__); pCapELE = (PHT_CAPABILITY_ELE)(&CapIE[4]); }else pCapELE = (PHT_CAPABILITY_ELE)(&CapIE[0]); @@ -167,7 +167,7 @@ void HTDebugHTInfo(u8* InfoIE, u8* TitleString) if(!memcmp(InfoIE, EWC11NHTInfo, sizeof(EWC11NHTInfo))) { // Not EWC IE - IEEE80211_DEBUG(IEEE80211_DL_HT, "EWC IE in %s()\n", __FUNCTION__); + IEEE80211_DEBUG(IEEE80211_DL_HT, "EWC IE in %s()\n", __func__); pHTInfoEle = (PHT_INFORMATION_ELE)(&InfoIE[4]); }else pHTInfoEle = (PHT_INFORMATION_ELE)(&InfoIE[0]); @@ -1131,7 +1131,7 @@ void HTInitializeHTInfo(struct ieee80211_device* ieee) // // These parameters will be reset when receiving deauthentication packet // - IEEE80211_DEBUG(IEEE80211_DL_HT, "===========>%s()\n", __FUNCTION__); + IEEE80211_DEBUG(IEEE80211_DL_HT, "===========>%s()\n", __func__); pHTInfo->bCurrentHTSupport = false; // 40MHz channel support @@ -1226,7 +1226,7 @@ void HTResetSelfAndSavePeerSetting(struct ieee80211_device* ieee, struct ieee802 // // Save Peer Setting before Association // - IEEE80211_DEBUG(IEEE80211_DL_HT, "==============>%s()\n", __FUNCTION__); + IEEE80211_DEBUG(IEEE80211_DL_HT, "==============>%s()\n", __func__); /*unmark bEnableHT flag here is the same reason why unmarked in function ieee80211_softmac_new_net. WB 2008.09.10*/ // if( pHTInfo->bEnableHT && pNetwork->bssht.bdSupportHT) if (pNetwork->bssht.bdSupportHT) @@ -1439,7 +1439,7 @@ void HTSetConnectBwModeCallback(struct ieee80211_device* ieee) { PRT_HIGH_THROUGHPUT pHTInfo = ieee->pHTInfo; - IEEE80211_DEBUG(IEEE80211_DL_HT, "======>%s()\n", __FUNCTION__); + IEEE80211_DEBUG(IEEE80211_DL_HT, "======>%s()\n", __func__); if(pHTInfo->bCurBW40MHz) { diff --git a/drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c b/drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c index 0310d0728..dd5d312a0 100644 --- a/drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c +++ b/drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c @@ -38,7 +38,7 @@ void RxPktPendingTimeout(unsigned long data) spin_lock_irqsave(&(ieee->reorder_spinlock), flags); //PlatformAcquireSpinLock(Adapter, RT_RX_SPINLOCK); - IEEE80211_DEBUG(IEEE80211_DL_REORDER,"==================>%s()\n",__FUNCTION__); + IEEE80211_DEBUG(IEEE80211_DL_REORDER,"==================>%s()\n",__func__); if(pRxTs->RxTimeoutIndicateSeq != 0xffff) { // Indicate the pending packets sequentially according to SeqNum until meet the gap. @@ -144,7 +144,7 @@ void TSInitialize(struct ieee80211_device *ieee) PRX_TS_RECORD pRxTS = ieee->RxTsRecord; PRX_REORDER_ENTRY pRxReorderEntry = ieee->RxReorderEntry; u8 count = 0; - IEEE80211_DEBUG(IEEE80211_DL_TS, "==========>%s()\n", __FUNCTION__); + IEEE80211_DEBUG(IEEE80211_DL_TS, "==========>%s()\n", __func__); // Initialize Tx TS related info. INIT_LIST_HEAD(&ieee->Tx_TS_Admit_List); INIT_LIST_HEAD(&ieee->Tx_TS_Pending_List); @@ -363,7 +363,7 @@ bool GetTs( // In WMM case: we use 4 TID only if (!IsACValid(TID)) { - IEEE80211_DEBUG(IEEE80211_DL_ERR, " in %s(), TID(%d) is not valid\n", __FUNCTION__, TID); + IEEE80211_DEBUG(IEEE80211_DL_ERR, " in %s(), TID(%d) is not valid\n", __func__, TID); return false; } @@ -465,7 +465,7 @@ bool GetTs( } else { - IEEE80211_DEBUG(IEEE80211_DL_ERR, "in function %s() There is not enough TS record to be used!!", __FUNCTION__); + IEEE80211_DEBUG(IEEE80211_DL_ERR, "in function %s() There is not enough TS record to be used!!", __func__); return false; } } @@ -624,5 +624,5 @@ void TsStartAddBaProcess(struct ieee80211_device* ieee, PTX_TS_RECORD pTxTS) } } else - IEEE80211_DEBUG(IEEE80211_DL_ERR, "%s()==>BA timer is already added\n", __FUNCTION__); + IEEE80211_DEBUG(IEEE80211_DL_ERR, "%s()==>BA timer is already added\n", __func__); } diff --git a/drivers/staging/rtl8192u/r8192U.h b/drivers/staging/rtl8192u/r8192U.h index bedeb330a..d1c70c63c 100644 --- a/drivers/staging/rtl8192u/r8192U.h +++ b/drivers/staging/rtl8192u/r8192U.h @@ -138,7 +138,7 @@ do { if(rt_global_debug_component & component) \ #define assert(expr) \ if (!(expr)) { \ printk( "Assertion failed! %s,%s,%s,line=%d\n", \ - #expr,__FILE__,__FUNCTION__,__LINE__); \ + #expr,__FILE__,__func__,__LINE__); \ } //wb added to debug out data buf //if you want print DATA buffer related BA, please set ieee80211_debug_level to DATA|BA @@ -147,7 +147,7 @@ do { if(rt_global_debug_component & component) \ { \ int i; \ u8* pdata = (u8*) data; \ - printk(KERN_DEBUG RTL819xU_MODULE_NAME ": %s()\n", __FUNCTION__); \ + printk(KERN_DEBUG RTL819xU_MODULE_NAME ": %s()\n", __func__); \ for(i=0; i<(int)(datalen); i++) \ { \ printk("%2x ", pdata[i]); \ diff --git a/drivers/staging/rtl8192u/r8192U_core.c b/drivers/staging/rtl8192u/r8192U_core.c index 71f5cde9e..e30c5620c 100644 --- a/drivers/staging/rtl8192u/r8192U_core.c +++ b/drivers/staging/rtl8192u/r8192U_core.c @@ -209,7 +209,7 @@ static void rtl819x_set_channel_map(u8 channel_plan, struct r8192_priv* priv) max_chan = 14; } else { - RT_TRACE(COMP_ERR, "unknown rf chip, can't set channel map in function:%s()\n", __FUNCTION__); + RT_TRACE(COMP_ERR, "unknown rf chip, can't set channel map in function:%s()\n", __func__); } if (ChannelPlan[channel_plan].Len != 0) { // Clear old channel map @@ -813,7 +813,7 @@ void rtl8192_set_chan(struct net_device *dev,short ch) { struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv(dev); // u32 tx; - RT_TRACE(COMP_CH, "=====>%s()====ch:%d\n", __FUNCTION__, ch); + RT_TRACE(COMP_CH, "=====>%s()====ch:%d\n", __func__, ch); priv->chan=ch; /* this hack should avoid frame TX during channel setting*/ @@ -1068,7 +1068,7 @@ static void rtl8192_rx_isr(struct urb *urb) priv->stats.rxstaterr++; priv->ieee80211->stats.rx_errors++; usb_free_urb(urb); - // printk("%s():rx status err\n",__FUNCTION__); + // printk("%s():rx status err\n",__func__); return; } skb_unlink(skb, &priv->rx_queue); @@ -1080,7 +1080,7 @@ static void rtl8192_rx_isr(struct urb *urb) skb = dev_alloc_skb(RX_URB_SIZE); if (unlikely(!skb)) { usb_free_urb(urb); - printk("%s():can,t alloc skb\n",__FUNCTION__); + printk("%s():can,t alloc skb\n",__func__); /* TODO check rx queue length and refill *somewhere* */ return; } @@ -1748,7 +1748,7 @@ unsigned int txqueue2outpipe(struct r8192_priv* priv,unsigned int tx_queue) { if(tx_queue >= 9) { - RT_TRACE(COMP_ERR,"%s():Unknown queue ID!!!\n",__FUNCTION__); + RT_TRACE(COMP_ERR,"%s():Unknown queue ID!!!\n",__func__); return 0x04; } return priv->txqueue_to_outpipemap[tx_queue]; @@ -1766,7 +1766,7 @@ short rtl819xU_tx_cmd(struct net_device *dev, struct sk_buff *skb) cb_desc *tcb_desc = (cb_desc *)(skb->cb + MAX_DEV_ADDR_SIZE); u8 queue_index = tcb_desc->queue_index; - //printk("\n %s::queue_index = %d\n",__FUNCTION__, queue_index); + //printk("\n %s::queue_index = %d\n",__func__, queue_index); atomic_inc(&priv->tx_pending[queue_index]); tx_urb = usb_alloc_urb(0,GFP_ATOMIC); if(!tx_urb){ @@ -1944,7 +1944,7 @@ short rtl8192_tx(struct net_device *dev, struct sk_buff* skb) //int urb_len; unsigned int idx_pipe; // RT_DEBUG_DATA(COMP_SEND, tcb_desc, sizeof(cb_desc)); -// printk("=============> %s\n", __FUNCTION__); +// printk("=============> %s\n", __func__); pend = atomic_read(&priv->tx_pending[tcb_desc->queue_index]); /* we are locked here so the two atomic_read and inc are executed * without interleaves @@ -2266,7 +2266,7 @@ void rtl8192_link_change(struct net_device *dev) EnableHWSecurityConfig8192(dev); } /*update timing params*/ -// RT_TRACE(COMP_CH, "========>%s(), chan:%d\n", __FUNCTION__, priv->chan); +// RT_TRACE(COMP_CH, "========>%s(), chan:%d\n", __func__, priv->chan); // rtl8192_set_chan(dev, priv->chan); if (ieee->iw_mode == IW_MODE_INFRA || ieee->iw_mode == IW_MODE_ADHOC) { @@ -2446,7 +2446,7 @@ static int rtl8192_qos_association_resp(struct r8192_priv *priv, spin_unlock_irqrestore(&priv->ieee80211->lock, flags); - RT_TRACE(COMP_QOS, "%s: network->flags = %d,%d\n",__FUNCTION__,network->flags ,priv->ieee80211->current_network.qos_data.active); + RT_TRACE(COMP_QOS, "%s: network->flags = %d,%d\n",__func__,network->flags ,priv->ieee80211->current_network.qos_data.active); if (set_qos_param == 1) queue_work(priv->priv_wq, &priv->qos_activate); @@ -2625,7 +2625,7 @@ void rtl8192_SetWirelessMode(struct net_device* dev, u8 wireless_mode) wireless_mode = WIRELESS_MODE_B; } else{ - RT_TRACE(COMP_ERR, "%s(), No valid wireless mode supported, SupportedWirelessMode(%x)!!!\n", __FUNCTION__,bSupportMode); + RT_TRACE(COMP_ERR, "%s(), No valid wireless mode supported, SupportedWirelessMode(%x)!!!\n", __func__,bSupportMode); wireless_mode = WIRELESS_MODE_B; } } @@ -2811,12 +2811,12 @@ static void rtl8192_get_eeprom_size(struct net_device* dev) { u16 curCR = 0; struct r8192_priv *priv = ieee80211_priv(dev); - RT_TRACE(COMP_EPROM, "===========>%s()\n", __FUNCTION__); + RT_TRACE(COMP_EPROM, "===========>%s()\n", __func__); curCR = read_nic_word_E(dev,EPROM_CMD); RT_TRACE(COMP_EPROM, "read from Reg EPROM_CMD(%x):%x\n", EPROM_CMD, curCR); //whether need I consider BIT5? priv->epromtype = (curCR & Cmd9346CR_9356SEL) ? EPROM_93c56 : EPROM_93c46; - RT_TRACE(COMP_EPROM, "<===========%s(), epromtype:%d\n", __FUNCTION__, priv->epromtype); + RT_TRACE(COMP_EPROM, "<===========%s(), epromtype:%d\n", __func__, priv->epromtype); } //used to swap endian. as ntohl & htonl are not necessary to swap endian, so use this instead. @@ -2833,7 +2833,7 @@ static void rtl8192_read_eeprom_info(struct net_device* dev) u8 bLoad_From_EEPOM = false; struct r8192_priv *priv = ieee80211_priv(dev); u16 tmpValue = 0; - RT_TRACE(COMP_EPROM, "===========>%s()\n", __FUNCTION__); + RT_TRACE(COMP_EPROM, "===========>%s()\n", __func__); wEPROM_ID = eprom_read(dev, 0); //first read EEPROM ID out; RT_TRACE(COMP_EPROM, "EEPROM ID is 0x%x\n", wEPROM_ID); @@ -3066,7 +3066,7 @@ static void rtl8192_read_eeprom_info(struct net_device* dev) init_rate_adaptive(dev); //we need init DIG RATR table here again. - RT_TRACE(COMP_EPROM, "<===========%s()\n", __FUNCTION__); + RT_TRACE(COMP_EPROM, "<===========%s()\n", __func__); return; } @@ -3232,7 +3232,7 @@ bool rtl8192_adapter_start(struct net_device *dev) struct r8192_priv *priv = ieee80211_priv(dev); u32 dwRegRead = 0; bool init_status = true; - RT_TRACE(COMP_INIT, "====>%s()\n", __FUNCTION__); + RT_TRACE(COMP_INIT, "====>%s()\n", __func__); priv->Rf_Mode = RF_OP_By_SW_3wire; //for ASIC power on sequence write_nic_byte_E(dev, 0x5f, 0x80); @@ -3252,7 +3252,7 @@ bool rtl8192_adapter_start(struct net_device *dev) else if (priv->pFirmware->firmware_status == FW_STATUS_5_READY) dwRegRead |= CPU_GEN_FIRMWARE_RESET; else - RT_TRACE(COMP_ERR, "ERROR in %s(): undefined firmware state(%d)\n", __FUNCTION__, priv->pFirmware->firmware_status); + RT_TRACE(COMP_ERR, "ERROR in %s(): undefined firmware state(%d)\n", __func__, priv->pFirmware->firmware_status); write_nic_dword(dev, CPU_GEN, dwRegRead); //mdelay(30); @@ -3269,7 +3269,7 @@ bool rtl8192_adapter_start(struct net_device *dev) else if (priv->LoopbackMode == RTL819xU_MAC_LOOPBACK) dwRegRead |= CPU_CCK_LOOPBACK; else - RT_TRACE(COMP_ERR, "Serious error in %s(): wrong loopback mode setting(%d)\n", __FUNCTION__, priv->LoopbackMode); + RT_TRACE(COMP_ERR, "Serious error in %s(): wrong loopback mode setting(%d)\n", __func__, priv->LoopbackMode); write_nic_dword(dev, CPU_GEN, dwRegRead); @@ -3309,7 +3309,7 @@ bool rtl8192_adapter_start(struct net_device *dev) // TODO: (it value is only for FPGA version). need to be changed!!2006.12.18, by Emily write_nic_byte(dev, ACK_TIMEOUT, 0x30); -// RT_TRACE(COMP_INIT, "%s():priv->ResetProgress is %d\n", __FUNCTION__,priv->ResetProgress); +// RT_TRACE(COMP_INIT, "%s():priv->ResetProgress is %d\n", __func__,priv->ResetProgress); if(priv->ResetProgress == RESET_TYPE_NORESET) rtl8192_SetWirelessMode(dev, priv->ieee80211->mode); if(priv->ResetProgress == RESET_TYPE_NORESET){ @@ -3363,10 +3363,10 @@ bool rtl8192_adapter_start(struct net_device *dev) init_status = init_firmware(dev); if(!init_status) { - RT_TRACE(COMP_ERR,"ERR!!! %s(): Firmware download is failed\n", __FUNCTION__); + RT_TRACE(COMP_ERR,"ERR!!! %s(): Firmware download is failed\n", __func__); return init_status; } - RT_TRACE(COMP_INIT, "%s():after firmware download\n", __FUNCTION__); + RT_TRACE(COMP_INIT, "%s():after firmware download\n", __func__); // #ifdef TO_DO_LIST if(Adapter->ResetProgress == RESET_TYPE_NORESET) @@ -3405,7 +3405,7 @@ if(Adapter->ResetProgress == RESET_TYPE_NORESET) //config RF. if(priv->ResetProgress == RESET_TYPE_NORESET){ rtl8192_phy_RFConfig(dev); - RT_TRACE(COMP_INIT, "%s():after phy RF config\n", __FUNCTION__); + RT_TRACE(COMP_INIT, "%s():after phy RF config\n", __func__); } @@ -3500,7 +3500,7 @@ HalTxCheckStuck819xUsb( struct r8192_priv *priv = ieee80211_priv(dev); u16 RegTxCounter = read_nic_word(dev, 0x128); bool bStuck = FALSE; - RT_TRACE(COMP_RESET,"%s():RegTxCounter is %d,TxCounter is %d\n",__FUNCTION__,RegTxCounter,priv->TxCounter); + RT_TRACE(COMP_RESET,"%s():RegTxCounter is %d,TxCounter is %d\n",__func__,RegTxCounter,priv->TxCounter); if(priv->TxCounter==RegTxCounter) bStuck = TRUE; @@ -3564,7 +3564,7 @@ HalRxCheckStuck819xUsb(struct net_device *dev) struct r8192_priv *priv = ieee80211_priv(dev); bool bStuck = FALSE; static u8 rx_chk_cnt; - RT_TRACE(COMP_RESET,"%s(): RegRxCounter is %d,RxCounter is %d\n",__FUNCTION__,RegRxCounter,priv->RxCounter); + RT_TRACE(COMP_RESET,"%s(): RegRxCounter is %d,RxCounter is %d\n",__func__,RegRxCounter,priv->RxCounter); // If rssi is small, we should check rx for long time because of bad rx. // or maybe it will continuous silent reset every 2 seconds. rx_chk_cnt++; @@ -3689,7 +3689,7 @@ rtl819x_ifcheck_resetornot(struct net_device *dev) if(TxResetType==RESET_TYPE_NORMAL || RxResetType==RESET_TYPE_NORMAL) return RESET_TYPE_NORMAL; else if(TxResetType==RESET_TYPE_SILENT || RxResetType==RESET_TYPE_SILENT){ - RT_TRACE(COMP_RESET,"%s():silent reset\n",__FUNCTION__); + RT_TRACE(COMP_RESET,"%s():silent reset\n",__func__); return RESET_TYPE_SILENT; } else @@ -3868,12 +3868,12 @@ RESET_START: down(&priv->wx_sem); if(priv->up == 0) { - RT_TRACE(COMP_ERR,"%s():the driver is not up! return\n",__FUNCTION__); + RT_TRACE(COMP_ERR,"%s():the driver is not up! return\n",__func__); up(&priv->wx_sem); return ; } priv->up = 0; - RT_TRACE(COMP_RESET,"%s():======>start to down the driver\n",__FUNCTION__); + RT_TRACE(COMP_RESET,"%s():======>start to down the driver\n",__func__); // if(!netif_queue_stopped(dev)) // netif_stop_queue(dev); @@ -3898,12 +3898,12 @@ RESET_START: printk("ieee->state is NOT LINKED\n"); ieee80211_softmac_stop_protocol(priv->ieee80211); } up(&priv->wx_sem); - RT_TRACE(COMP_RESET,"%s():<==========down process is finished\n",__FUNCTION__); + RT_TRACE(COMP_RESET,"%s():<==========down process is finished\n",__func__); //rtl8192_irq_disable(dev); - RT_TRACE(COMP_RESET,"%s():===========>start up the driver\n",__FUNCTION__); + RT_TRACE(COMP_RESET,"%s():===========>start up the driver\n",__func__); reset_status = _rtl8192_up(dev); - RT_TRACE(COMP_RESET,"%s():<===========up process is finished\n",__FUNCTION__); + RT_TRACE(COMP_RESET,"%s():<===========up process is finished\n",__func__); if(reset_status == -EAGAIN) { if(reset_times < 3) @@ -3913,7 +3913,7 @@ RESET_START: } else { - RT_TRACE(COMP_ERR," ERR!!! %s(): Reset Failed!!\n", __FUNCTION__); + RT_TRACE(COMP_ERR," ERR!!! %s(): Reset Failed!!\n", __func__); } } ieee->is_silent_reset = 1; @@ -4052,9 +4052,9 @@ extern void rtl819x_watchdog_wqcallback(struct work_struct *work) { #ifdef TODO if(rfState == eRfOff) - RT_TRACE(COMP_ERR,"========>%s()\n",__FUNCTION__); + RT_TRACE(COMP_ERR,"========>%s()\n",__func__); #endif - printk("===>%s(): AP is power off,connect another one\n",__FUNCTION__); + printk("===>%s(): AP is power off,connect another one\n",__func__); // Dot11d_Reset(dev); priv->ieee80211->state = IEEE80211_ASSOCIATING; notify_wx_assoc_event(priv->ieee80211); @@ -4075,12 +4075,12 @@ extern void rtl819x_watchdog_wqcallback(struct work_struct *work) check_reset_cnt = 3; //DbgPrint("Start to check silent reset\n"); } - // RT_TRACE(COMP_RESET,"%s():priv->force_reset is %d,priv->ResetProgress is %d, priv->bForcedSilentReset is %d,priv->bDisableNormalResetCheck is %d,ResetType is %d\n",__FUNCTION__,priv->force_reset,priv->ResetProgress,priv->bForcedSilentReset,priv->bDisableNormalResetCheck,ResetType); + // RT_TRACE(COMP_RESET,"%s():priv->force_reset is %d,priv->ResetProgress is %d, priv->bForcedSilentReset is %d,priv->bDisableNormalResetCheck is %d,ResetType is %d\n",__func__,priv->force_reset,priv->ResetProgress,priv->bForcedSilentReset,priv->bDisableNormalResetCheck,ResetType); if( (priv->force_reset) || (priv->ResetProgress==RESET_TYPE_NORESET && (priv->bForcedSilentReset || (!priv->bDisableNormalResetCheck && ResetType==RESET_TYPE_SILENT)))) // This is control by OID set in Pomelo { - RT_TRACE(COMP_RESET,"%s():priv->force_reset is %d,priv->ResetProgress is %d, priv->bForcedSilentReset is %d,priv->bDisableNormalResetCheck is %d,ResetType is %d\n",__FUNCTION__,priv->force_reset,priv->ResetProgress,priv->bForcedSilentReset,priv->bDisableNormalResetCheck,ResetType); + RT_TRACE(COMP_RESET,"%s():priv->force_reset is %d,priv->ResetProgress is %d, priv->bForcedSilentReset is %d,priv->bDisableNormalResetCheck is %d,ResetType is %d\n",__func__,priv->force_reset,priv->ResetProgress,priv->bForcedSilentReset,priv->bDisableNormalResetCheck,ResetType); rtl819x_ifsilentreset(dev); } priv->force_reset = false; @@ -4108,7 +4108,7 @@ int _rtl8192_up(struct net_device *dev) init_status = rtl8192_adapter_start(dev); if(!init_status) { - RT_TRACE(COMP_ERR,"ERR!!! %s(): initialization failed!\n", __FUNCTION__); + RT_TRACE(COMP_ERR,"ERR!!! %s(): initialization failed!\n", __func__); priv->up=priv->ieee80211->ieee_up = 0; return -EAGAIN; } @@ -4174,7 +4174,7 @@ int rtl8192_down(struct net_device *dev) priv->up=0; priv->ieee80211->ieee_up = 0; - RT_TRACE(COMP_DOWN, "==========>%s()\n", __FUNCTION__); + RT_TRACE(COMP_DOWN, "==========>%s()\n", __func__); /* FIXME */ if (!netif_queue_stopped(dev)) netif_stop_queue(dev); @@ -4203,7 +4203,7 @@ int rtl8192_down(struct net_device *dev) ieee80211_softmac_stop_protocol(priv->ieee80211); memset(&priv->ieee80211->current_network, 0 , offsetof(struct ieee80211_network, list)); - RT_TRACE(COMP_DOWN, "<==========%s()\n", __FUNCTION__); + RT_TRACE(COMP_DOWN, "<==========%s()\n", __func__); return 0; } @@ -5406,7 +5406,7 @@ void rtl8192_rx_nomal(struct sk_buff* skb) agg_skb = skb; //TotalLength = agg_skb->len - 4; /*sCrcLng*/ TotalLength = stats.Length - 4; /*sCrcLng*/ - //RT_TRACE(COMP_RECV, "%s:first aggregated packet!Length=%d\n",__FUNCTION__,TotalLength); + //RT_TRACE(COMP_RECV, "%s:first aggregated packet!Length=%d\n",__func__,TotalLength); /* though the head pointer has passed this position */ TempDWord = *(u32 *)(agg_skb->data - 4); PacketLength = (u16)(TempDWord & 0x3FFF); /*sCrcLng*/ @@ -5454,7 +5454,7 @@ void rtl8192_rx_nomal(struct sk_buff* skb) while (agg_skb->len>=GetRxPacketShiftBytes819xUsb(&stats, true)) { u8 tmpCRC = 0, tmpICV = 0; - //RT_TRACE(COMP_RECV,"%s:aggred pkt,total_len = %d\n",__FUNCTION__,agg_skb->len); + //RT_TRACE(COMP_RECV,"%s:aggred pkt,total_len = %d\n",__func__,agg_skb->len); RxDescr = (rx_desc_819x_usb_aggr_subframe *)(agg_skb->data); tmpCRC = RxDescr->CRC32; tmpICV = RxDescr->ICV; @@ -5903,7 +5903,7 @@ void EnableHWSecurityConfig8192(struct net_device *dev) ieee->hwsec_active = 0; SECR_value &= ~SCR_RxDecEnable; } - RT_TRACE(COMP_SEC,"%s:, hwsec:%d, pairwise_key:%d, SECR_value:%x\n", __FUNCTION__, \ + RT_TRACE(COMP_SEC,"%s:, hwsec:%d, pairwise_key:%d, SECR_value:%x\n", __func__, \ ieee->hwsec_active, ieee->pairwise_key_type, SECR_value); { write_nic_byte(dev, SECR, SECR_value);//SECR_value | SCR_UseDK ); diff --git a/drivers/staging/rtl8192u/r8192U_dm.c b/drivers/staging/rtl8192u/r8192U_dm.c index ea46717f1..fd7abb587 100644 --- a/drivers/staging/rtl8192u/r8192U_dm.c +++ b/drivers/staging/rtl8192u/r8192U_dm.c @@ -2666,7 +2666,7 @@ static void dm_check_edca_turbo( if(priv->ieee80211->pHTInfo->IOTAction & HT_IOT_ACT_DISABLE_EDCA_TURBO) goto dm_CheckEdcaTurbo_EXIT; -// printk("========>%s():bis_any_nonbepkts is %d\n",__FUNCTION__,priv->bis_any_nonbepkts); +// printk("========>%s():bis_any_nonbepkts is %d\n",__func__,priv->bis_any_nonbepkts); // Check the status for current condition. if(!priv->ieee80211->bis_any_nonbepkts) { @@ -3481,7 +3481,7 @@ extern void dm_fsync_timer_callback(unsigned long data) static void dm_StartHWFsync(struct net_device *dev) { - RT_TRACE(COMP_HALDM, "%s\n", __FUNCTION__); + RT_TRACE(COMP_HALDM, "%s\n", __func__); write_nic_dword(dev, rOFDM0_RxDetector2, 0x465c12cf); write_nic_byte(dev, 0xc3b, 0x41); } @@ -3490,7 +3490,7 @@ static void dm_EndSWFsync(struct net_device *dev) { struct r8192_priv *priv = ieee80211_priv(dev); - RT_TRACE(COMP_HALDM, "%s\n", __FUNCTION__); + RT_TRACE(COMP_HALDM, "%s\n", __func__); del_timer_sync(&(priv->fsync_timer)); // Let Register return to default value; @@ -3520,7 +3520,7 @@ static void dm_StartSWFsync(struct net_device *dev) u32 rateIndex; u32 rateBitmap; - RT_TRACE(COMP_HALDM,"%s\n", __FUNCTION__); + RT_TRACE(COMP_HALDM,"%s\n", __func__); // Initial rate record to zero, start to record. priv->rate_record = 0; // Initialize continue diff count to zero, start to record. @@ -3557,7 +3557,7 @@ static void dm_StartSWFsync(struct net_device *dev) static void dm_EndHWFsync(struct net_device *dev) { - RT_TRACE(COMP_HALDM,"%s\n", __FUNCTION__); + RT_TRACE(COMP_HALDM,"%s\n", __func__); write_nic_dword(dev, rOFDM0_RxDetector2, 0x465c52cd); write_nic_byte(dev, 0xc3b, 0x49); @@ -3797,7 +3797,7 @@ static void dm_dynamic_txpower(struct net_device *dev) txlowpower_threshold = TX_POWER_NEAR_FIELD_THRESH_LOW; } -// printk("=======>%s(): txhipower_threshhold is %d,txlowpower_threshold is %d\n",__FUNCTION__,txhipower_threshhold,txlowpower_threshold); +// printk("=======>%s(): txhipower_threshhold is %d,txlowpower_threshold is %d\n",__func__,txhipower_threshhold,txlowpower_threshold); RT_TRACE(COMP_TXAGC,"priv->undecorated_smoothed_pwdb = %ld \n" , priv->undecorated_smoothed_pwdb); if(priv->ieee80211->state == IEEE80211_LINKED) diff --git a/drivers/staging/rtl8192u/r8192U_wx.c b/drivers/staging/rtl8192u/r8192U_wx.c index c904aa8cc..aef463f46 100644 --- a/drivers/staging/rtl8192u/r8192U_wx.c +++ b/drivers/staging/rtl8192u/r8192U_wx.c @@ -285,7 +285,7 @@ static int r8192_wx_force_reset(struct net_device *dev, down(&priv->wx_sem); - printk("%s(): force reset ! extra is %d\n",__FUNCTION__, *extra); + printk("%s(): force reset ! extra is %d\n",__func__, *extra); priv->force_reset = *extra; up(&priv->wx_sem); return 0; @@ -892,7 +892,7 @@ static int r8192_wx_set_enc_ext(struct net_device *dev, int ret=0; struct r8192_priv *priv = ieee80211_priv(dev); struct ieee80211_device* ieee = priv->ieee80211; - //printk("===>%s()\n", __FUNCTION__); + //printk("===>%s()\n", __func__); down(&priv->wx_sem); @@ -971,7 +971,7 @@ static int r8192_wx_set_auth(struct net_device *dev, union iwreq_data *data, char *extra) { int ret=0; - //printk("====>%s()\n", __FUNCTION__); + //printk("====>%s()\n", __func__); struct r8192_priv *priv = ieee80211_priv(dev); down(&priv->wx_sem); ret = ieee80211_wx_set_auth(priv->ieee80211, info, &(data->param), extra); @@ -983,7 +983,7 @@ static int r8192_wx_set_mlme(struct net_device *dev, struct iw_request_info *info, union iwreq_data *wrqu, char *extra) { - //printk("====>%s()\n", __FUNCTION__); + //printk("====>%s()\n", __func__); int ret=0; struct r8192_priv *priv = ieee80211_priv(dev); @@ -998,13 +998,13 @@ static int r8192_wx_set_gen_ie(struct net_device *dev, struct iw_request_info *info, union iwreq_data *data, char *extra) { - //printk("====>%s(), len:%d\n", __FUNCTION__, data->length); + //printk("====>%s(), len:%d\n", __func__, data->length); int ret=0; struct r8192_priv *priv = ieee80211_priv(dev); down(&priv->wx_sem); ret = ieee80211_wx_set_gen_ie(priv->ieee80211, extra, data->data.length); up(&priv->wx_sem); - //printk("<======%s(), ret:%d\n", __FUNCTION__, ret); + //printk("<======%s(), ret:%d\n", __func__, ret); return ret; diff --git a/drivers/staging/rtl8192u/r819xU_firmware.c b/drivers/staging/rtl8192u/r819xU_firmware.c index 573e9cd68..a5cdd4469 100644 --- a/drivers/staging/rtl8192u/r819xU_firmware.c +++ b/drivers/staging/rtl8192u/r819xU_firmware.c @@ -204,7 +204,7 @@ bool CPUcheck_maincodeok_turnonCPU(struct net_device *dev) return rt_status; CPUCheckMainCodeOKAndTurnOnCPU_Fail: - RT_TRACE(COMP_ERR, "ERR in %s()\n", __FUNCTION__); + RT_TRACE(COMP_ERR, "ERR in %s()\n", __func__); rt_status = FALSE; return rt_status; } @@ -233,7 +233,7 @@ bool CPUcheck_firmware_ready(struct net_device *dev) return rt_status; CPUCheckFirmwareReady_Fail: - RT_TRACE(COMP_ERR, "ERR in %s()\n", __FUNCTION__); + RT_TRACE(COMP_ERR, "ERR in %s()\n", __func__); rt_status = false; return rt_status; @@ -393,7 +393,7 @@ bool init_firmware(struct net_device *dev) return rt_status; download_firmware_fail: - RT_TRACE(COMP_ERR, "ERR in %s()\n", __FUNCTION__); + RT_TRACE(COMP_ERR, "ERR in %s()\n", __func__); rt_status = FALSE; return rt_status; diff --git a/drivers/staging/rtl8192u/r819xU_phy.c b/drivers/staging/rtl8192u/r819xU_phy.c index 17fac41c1..1ed384c18 100644 --- a/drivers/staging/rtl8192u/r819xU_phy.c +++ b/drivers/staging/rtl8192u/r819xU_phy.c @@ -703,7 +703,7 @@ u8 rtl8192_phy_checkBBAndRF(struct net_device* dev, HW90_BLOCK_E CheckBlock, RF9 WriteAddr[HW90_BLOCK_PHY0] = 0x900; WriteAddr[HW90_BLOCK_PHY1] = 0x800; WriteAddr[HW90_BLOCK_RF] = 0x3; - RT_TRACE(COMP_PHY, "=======>%s(), CheckBlock:%d\n", __FUNCTION__, CheckBlock); + RT_TRACE(COMP_PHY, "=======>%s(), CheckBlock:%d\n", __func__, CheckBlock); for(i=0 ; i < CheckTimes ; i++) { @@ -901,7 +901,7 @@ void rtl8192_phy_setTxPower(struct net_device* dev, u8 channel) default: // case RF_8225: // case RF_8258: - RT_TRACE((COMP_PHY|COMP_ERR), "error RF chipID(8225 or 8258) in function %s()\n", __FUNCTION__); + RT_TRACE((COMP_PHY|COMP_ERR), "error RF chipID(8225 or 8258) in function %s()\n", __func__); break; } return; @@ -1253,7 +1253,7 @@ u8 rtl8192_phy_SwChnlStepByStep(struct net_device *dev, u8 channel, u8* stage, u // u32 RfRetVal; // u8 RetryCnt; - RT_TRACE(COMP_CH, "====>%s()====stage:%d, step:%d, channel:%d\n", __FUNCTION__, *stage, *step, channel); + RT_TRACE(COMP_CH, "====>%s()====stage:%d, step:%d, channel:%d\n", __func__, *stage, *step, channel); // RT_ASSERT(IsLegalChannel(Adapter, channel), ("illegal channel: %d\n", channel)); if (!IsLegalChannel(priv->ieee80211, channel)) { @@ -1435,7 +1435,7 @@ void rtl8192_SwChnl_WorkItem(struct net_device *dev) u8 rtl8192_phy_SwChnl(struct net_device* dev, u8 channel) { struct r8192_priv *priv = ieee80211_priv(dev); - RT_TRACE(COMP_CH, "=====>%s(), SwChnlInProgress:%d\n", __FUNCTION__, priv->SwChnlInProgress); + RT_TRACE(COMP_CH, "=====>%s(), SwChnlInProgress:%d\n", __func__, priv->SwChnlInProgress); if(!priv->up) return false; if(priv->SwChnlInProgress) diff --git a/drivers/staging/sb105x/sb_pci_mp.c b/drivers/staging/sb105x/sb_pci_mp.c index b90e96b7c..fefbef63b 100644 --- a/drivers/staging/sb105x/sb_pci_mp.c +++ b/drivers/staging/sb105x/sb_pci_mp.c @@ -1657,7 +1657,7 @@ static void mp_configure_port(struct uart_driver *drv, struct sb_uart_state *sta if (!port->iobase && !port->mapbase && !port->membase) { - DPRINTK("%s error \n",__FUNCTION__); + DPRINTK("%s error \n",__func__); return; } flags = UART_CONFIG_TYPE; diff --git a/drivers/staging/usbip/userspace/libsrc/usbip_common.h b/drivers/staging/usbip/userspace/libsrc/usbip_common.h index 938ad1c36..b519620d8 100644 --- a/drivers/staging/usbip/userspace/libsrc/usbip_common.h +++ b/drivers/staging/usbip/userspace/libsrc/usbip_common.h @@ -36,7 +36,7 @@ extern int usbip_use_debug ; #define pr_fmt(fmt) "%s: %s: " fmt "\n", PROGNAME #define dbg_fmt(fmt) pr_fmt("%s:%d:[%s] " fmt), "debug", \ - __FILE__, __LINE__, __FUNCTION__ + __FILE__, __LINE__, __func__ #define err(fmt, args...) \ do { \ diff --git a/drivers/staging/vt6656/device_cfg.h b/drivers/staging/vt6656/device_cfg.h index ea66b975f..5448b38b2 100644 --- a/drivers/staging/vt6656/device_cfg.h +++ b/drivers/staging/vt6656/device_cfg.h @@ -86,7 +86,7 @@ typedef enum _chip_type { #define ASSERT(x) { \ if (!(x)) { \ printk(KERN_ERR "assertion %s failed: file %s line %d\n", #x, \ - __FUNCTION__, __LINE__);\ + __func__, __LINE__);\ *(int *) 0 = 0; \ } \ } diff --git a/drivers/staging/vt6656/wcmd.c b/drivers/staging/vt6656/wcmd.c index 0013cb73d..10febb01a 100644 --- a/drivers/staging/vt6656/wcmd.c +++ b/drivers/staging/vt6656/wcmd.c @@ -1179,7 +1179,7 @@ void BSSvSecondTxData(struct vnt_private *pDevice) pDevice->nTxDataTimeCout++; if (pDevice->nTxDataTimeCout < 4) { //don't tx data if timer less than 40s - // printk("mike:%s-->no data Tx not exceed the desired Time as %d\n",__FUNCTION__, + // printk("mike:%s-->no data Tx not exceed the desired Time as %d\n",__func__, // (int)pDevice->nTxDataTimeCout); pDevice->sTimerTxData.expires = RUN_AT(10 * HZ); //10s callback add_timer(&pDevice->sTimerTxData); @@ -1191,7 +1191,7 @@ void BSSvSecondTxData(struct vnt_private *pDevice) if (((pDevice->bLinkPass == true) && (pMgmt->eAuthenMode < WMAC_AUTH_WPA)) || //open && sharekey linking (pDevice->fWPA_Authened == true)) { //wpa linking - // printk("mike:%s-->InSleep Tx Data Procedure\n",__FUNCTION__); + // printk("mike:%s-->InSleep Tx Data Procedure\n",__func__); pDevice->fTxDataInSleep = true; PSbSendNullPacket(pDevice); //send null packet pDevice->fTxDataInSleep = false; |