diff --git a/arch/arm64/kernel/hibernate.c b/arch/arm64/kernel/hibernate.c
index 95b5f7679e39..90f980bedb20 100644
--- a/arch/arm64/kernel/hibernate.c
+++ b/arch/arm64/kernel/hibernate.c
@@ -303,7 +303,6 @@ int swsusp_arch_suspend(void)
 		sleep_cpu = smp_processor_id();
 		ret = swsusp_save();
 	} else {
-		place_marker("M - Image Kernel Start");
 		/* Clean kernel core startup/idle code to PoC*/
 		dcache_clean_range(__mmuoff_data_start, __mmuoff_data_end);
 		dcache_clean_range(__idmap_text_start, __idmap_text_end);
@@ -339,7 +338,6 @@ int swsusp_arch_suspend(void)
 	}
 
 	local_dbg_restore(flags);
-	place_marker("PM: Kernel restore start!");
 
 	return ret;
 }
diff --git a/drivers/gnsssirf/gnss_sirf.c b/drivers/gnsssirf/gnss_sirf.c
index d10749166767..91d6198eaa7c 100644
--- a/drivers/gnsssirf/gnss_sirf.c
+++ b/drivers/gnsssirf/gnss_sirf.c
@@ -238,10 +238,6 @@ static int gnss_sirf_probe(struct platform_device *pdev)
 			onOffPin = of_get_named_gpio(pdev->dev.of_node,
 					 "ssVonoff-gpio", 0);
 			ret = configurePins(pdev);
-			if (ret == 0) {
-				snprintf(boot_marker, sizeof(boot_marker),
-						"M - DRIVER GNSS Ready");
-				place_marker(boot_marker);
 			}
 		}
 	}
diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c
index 423d225dedc7..a2973c859d79 100644
--- a/drivers/gpu/drm/msm/msm_drv.c
+++ b/drivers/gpu/drm/msm/msm_drv.c
@@ -948,7 +948,6 @@ static int msm_drm_init(struct device *dev, struct drm_driver *drv)
 	}
 
 	drm_kms_helper_poll_init(ddev);
-	place_marker("M - DISPLAY Driver Ready");
 
 	return 0;
 
diff --git a/drivers/gpu/msm/adreno.c b/drivers/gpu/msm/adreno.c
index 0e364772706e..1ae774892ecd 100644
--- a/drivers/gpu/msm/adreno.c
+++ b/drivers/gpu/msm/adreno.c
@@ -1190,7 +1190,6 @@ static int adreno_probe(struct platform_device *pdev)
 	struct adreno_device *adreno_dev;
 	int status;
 
-	place_marker("M - DRIVER GPU Init");
 
 	adreno_dev = adreno_get_dev(pdev);
 
@@ -1319,7 +1318,6 @@ static int adreno_probe(struct platform_device *pdev)
 			"Failed to get gpuhtw LLC slice descriptor %ld\n",
 			PTR_ERR(adreno_dev->gpuhtw_llc_slice));
 
