commit caa4daa2ae3dc0a3e516addea5772c9af76abcb0
author Simon Glass <sjg@chromium.org> Thu Dec 03 16:55:18 2020 -0700
committer Simon Glass <sjg@chromium.org> Sun Dec 13 16:51:08 2020 -0700
tree 0abbc5b538894532f4db28d56e4645d3be230d27
parent 41575d8e4c334df148c4cdd7c40cc825dc0fcaa1

dm: treewide: Rename 'platdata' variables to just 'plat'

We use 'priv' for private data but often use 'platdata' for platform data.
We can't really use 'pdata' since that is ambiguous (it could mean private
or platform data).

Rename some of the latter variables to end with 'plat' for consistency.

Signed-off-by: Simon Glass <sjg@chromium.org>

drivers/serial/serial_zynq.c

diff --git a/drivers/serial/serial_zynq.c b/drivers/serial/serial_zynq.c
index d04c399..7984b61 100644
--- a/drivers/serial/serial_zynq.c
+++ b/drivers/serial/serial_zynq.c
@@ -107,7 +107,7 @@
 
 static int zynq_serial_setbrg(struct udevice *dev, int baudrate)
 {
-	struct zynq_uart_platdata *platdata = dev_get_platdata(dev);
+	struct zynq_uart_platdata *plat = dev_get_platdata(dev);
 	unsigned long clock;
 
 	int ret;
@@ -132,15 +132,15 @@
 		return ret;
 	}
 
-	_uart_zynq_serial_setbrg(platdata->regs, clock, baudrate);
+	_uart_zynq_serial_setbrg(plat->regs, clock, baudrate);
 
 	return 0;
 }
 
 static int zynq_serial_probe(struct udevice *dev)
 {
-	struct zynq_uart_platdata *platdata = dev_get_platdata(dev);
-	struct uart_zynq *regs = platdata->regs;
+	struct zynq_uart_platdata *plat = dev_get_platdata(dev);
+	struct uart_zynq *regs = plat->regs;
 	u32 val;
 
 	/* No need to reinitialize the UART if TX already enabled */
@@ -148,15 +148,15 @@
 	if (val & ZYNQ_UART_CR_TX_EN)
 		return 0;
 
-	_uart_zynq_serial_init(platdata->regs);
+	_uart_zynq_serial_init(plat->regs);
 
 	return 0;
 }
 
 static int zynq_serial_getc(struct udevice *dev)
 {
-	struct zynq_uart_platdata *platdata = dev_get_platdata(dev);
-	struct uart_zynq *regs = platdata->regs;
+	struct zynq_uart_platdata *plat = dev_get_platdata(dev);
+	struct uart_zynq *regs = plat->regs;
 
 	if (readl(&regs->channel_sts) & ZYNQ_UART_SR_RXEMPTY)
 		return -EAGAIN;
@@ -166,15 +166,15 @@
 
 static int zynq_serial_putc(struct udevice *dev, const char ch)
 {
-	struct zynq_uart_platdata *platdata = dev_get_platdata(dev);
+	struct zynq_uart_platdata *plat = dev_get_platdata(dev);
 
-	return _uart_zynq_serial_putc(platdata->regs, ch);
+	return _uart_zynq_serial_putc(plat->regs, ch);
 }
 
 static int zynq_serial_pending(struct udevice *dev, bool input)
 {
-	struct zynq_uart_platdata *platdata = dev_get_platdata(dev);
-	struct uart_zynq *regs = platdata->regs;
+	struct zynq_uart_platdata *plat = dev_get_platdata(dev);
+	struct uart_zynq *regs = plat->regs;
 
 	if (input)
 		return !(readl(&regs->channel_sts) & ZYNQ_UART_SR_RXEMPTY);
@@ -184,11 +184,11 @@
 
 static int zynq_serial_ofdata_to_platdata(struct udevice *dev)
 {
-	struct zynq_uart_platdata *platdata = dev_get_platdata(dev);
+	struct zynq_uart_platdata *plat = dev_get_platdata(dev);
 
-	platdata->regs = (struct uart_zynq *)dev_read_addr(dev);
-	if (IS_ERR(platdata->regs))
-		return PTR_ERR(platdata->regs);
+	plat->regs = (struct uart_zynq *)dev_read_addr(dev);
+	if (IS_ERR(plat->regs))
+		return PTR_ERR(plat->regs);
 
 	return 0;
 }
@@ -212,7 +212,7 @@
 	.id	= UCLASS_SERIAL,
 	.of_match = zynq_serial_ids,
 	.ofdata_to_platdata = zynq_serial_ofdata_to_platdata,
-	.platdata_auto	= sizeof(struct zynq_uart_platdata),
+	.plat_auto	= sizeof(struct zynq_uart_platdata),
 	.probe = zynq_serial_probe,
 	.ops	= &zynq_serial_ops,
 };