| Message ID | 20240202212448.74840-1-m.shams@samsung.com |
|---|---|
| State | New |
| Headers | show |
| Series | [1/2] serial: samsung: honor fifosize from dts at first | expand |
On 02/02/2024 22:24, Tamseel Shams wrote: > Currently for platforms which passes UART fifosize from DT gets > override by local driver structure "s3c24xx_serial_drv_data", > which is not indentded. Change the code to honor fifosize from > device tree at first. > > Signed-off-by: Tamseel Shams <m.shams@samsung.com> > --- > drivers/tty/serial/samsung_tty.c | 14 ++++++++------ > 1 file changed, 8 insertions(+), 6 deletions(-) > > diff --git a/drivers/tty/serial/samsung_tty.c b/drivers/tty/serial/samsung_tty.c > index 71d17d804fda..e4c4c9f4f9b0 100644 > --- a/drivers/tty/serial/samsung_tty.c > +++ b/drivers/tty/serial/samsung_tty.c > @@ -1990,8 +1990,7 @@ static int s3c24xx_serial_probe(struct platform_device *pdev) > } > > if (np) { > - of_property_read_u32(np, > - "samsung,uart-fifosize", &ourport->port.fifosize); > + ret = of_property_read_u32(np, "samsung,uart-fifosize", &ourport->port.fifosize); > > if (of_property_read_u32(np, "reg-io-width", &prop) == 0) { > switch (prop) { > @@ -2009,10 +2008,13 @@ static int s3c24xx_serial_probe(struct platform_device *pdev) > } > } > > - if (ourport->drv_data->fifosize[index]) > - ourport->port.fifosize = ourport->drv_data->fifosize[index]; > - else if (ourport->info->fifosize) > - ourport->port.fifosize = ourport->info->fifosize; I think ret is not initialized here. Best regards, Krzysztof
diff --git a/drivers/tty/serial/samsung_tty.c b/drivers/tty/serial/samsung_tty.c index 71d17d804fda..e4c4c9f4f9b0 100644 --- a/drivers/tty/serial/samsung_tty.c +++ b/drivers/tty/serial/samsung_tty.c @@ -1990,8 +1990,7 @@ static int s3c24xx_serial_probe(struct platform_device *pdev) } if (np) { - of_property_read_u32(np, - "samsung,uart-fifosize", &ourport->port.fifosize); + ret = of_property_read_u32(np, "samsung,uart-fifosize", &ourport->port.fifosize); if (of_property_read_u32(np, "reg-io-width", &prop) == 0) { switch (prop) { @@ -2009,10 +2008,13 @@ static int s3c24xx_serial_probe(struct platform_device *pdev) } } - if (ourport->drv_data->fifosize[index]) - ourport->port.fifosize = ourport->drv_data->fifosize[index]; - else if (ourport->info->fifosize) - ourport->port.fifosize = ourport->info->fifosize; + if (ret) { + if (ourport->drv_data->fifosize[index]) + ourport->port.fifosize = ourport->drv_data->fifosize[index]; + else if (ourport->info->fifosize) + ourport->port.fifosize = ourport->info->fifosize; + } + ourport->port.has_sysrq = IS_ENABLED(CONFIG_SERIAL_SAMSUNG_CONSOLE); /*
Currently for platforms which passes UART fifosize from DT gets override by local driver structure "s3c24xx_serial_drv_data", which is not indentded. Change the code to honor fifosize from device tree at first. Signed-off-by: Tamseel Shams <m.shams@samsung.com> --- drivers/tty/serial/samsung_tty.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)