-	place_marker("M - DRIVER GPU Ready");
 out:
 	if (status) {
 		adreno_ringbuffer_close(adreno_dev);
@@ -1528,7 +1526,6 @@ static int adreno_init(struct kgsl_device *device)
 	if (test_bit(ADRENO_DEVICE_INITIALIZED, &adreno_dev->priv))
 		return 0;
 
-	place_marker("M - DRIVER ADRENO Init");
 
 	/*
 	 * Either the microcode read failed because the usermodehelper isn't
@@ -1603,7 +1600,6 @@ static int adreno_init(struct kgsl_device *device)
 
 	}
 
-	place_marker("M - DRIVER ADRENO Ready");
 
 	return 0;
 }
diff --git a/drivers/gpu/msm/kgsl.c b/drivers/gpu/msm/kgsl.c
index f75e68e86d73..c346f4174e41 100644
--- a/drivers/gpu/msm/kgsl.c
+++ b/drivers/gpu/msm/kgsl.c
@@ -5116,7 +5116,6 @@ static int __init kgsl_core_init(void)
 	int result = 0;
 	struct sched_param param = { .sched_priority = 2 };
 
-	place_marker("M - DRIVER KGSL Init");
 
 	/* alloc major and minor device numbers */
 	result = alloc_chrdev_region(&kgsl_driver.major, 0, KGSL_DEVICE_MAX,
@@ -5203,7 +5202,6 @@ static int __init kgsl_core_init(void)
 
 	kgsl_memfree_init();
 
-	place_marker("M - DRIVER KGSL Ready");
 
 	return 0;
 
diff --git a/drivers/i2c/busses/i2c-qcom-geni.c b/drivers/i2c/busses/i2c-qcom-geni.c
index 3b07969a48c0..dd7ee148b780 100644
--- a/drivers/i2c/busses/i2c-qcom-geni.c
+++ b/drivers/i2c/busses/i2c-qcom-geni.c
@@ -811,9 +811,6 @@ static int geni_i2c_probe(struct platform_device *pdev)
 		return -ENOMEM;
 
 	gi2c->dev = &pdev->dev;
-	snprintf(boot_marker, sizeof(boot_marker),
-				"M - DRIVER GENI_I2C Init");
-	place_marker(boot_marker);
 
 	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 	if (!res)
@@ -954,9 +951,6 @@ static int geni_i2c_probe(struct platform_device *pdev)
 	pm_runtime_enable(gi2c->dev);
 	i2c_add_adapter(&gi2c->adap);
 
-	snprintf(boot_marker, sizeof(boot_marker),
-				"M - DRIVER GENI_I2C_%d Ready", gi2c->adap.nr);
-	place_marker(boot_marker);
 	dev_dbg(gi2c->dev, "I2C probed\n");
 	return 0;
 }
diff --git a/drivers/media/platform/msm/vidc/msm_v4l2_vidc.c b/drivers/media/platform/msm/vidc/msm_v4l2_vidc.c
index c8306b70ddf4..8c601e3d8779 100644
--- a/drivers/media/platform/msm/vidc/msm_v4l2_vidc.c
+++ b/drivers/media/platform/msm/vidc/msm_v4l2_vidc.c
@@ -534,7 +534,6 @@ static int msm_vidc_probe_vidc_device(struct platform_device *pdev)
 	struct device *dev;
 	int nr = BASE_DEVICE_NUMBER;
 
-	place_marker("M - DRIVER Video Start");
 
 	if (!vidc_driver) {
 		dprintk(VIDC_ERR, "Invalid vidc driver\n");
@@ -642,7 +641,6 @@ static int msm_vidc_probe_vidc_device(struct platform_device *pdev)
 		goto err_fail_sub_device_probe;
 	}
 
-	place_marker("M - DRIVER Video Ready");
 	return rc;
 
 err_fail_sub_device_probe:
@@ -785,7 +783,6 @@ static int msm_vidc_pm_suspend(struct device *dev)
 
 static int msm_vidc_pm_resume(struct device *dev)
 {
-	place_marker("vidc resumed");
 	dprintk(VIDC_INFO, "%s\n", __func__);
 	return 0;
 }
@@ -855,11 +852,9 @@ static int msm_vidc_pm_freeze(struct device *dev)
 		return 0;
 
 	if (of_device_is_compatible(dev->of_node, "qcom,msm-vidc")) {
-		place_marker("vidc hibernation start");
 
 		rc = msm_vidc_freeze_core(core);
 
-		place_marker("vidc hibernation end");
 	}
 
 	dprintk(VIDC_INFO, "%s: done\n", __func__);
diff --git a/drivers/platform/msm/ep_pcie/ep_pcie_core.c b/drivers/platform/msm/ep_pcie/ep_pcie_core.c
index bd1cfcb3dc13..61c6e12c99e0 100644
--- a/drivers/platform/msm/ep_pcie/ep_pcie_core.c
+++ b/drivers/platform/msm/ep_pcie/ep_pcie_core.c
@@ -1895,8 +1895,6 @@ int ep_pcie_core_enable_endpoint(enum ep_pcie_options opt)
 			"PCIe V%d: link initialized for LE PCIe endpoint\n",
 			dev->rev);
 		pr_crit("PCIe - link initialized for LE PCIe endpoint\n");
