diff --git a/arch/arm64/mm/fault.c b/arch/arm64/mm/fault.c index 6b66b228a41a..872369b8c212 100644 --- a/arch/arm64/mm/fault.c +++ b/arch/arm64/mm/fault.c @@ -316,7 +316,7 @@ static void __do_user_fault(struct task_struct *tsk, unsigned long addr, pr_info("%s[%d]: unhandled %s (%d) at 0x%08lx, esr 0x%03x\n", tsk->comm, task_pid_nr(tsk), inf->name, sig, addr, esr); - show_pte(regs); + show_pte(addr); #ifdef CONFIG_AMLOGIC_USER_FAULT show_all_pfn(tsk, regs); #endif /* CONFIG_AMLOGIC_USER_FAULT */ diff --git a/drivers/amlogic/i2c/aml_slave.c b/drivers/amlogic/i2c/aml_slave.c index a82966ba7128..e4b7e7a88612 100644 --- a/drivers/amlogic/i2c/aml_slave.c +++ b/drivers/amlogic/i2c/aml_slave.c @@ -229,7 +229,7 @@ static int i2c_slave_probe(struct platform_device *pdev) return 0; } - +#if 0 static int __init i2c_auto_test_setup(char *s) { if (s != NULL) @@ -238,7 +238,7 @@ static int __init i2c_auto_test_setup(char *s) return 0; } __setup("i2c_auto_test=", i2c_auto_test_setup); - +#endif static int i2c_slave_remove(struct platform_device *pdev) { struct aml_i2c_slave *slave; diff --git a/drivers/amlogic/media/common/codec_mm/codec_mm_scatter.c b/drivers/amlogic/media/common/codec_mm/codec_mm_scatter.c index 1b8762c91fba..82edec1efbc3 100644 --- a/drivers/amlogic/media/common/codec_mm/codec_mm_scatter.c +++ b/drivers/amlogic/media/common/codec_mm/codec_mm_scatter.c @@ -2426,7 +2426,7 @@ int codec_mm_scatter_mgt_delay_free_swith( int is_tvp) { struct codec_mm_scatter_mgt *smgt; - unsigned long ret = 0; +// unsigned long ret = 0; smgt = codec_mm_get_scatter_mgt(is_tvp); codec_mm_list_lock(smgt); diff --git a/drivers/amlogic/media/video_sink/video.c b/drivers/amlogic/media/video_sink/video.c index 1ba37f6f043e..c7a25697aca7 100644 --- a/drivers/amlogic/media/video_sink/video.c +++ b/drivers/amlogic/media/video_sink/video.c @@ -6577,11 +6577,12 @@ static irqreturn_t vsync_isr_in(int irq, void *dev_id) } } if (omx_secret_mode == true) { + int diff = 0; + unsigned long delta1 = 0; + u32 system_time = timestamp_pcrscr_get(); video_notify_flag |= VIDEO_NOTIFY_TRICK_WAIT; atomic_set(&trickmode_framedone, 1); - int diff = 0; - unsigned long delta1 = 0; diff = system_time - omx_pts; if (time_setomxpts.tv_sec > 0) { diff --git a/drivers/amlogic/media/video_sink/video_keeper.c b/drivers/amlogic/media/video_sink/video_keeper.c index 1300cb4d0d09..262b93de5922 100644 --- a/drivers/amlogic/media/video_sink/video_keeper.c +++ b/drivers/amlogic/media/video_sink/video_keeper.c @@ -1152,10 +1152,6 @@ unsigned int vf_keep_pip_current_locked( return 0; } -#ifdef CONFIG_AMLOGIC_MEDIA_VIDEOCAPTURE - ext_frame_capture_poll(1); /*pull if have capture end frame */ -#endif - if (get_blackout_pip_policy()) { pr_info("policy: keep exit is skip current\n"); return 0; diff --git a/drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hdmi_tx_main.c b/drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hdmi_tx_main.c index c09c4c7a9b60..458c37f3a8db 100644 --- a/drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hdmi_tx_main.c +++ b/drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hdmi_tx_main.c @@ -462,9 +462,6 @@ static int set_disp_mode_auto(void) unsigned char mode[32]; enum hdmi_vic vic = HDMI_Unknown; enum hdmi_color_depth stream_cur_cd; - char* pix_fmt[] = {"RGB","YUV422","YUV444","YUV420"}; - char* eotf[] = {"SDR","HDR","HDR10","HLG"}; - char* range[] = {"default","limited","full"}; /* vic_ready got from IP */ enum hdmi_vic vic_ready = hdev->HWOp.GetState( @@ -481,7 +478,7 @@ static int set_disp_mode_auto(void) stream_cur_cd = hdev->para->cd; if (hdev->cur_video_param != NULL){ - pr_info("hdmitx: display colourdepth was %d in cur_param 0x%08x (VIC: %d)\n",hdev->cur_video_param->color_depth * 2, + pr_info("hdmitx: display colourdepth was %d in cur_param 0x%p (VIC: %d)\n",hdev->cur_video_param->color_depth * 2, hdev->cur_video_param, hdev->cur_video_param->VIC); } @@ -551,11 +548,11 @@ static int set_disp_mode_auto(void) if (hdev->cur_video_param != NULL){ if (strstr(hdmitx_device.fmt_attr,"bit") != NULL){ hdev->cur_video_param->color_depth = para->cd; - pr_info("hdmitx: display colourdepth set by attr to %d in cur_param 0x%08x (VIC: %d)\n",hdev->cur_video_param->color_depth * 2, + pr_info("hdmitx: display colourdepth set by attr to %d in cur_param 0x%p (VIC: %d)\n",hdev->cur_video_param->color_depth * 2, hdev->cur_video_param, hdev->cur_video_param->VIC); } else { hdev->cur_video_param->color_depth = COLORDEPTH_30B; - pr_info("hdmitx: display colourdepth is %d in cur_param 0x%08x (VIC: %d)\n",hdev->cur_video_param->color_depth * 2, + pr_info("hdmitx: display colourdepth is %d in cur_param 0x%p (VIC: %d)\n",hdev->cur_video_param->color_depth * 2, hdev->cur_video_param, hdev->cur_video_param->VIC); } if (hdev->cur_video_param->color_depth > COLORDEPTH_24B){ @@ -4216,7 +4213,7 @@ static int get_dt_vend_init_data(struct device_node *np, pr_info(SYS "not find product desc\n"); return 0; } - +#if 0 static void hdmitx_init_fmt_attr(struct hdmitx_dev *hdev) { if (strlen(hdev->fmt_attr) >= 8) { @@ -4262,7 +4259,7 @@ static void hdmitx_init_fmt_attr(struct hdmitx_dev *hdev) } pr_info(SYS "fmt_attr %s\n", hdev->fmt_attr); } - +#endif /* for notify to cec */ static BLOCKING_NOTIFIER_HEAD(hdmitx_event_notify_list); int hdmitx_event_notifier_regist(struct notifier_block *nb) @@ -4790,7 +4787,7 @@ static int amhdmitx_probe(struct platform_device *pdev) HDMITX_Meson_Init(&hdmitx_device); /* update fmt_attr */ - /*hdmitx_init_fmt_attr(&hdmitx_device); /**/ + /*hdmitx_init_fmt_attr(&hdmitx_device); */ hdmitx_device.task = kthread_run(hdmi_task_handle, &hdmitx_device, "kthread_hdmi"); @@ -5054,7 +5051,8 @@ static int __init hdmitx_boot_para_setup(char *s) && (strncmp(token, "off", token_len) == 0)) { init_flag |= INIT_FLAG_NOT_LOAD; } else if (strncmp(token, "cec", 3) == 0) { - kstrtoul(token+3, 16, &list); + int ret; + ret = kstrtoul(token+3, 16, &list); if ((list >= 0) && (list <= 0xff)) hdmitx_device.cec_func_config = list; pr_info("HDMI hdmi_cec_func_config:0x%x\n", diff --git a/drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hw/hdmi_tx_hw.c b/drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hw/hdmi_tx_hw.c index 6529de67790e..90e7641fdf5b 100644 --- a/drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hw/hdmi_tx_hw.c +++ b/drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hw/hdmi_tx_hw.c @@ -104,12 +104,8 @@ static int hdmitx_cntl_misc(struct hdmitx_dev *hdev, unsigned int cmd, /* store downstream ksv lists */ static char *rptx_ksvs; -static char rptx_ksv_prbuf[1271]; /* 127 * 5 * 2 + 1 */ MODULE_PARM_DESC(rptx_ksvs, "\n downstream ksvs\n"); module_param(rptx_ksvs, charp, 0444); -static int rptx_ksv_no; -static int rptx_ksvlist_retry; -static char rptx_ksv_buf[635]; #if defined(CONFIG_ARCH_MESON64_ODROID_COMMON) static int dvi_mode = VOUTMODE_NOINIT; diff --git a/drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hw/hw_clk.c b/drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hw/hw_clk.c index af6f20b2f82d..bf1dc31b9342 100644 --- a/drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hw/hw_clk.c +++ b/drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hw/hw_clk.c @@ -973,12 +973,12 @@ static void hdmitx_set_clk_(struct hdmitx_dev *hdev) enum hdmi_vic vic = hdev->cur_VIC; enum hdmi_color_space cs = hdev->para->cs; enum hdmi_color_depth cd; + struct hdmi_cea_timing *custom_timing; + if (hdev->cur_video_param->color_depth && hdev->cur_video_param->color_depth > 0) cd = hdev->cur_video_param->color_depth; else cd = hdev->para->cd; - struct hdmi_cea_timing *custom_timing; - frac_rate = hdev->frac_rate_policy; if (hdev->para->cs == COLORSPACE_YUV420) vic |= 256; diff --git a/drivers/amlogic/media_modules/frame_provider/decoder/mpeg4/vmpeg4.c b/drivers/amlogic/media_modules/frame_provider/decoder/mpeg4/vmpeg4.c index e0cbd857ef9d..53ff674b8793 100644 --- a/drivers/amlogic/media_modules/frame_provider/decoder/mpeg4/vmpeg4.c +++ b/drivers/amlogic/media_modules/frame_provider/decoder/mpeg4/vmpeg4.c @@ -976,7 +976,7 @@ static void vmpeg4_local_init(void) (((unsigned long) vmpeg4_amstream_dec_info.param) >> 16) & 0xffff; - keyframe_pts_only = (u32)vmpeg4_amstream_dec_info.param & 0x100; + keyframe_pts_only = ((u32)vmpeg4_amstream_dec_info.param) & 0x100; frame_width = frame_height = frame_dur = frame_prog = 0; diff --git a/drivers/amlogic/media_modules/frame_provider/decoder/vc1/vvc1.c b/drivers/amlogic/media_modules/frame_provider/decoder/vc1/vvc1.c index b9f457cf062b..fbc821fc6756 100644 --- a/drivers/amlogic/media_modules/frame_provider/decoder/vc1/vvc1.c +++ b/drivers/amlogic/media_modules/frame_provider/decoder/vc1/vvc1.c @@ -952,7 +952,7 @@ static void vvc1_local_init(void) vvc1_ratio = 0x100; avi_flag = (unsigned long) vvc1_amstream_dec_info.param & 0x1; - keyframe_pts_only = (u32)vvc1_amstream_dec_info.param & 0x100; + keyframe_pts_only = (unsigned long)vvc1_amstream_dec_info.param & 0x100; total_frame = 0; diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c index 9efbc04e30f4..15e574e09dc5 100644 --- a/fs/f2fs/super.c +++ b/fs/f2fs/super.c @@ -2287,10 +2287,8 @@ int sanity_check_ckpt(struct f2fs_sb_info *sbi) unsigned int main_segs, blocks_per_seg; unsigned int sit_segs, nat_segs; unsigned int sit_bitmap_size, nat_bitmap_size; - unsigned int log_blocks_per_seg; - unsigned int segment_count_main; + unsigned int log_blocks_per_seg = 0; unsigned int cp_pack_start_sum, cp_payload; - block_t user_block_count; int i, j; total = le32_to_cpu(raw_super->segment_count); diff --git a/mm/slab_common.c b/mm/slab_common.c index 35721fdcb862..3325f80e5cfe 100644 --- a/mm/slab_common.c +++ b/mm/slab_common.c @@ -1044,7 +1044,9 @@ static inline void *aml_slub_alloc_large(size_t size, gfp_t flags, int order) unsigned long used_pages = PAGE_ALIGN(size) / PAGE_SIZE; unsigned long total_pages = 1 << order; unsigned long saved = 0; + #ifdef CONFIG_AMLOGIC_PAGE_TRACE unsigned long fun = 0; + #endif int i; /* record how many pages in first page*/ diff --git a/net/ipv6/route.c b/net/ipv6/route.c index 1d342f0acbf0..32db18e2dfe3 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c @@ -1440,7 +1440,7 @@ EXPORT_SYMBOL_GPL(ip6_update_pmtu); void ip6_sk_update_pmtu(struct sk_buff *skb, struct sock *sk, __be32 mtu) { - int oif = sk->sk_bound_dev_if; +// int oif = sk->sk_bound_dev_if; struct dst_entry *dst; ip6_update_pmtu(skb, sock_net(sk), mtu,