diff --git a/drivers/amlogic/cec/m8_ao_cec.c b/drivers/amlogic/cec/m8_ao_cec.c
index b0a7c2c1440e..7f1e27df2ca2 100644
--- a/drivers/amlogic/cec/m8_ao_cec.c
+++ b/drivers/amlogic/cec/m8_ao_cec.c
@@ -1734,7 +1734,7 @@ static void aocec_late_resume(struct early_suspend *h)
 }
 #endif
 
-static __init int aml_cec_probe(struct platform_device *pdev)
+static int aml_cec_probe(struct platform_device *pdev)
 {
 	struct device *cdev;
 #ifdef CONFIG_OF
@@ -1935,7 +1935,7 @@ static const struct dev_pm_ops aml_cec_pm = {
 #endif
 
 #ifdef CONFIG_OF
-static const struct of_device_id aml_cec_dt_match[] __initconst = {
+static const struct of_device_id aml_cec_dt_match[] = {
 	{
 		.compatible = "amlogic, amlogic-aocec",
 	},
diff --git a/drivers/amlogic/cpufreq/m8b_cpufreq.c b/drivers/amlogic/cpufreq/m8b_cpufreq.c
index 5f5354077889..8412c9d7131a 100644
--- a/drivers/amlogic/cpufreq/m8b_cpufreq.c
+++ b/drivers/amlogic/cpufreq/m8b_cpufreq.c
@@ -278,7 +278,7 @@ static struct cpufreq_driver meson_cpufreq_driver = {
 	.resume  = meson_cpufreq_resume
 };
 
-static int __init meson_cpufreq_probe(struct platform_device *pdev)
+static int meson_cpufreq_probe(struct platform_device *pdev)
 {
 	int err = 0;
 	int target, size = 0;
diff --git a/drivers/amlogic/input/remote/remote_meson.c b/drivers/amlogic/input/remote/remote_meson.c
index 0bf4008fc2b0..02c7f5977566 100644
--- a/drivers/amlogic/input/remote/remote_meson.c
+++ b/drivers/amlogic/input/remote/remote_meson.c
@@ -613,6 +613,7 @@ static int remote_resume(struct device *dev)
 	}
 	spin_unlock_irqrestore(&chip->slock, flags);
 
+#ifdef CONFIG_AMLOGIC_LEGACY_EARLY_SUSPEND
 	if (get_resume_method() == REMOTE_WAKEUP) {
 		input_event(chip->r_dev->input_device,
 		    EV_KEY, KEY_POWER, 1);
@@ -628,6 +629,7 @@ static int remote_resume(struct device *dev)
 		input_event(chip->r_dev->input_device, EV_KEY, 133, 0);
 		input_sync(chip->r_dev->input_device);
 	}
+#endif
 
 	irq_set_affinity(chip->irqno, cpumask_of(chip->irq_cpumask));
 	enable_irq(chip->irqno);
diff --git a/drivers/amlogic/media/osd/osd_fb.c b/drivers/amlogic/media/osd/osd_fb.c
index b51d8d14dbb0..6ffa93094f44 100644
--- a/drivers/amlogic/media/osd/osd_fb.c
+++ b/drivers/amlogic/media/osd/osd_fb.c
@@ -2654,7 +2654,8 @@ exit:
 	return r;
 }
 
-static int rmem_fb_device_init(struct reserved_mem *rmem, struct device *dev)
+static int __init
+rmem_fb_device_init(struct reserved_mem *rmem, struct device *dev)
 {
 	if (!of_get_flat_dt_prop(rmem->fdt_node, "no-map", NULL)) {
 		fb_map_flag = true;