-		place_marker(
-			"PCIe - link initialized for LE PCIe endpoint\n");
 	}
 
 checkbme:
diff --git a/drivers/platform/msm/ipa/ipa_v3/ipa_qmi_service.c b/drivers/platform/msm/ipa/ipa_v3/ipa_qmi_service.c
index 266734f4ba9f..af148df76365 100644
--- a/drivers/platform/msm/ipa/ipa_v3/ipa_qmi_service.c
+++ b/drivers/platform/msm/ipa/ipa_v3/ipa_qmi_service.c
@@ -685,7 +685,6 @@ static int ipa3_qmi_init_modem_send_sync_msg(void)
 
 	pr_info("QMI_IPA_INIT_MODEM_DRIVER_REQ_V01 response received\n");
 
-	place_marker("M - QMI ready for commands");
 
 	return ipa3_check_qmi_response(rc,
 		QMI_IPA_INIT_MODEM_DRIVER_REQ_V01, resp.resp.result,
diff --git a/drivers/platform/msm/mhi_dev/mhi.c b/drivers/platform/msm/mhi_dev/mhi.c
index f2336be13d8d..e49cd9e07441 100644
--- a/drivers/platform/msm/mhi_dev/mhi.c
+++ b/drivers/platform/msm/mhi_dev/mhi.c
@@ -1276,7 +1276,6 @@ static void mhi_hwc_cb(void *priv, enum ipa_mhi_event_type event,
 		}
 
 		mhi_log(MHI_MSG_CRITICAL, "Device in M0 State\n");
-		place_marker("MHI - Device in M0 State\n");
 		break;
 	case IPA_MHI_EVENT_DATA_AVAILABLE:
 		rc = mhi_dev_notify_sm_event(MHI_DEV_EVENT_HW_ACC_WAKEUP);
diff --git a/drivers/soc/qcom/peripheral-loader.c b/drivers/soc/qcom/peripheral-loader.c
index be9d092727d6..b51e434c2a64 100644
--- a/drivers/soc/qcom/peripheral-loader.c
+++ b/drivers/soc/qcom/peripheral-loader.c
@@ -945,9 +945,6 @@ static int pil_init_mmap(struct pil_desc *desc, const struct pil_mdt *mdt)
 	if (ret)
 		return ret;
 
-	if (!strcmp(desc->name, "modem"))
-		place_marker("M - Modem Image Start Loading");
-
 	pil_info(desc, "loading from %pa to %pa\n", &priv->region_start,
 							&priv->region_end);
 
@@ -1408,9 +1405,6 @@ int pil_boot(struct pil_desc *desc)
 	}
 	pil_log("reset_done", desc);
 
-	if (!strcmp(desc->name, "modem"))
-		place_marker("M - Modem out of reset");
-
 	pil_info(desc, "Brought out of reset\n");
 	desc->modem_ssr = false;
 err_auth_and_reset:
diff --git a/drivers/spi/spi-geni-qcom.c b/drivers/spi/spi-geni-qcom.c
index 5661f12b2737..2d5ca183da3a 100644
--- a/drivers/spi/spi-geni-qcom.c
+++ b/drivers/spi/spi-geni-qcom.c
@@ -1586,10 +1586,6 @@ static int spi_geni_probe(struct platform_device *pdev)
 		goto spi_geni_probe_err;
 	}
 
