diff --git a/drivers/media/platform/msm/camera_v2/pproc/cpp/msm_cpp.c b/drivers/media/platform/msm/camera_v2/pproc/cpp/msm_cpp.c index 25fc34b26bc1..2338ce272a46 100644 --- a/drivers/media/platform/msm/camera_v2/pproc/cpp/msm_cpp.c +++ b/drivers/media/platform/msm/camera_v2/pproc/cpp/msm_cpp.c @@ -449,11 +449,6 @@ static unsigned long msm_cpp_queue_buffer_info(struct cpp_device *cpp_dev, buff->map_info.buff_info = *buffer_info; buff->map_info.buf_fd = buffer_info->fd; - trace_printk("fd %d index %d native_buff %d ssid %d %d\n", - buffer_info->fd, buffer_info->index, - buffer_info->native_buff, buff_queue->session_id, - buff_queue->stream_id); - if (buff_queue->security_mode == SECURE_MODE) rc = cam_smmu_get_stage2_phy_addr(cpp_dev->iommu_hdl, buffer_info->fd, CAM_SMMU_MAP_RW, @@ -484,11 +479,6 @@ static void msm_cpp_dequeue_buffer_info(struct cpp_device *cpp_dev, { int ret = -1; - trace_printk("fd %d index %d native_buf %d ssid %d %d\n", - buff->map_info.buf_fd, buff->map_info.buff_info.index, - buff->map_info.buff_info.native_buff, buff_queue->session_id, - buff_queue->stream_id); - if (buff_queue->security_mode == SECURE_MODE) ret = cam_smmu_put_stage2_phy_addr(cpp_dev->iommu_hdl, buff->map_info.buf_fd); diff --git a/drivers/media/platform/msm/vidc/msm_vidc_debug.h b/drivers/media/platform/msm/vidc/msm_vidc_debug.h index 95b2a6d60936..365064760cbc 100644 --- a/drivers/media/platform/msm/vidc/msm_vidc_debug.h +++ b/drivers/media/platform/msm/vidc/msm_vidc_debug.h @@ -109,10 +109,6 @@ extern bool msm_vidc_debug_timeout; pr_info(VIDC_DBG_TAG __fmt, \ VIDC_MSG_PRIO2STRING(__level), \ ## arg); \ - } else if (msm_vidc_debug_out == VIDC_OUT_FTRACE) { \ - trace_printk(KERN_DEBUG VIDC_DBG_TAG __fmt, \ - VIDC_MSG_PRIO2STRING(__level), \ - ## arg); \ } \ } \ } while (0) diff --git a/drivers/soc/qcom/msm_bus/msm_bus_fabric_adhoc.c b/drivers/soc/qcom/msm_bus/msm_bus_fabric_adhoc.c index c41050adae5a..4eafb37d698a 100644 --- a/drivers/soc/qcom/msm_bus/msm_bus_fabric_adhoc.c +++ b/drivers/soc/qcom/msm_bus/msm_bus_fabric_adhoc.c @@ -52,13 +52,6 @@ ssize_t bw_show(struct device *dev, struct device_attribute *attr, bus_node->lnode_list[i].lnode_ab[ACTIVE_CTX], bus_node->lnode_list[i].lnode_ib[DUAL_CTX], bus_node->lnode_list[i].lnode_ab[DUAL_CTX]); - trace_printk( - "[%d]:%s:Act_IB %llu Act_AB %llu Slp_IB %llu Slp_AB %llu\n", - i, bus_node->lnode_list[i].cl_name, - bus_node->lnode_list[i].lnode_ib[ACTIVE_CTX], - bus_node->lnode_list[i].lnode_ab[ACTIVE_CTX], - bus_node->lnode_list[i].lnode_ib[DUAL_CTX], - bus_node->lnode_list[i].lnode_ab[DUAL_CTX]); } off += scnprintf((buf + off), PAGE_SIZE, "Max_Act_IB %llu Sum_Act_AB %llu Act_Util_fact %d Act_Vrail_comp %d\n", @@ -72,18 +65,6 @@ ssize_t bw_show(struct device *dev, struct device_attribute *attr, bus_node->node_bw[DUAL_CTX].sum_ab, bus_node->node_bw[DUAL_CTX].util_used, bus_node->node_bw[DUAL_CTX].vrail_used); - trace_printk( - "Max_Act_IB %llu Sum_Act_AB %llu Act_Util_fact %d Act_Vrail_comp %d\n", - bus_node->node_bw[ACTIVE_CTX].max_ib, - bus_node->node_bw[ACTIVE_CTX].sum_ab, - bus_node->node_bw[ACTIVE_CTX].util_used, - bus_node->node_bw[ACTIVE_CTX].vrail_used); - trace_printk( - "Max_Slp_IB %llu Sum_Slp_AB %lluSlp_Util_fact %d Slp_Vrail_comp %d\n", - bus_node->node_bw[DUAL_CTX].max_ib, - bus_node->node_bw[DUAL_CTX].sum_ab, - bus_node->node_bw[DUAL_CTX].util_used, - bus_node->node_bw[DUAL_CTX].vrail_used); return off; } diff --git a/mm/swap_ratio.c b/mm/swap_ratio.c index cf2a6e2ae135..eae1fc183104 100644 --- a/mm/swap_ratio.c +++ b/mm/swap_ratio.c @@ -67,8 +67,6 @@ static int calculate_write_pending(struct swap_info_struct *si, si->write_pending = si->max_writes; n->write_pending = n->max_writes; - trace_printk("%u, %u\n", si->max_writes, n->max_writes); - return 0; } diff --git a/sound/soc/msm/qdsp6v2/msm-pcm-q6-noirq.c b/sound/soc/msm/qdsp6v2/msm-pcm-q6-noirq.c index ce9091b1ca16..ebcaf0adf096 100644 --- a/sound/soc/msm/qdsp6v2/msm-pcm-q6-noirq.c +++ b/sound/soc/msm/qdsp6v2/msm-pcm-q6-noirq.c @@ -52,15 +52,6 @@ struct snd_msm { #define CMD_EOS_MIN_TIMEOUT_LENGTH 50 #define CMD_EOS_TIMEOUT_MULTIPLIER (HZ * 50) -#define ATRACE_END() \ - trace_printk("tracing_mark_write: E\n") -#define ATRACE_BEGIN(name) \ - trace_printk("tracing_mark_write: B|%d|%s\n", current->tgid, name) -#define ATRACE_FUNC() ATRACE_BEGIN(__func__) -#define ATRACE_INT(name, value) \ - trace_printk("tracing_mark_write: C|%d|%s|%d\n", \ - current->tgid, name, (int)(value)) - #define SIO_PLAYBACK_MAX_PERIOD_SIZE PLAYBACK_MAX_PERIOD_SIZE #define SIO_PLAYBACK_MIN_PERIOD_SIZE 48 #define SIO_PLAYBACK_MAX_NUM_PERIODS 512