[PATCH 30/35] serial: Remove unused NEEDS_MANUAL_RELOC code bits

Marek Vasut marek.vasut+renesas at mailbox.org
Wed Sep 6 23:30:10 CEST 2023


The last user of the NEEDS_MANUAL_RELOC has been removed in commit
26af162ac8f8 ("arch: m68k: Implement relocation")
Remove now unused NEEDS_MANUAL_RELOC code.

Signed-off-by: Marek Vasut <marek.vasut+renesas at mailbox.org>
---
 drivers/serial/serial-uclass.c | 22 ----------------------
 drivers/serial/serial.c        | 17 -----------------
 2 files changed, 39 deletions(-)

diff --git a/drivers/serial/serial-uclass.c b/drivers/serial/serial-uclass.c
index e954f0189bb..5e2e7dfbcb3 100644
--- a/drivers/serial/serial-uclass.c
+++ b/drivers/serial/serial-uclass.c
@@ -508,28 +508,6 @@ static int serial_post_probe(struct udevice *dev)
 #endif
 	int ret;
 
-#if defined(CONFIG_NEEDS_MANUAL_RELOC)
-	if (ops->setbrg)
-		ops->setbrg += gd->reloc_off;
-	if (ops->getc)
-		ops->getc += gd->reloc_off;
-	if (ops->putc)
-		ops->putc += gd->reloc_off;
-	if (ops->pending)
-		ops->pending += gd->reloc_off;
-	if (ops->clear)
-		ops->clear += gd->reloc_off;
-	if (ops->getconfig)
-		ops->getconfig += gd->reloc_off;
-	if (ops->setconfig)
-		ops->setconfig += gd->reloc_off;
-#if CFG_POST & CFG_SYS_POST_UART
-	if (ops->loop)
-		ops->loop += gd->reloc_off;
-#endif
-	if (ops->getinfo)
-		ops->getinfo += gd->reloc_off;
-#endif
 	/* Set the baud rate */
 	if (ops->setbrg) {
 		ret = ops->setbrg(dev, gd->baudrate);
diff --git a/drivers/serial/serial.c b/drivers/serial/serial.c
index 9a380d7c5e7..787edd53602 100644
--- a/drivers/serial/serial.c
+++ b/drivers/serial/serial.c
@@ -142,23 +142,6 @@ serial_initfunc(mtk_serial_initialize);
  */
 void serial_register(struct serial_device *dev)
 {
-#ifdef CONFIG_NEEDS_MANUAL_RELOC
-	if (dev->start)
-		dev->start += gd->reloc_off;
-	if (dev->stop)
-		dev->stop += gd->reloc_off;
-	if (dev->setbrg)
-		dev->setbrg += gd->reloc_off;
-	if (dev->getc)
-		dev->getc += gd->reloc_off;
-	if (dev->tstc)
-		dev->tstc += gd->reloc_off;
-	if (dev->putc)
-		dev->putc += gd->reloc_off;
-	if (dev->puts)
-		dev->puts += gd->reloc_off;
-#endif
-
 	dev->next = serial_devices;
 	serial_devices = dev;
 }
-- 
2.40.1



More information about the U-Boot mailing list