-	snprintf(boot_marker, sizeof(boot_marker),
-			"M - DRIVER GENI_SPI Init");
-	place_marker(boot_marker);
-
 	platform_set_drvdata(pdev, spi);
 	geni_mas = spi_master_get_devdata(spi);
 	rsc = &geni_mas->spi_rsc;
@@ -1769,10 +1765,6 @@ static int spi_geni_probe(struct platform_device *pdev)
 	}
 	sysfs_create_file(&(geni_mas->dev->kobj),
 				&dev_attr_spi_slave_state.attr);
-	snprintf(boot_marker, sizeof(boot_marker),
-			"M - DRIVER GENI_SPI_%d Ready", spi->bus_num);
-	place_marker(boot_marker);
-
 	return ret;
 spi_geni_probe_unmap:
 	devm_iounmap(&pdev->dev, geni_mas->base);
diff --git a/drivers/tty/serial/msm_geni_serial.c b/drivers/tty/serial/msm_geni_serial.c
index bff6aaf346ae..9e4dd9e68e93 100644
--- a/drivers/tty/serial/msm_geni_serial.c
+++ b/drivers/tty/serial/msm_geni_serial.c
@@ -2441,14 +2441,6 @@ static int msm_geni_serial_probe(struct platform_device *pdev)
 		line = pdev->id;
 	}
 
-	if (strcmp(id->compatible, "qcom,msm-geni-console") == 0)
-		snprintf(boot_marker, sizeof(boot_marker),
-				"M - DRIVER GENI_UART_%d Init", line);
-	else
-		snprintf(boot_marker, sizeof(boot_marker),
-				"M - DRIVER GENI_HS_UART_%d Init", line);
-	place_marker(boot_marker);
-
 #ifdef SERIAL_CONSOLE
 	is_console = (drv->cons ? true : false);
 	dev_port = get_port_from_line(line, is_console);
@@ -2638,15 +2630,6 @@ static int msm_geni_serial_probe(struct platform_device *pdev)
 		goto exit_geni_serial_probe;
 
 	ret = uart_add_one_port(drv, uport);
-	if (!ret) {
-		if (strcmp(id->compatible, "qcom,msm-geni-console") == 0)
-			snprintf(boot_marker, sizeof(boot_marker),
-				"M - DRIVER GENI_UART_%d Ready", line);
-		else
-			snprintf(boot_marker, sizeof(boot_marker),
-				"M - DRIVER GENI_HS_UART_%d Ready", line);
-		place_marker(boot_marker);
-	}
 exit_geni_serial_probe:
 	return ret;
 }
diff --git a/drivers/usb/dwc3/dwc3-msm.c b/drivers/usb/dwc3/dwc3-msm.c
index fdd51b3a9913..b3366c67dcd2 100644
--- a/drivers/usb/dwc3/dwc3-msm.c
+++ b/drivers/usb/dwc3/dwc3-msm.c
@@ -3298,7 +3298,6 @@ static irqreturn_t msm_dwc3_pwr_irq(int irq, void *data)
 
 	if (mdwc->drd_state == DRD_STATE_PERIPHERAL_SUSPEND) {
 		dev_info(mdwc->dev, "USB Resume start\n");
-		place_marker("M - USB device resume started");
 	}
 
 	/*
@@ -5173,7 +5172,6 @@ static int dwc3_msm_pm_resume(struct device *dev)
 	if (atomic_read(&dwc->in_lpm) &&
 			mdwc->drd_state == DRD_STATE_PERIPHERAL_SUSPEND) {
 		dev_info(mdwc->dev, "USB Resume start\n");
-		place_marker("M - USB device resume started");
 	}
 
 	if (!dwc->ignore_wakeup_src_in_hostmode || !mdwc->in_host_mode) {
diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c
index 6e5a9ce5ff7f..c8b2e08512ff 100644
--- a/drivers/usb/gadget/composite.c
+++ b/drivers/usb/gadget/composite.c
@@ -965,7 +965,6 @@ static int set_config(struct usb_composite_dev *cdev,
 	if (!c)
 		goto done;
 
-	place_marker("M - USB Device is enumerated");
 	usb_gadget_set_state(gadget, USB_STATE_CONFIGURED);
 	cdev->config = c;
 
@@ -2482,7 +2481,6 @@ void composite_resume(struct usb_gadget *gadget)
 	 * suspend/resume callbacks?
 	 */
 	INFO(cdev, "USB Resume end\n");
-	place_marker("M - USB device is resumed");
 	if (cdev->driver->resume)
 		cdev->driver->resume(cdev);
 
diff --git a/init/do_mounts.c b/init/do_mounts.c
index 26f2d53876ea..63c3591937cc 100644
--- a/init/do_mounts.c
+++ b/init/do_mounts.c
@@ -450,7 +450,6 @@ static int __init do_mount_root(char *name, char *fs, int flags, void *data)
 	struct super_block *s;
 	int err;
 
-	place_marker("M - DRIVER F/S Init");
 
 	err = sys_mount((char __user *)name, (char __user *)"/root",
 			(char __user *)fs, (unsigned long)flags,
@@ -467,7 +466,6 @@ static int __init do_mount_root(char *name, char *fs, int flags, void *data)
 	       sb_rdonly(s) ? " readonly" : "",
 	       MAJOR(ROOT_DEV), MINOR(ROOT_DEV));
 
-	place_marker("M - DRIVER F/S Ready");
 
 	return 0;
 }
diff --git a/init/main.c b/init/main.c
index 805853c2fb63..8ff9f47c2a6a 100644
--- a/init/main.c
+++ b/init/main.c
@@ -1040,7 +1040,6 @@ static int __ref kernel_init(void *unused)
 	numa_default_policy();
 
 	rcu_end_inkernel_boot();
-	place_marker("M - DRIVER Kernel Boot Done");
 
 	if (ramdisk_execute_command) {
 		ret = run_init_process(ramdisk_execute_command);
diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c
index 4b007fd99af2..9be5dfdf5b4e 100644
--- a/kernel/power/hibernate.c
+++ b/kernel/power/hibernate.c
@@ -335,7 +335,6 @@ static int create_image(int platform_mode)
  Platform_finish:
 	platform_finish(platform_mode);
 
-	place_marker("M - Hibernation: start device resume");
 	dpm_resume_start(in_suspend ?
 		(error ? PMSG_RECOVER : PMSG_THAW) : PMSG_RESTORE);
 
@@ -411,7 +410,6 @@ int hibernation_snapshot(int platform_mode)
 
 	resume_console();
 	dpm_complete(msg);
-	place_marker("M - Hibernation: end device resume");
  Close:
 	platform_end(platform_mode);
 	return error;
@@ -751,7 +749,6 @@ int hibernate(void)
 		in_suspend = 0;
 		pm_restore_gfp_mask();
 	} else {
-		place_marker("M - PM: Image restored!");
 		pm_pr_dbg("Image restored successfully.\n");
 	}
 
@@ -766,7 +763,6 @@ int hibernate(void)
 			error = load_image_and_restore();
 	}
 	thaw_processes();
-	place_marker("M - Hibernation: processes thaw done");
 
 	/* Don't bother checking whether freezer_test_done is true */
 	freezer_test_done = false;
@@ -776,7 +772,6 @@ int hibernate(void)
 	atomic_inc(&snapshot_device_available);
  Unlock:
 	unlock_system_sleep();
-	place_marker("M - PM: Hibernation Exit!");
 	pr_info("hibernation exit\n");
 
 	return error;
@@ -906,7 +901,6 @@ static int software_resume(void)
 
 	error = load_image_and_restore();
 	thaw_processes();
-	place_marker("M - PM: Thaw processes completed!");
  Finish:
 	__pm_notifier_call_chain(PM_POST_RESTORE, nr_calls, NULL);
 	pm_restore_console();