]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
serial: sh-sci: Drop checking port type for device file{create, remove}
authorBiju Das <biju.das.jz@bp.renesas.com>
Sat, 29 Nov 2025 16:43:00 +0000 (16:43 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 17 Dec 2025 14:07:06 +0000 (15:07 +0100)
Ports that support FIFO has fifosize > 1. Replace checking the port type
with fifosize for device file{create, remove}.

Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
Tested-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
Link: https://patch.msgid.link/20251129164325.209213-5-biju.das.jz@bp.renesas.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/tty/serial/sh-sci.c

index 28d665a9861abb1b9baa8bbc9f0a0cd19828bd54..ff5459c449fba3acee442d7580a79a1c1c361786 100644 (file)
@@ -3549,16 +3549,14 @@ static struct uart_driver sci_uart_driver = {
 static void sci_remove(struct platform_device *dev)
 {
        struct sci_port *s = platform_get_drvdata(dev);
-       unsigned int type = s->type;    /* uart_remove_... clears it */
 
        sci_ports_in_use &= ~BIT(s->port.line);
        uart_remove_one_port(&sci_uart_driver, &s->port);
 
-       if (s->port.fifosize > 1)
+       if (s->port.fifosize > 1) {
                device_remove_file(&dev->dev, &dev_attr_rx_fifo_trigger);
-       if (type == PORT_SCIFA || type == PORT_SCIFB || type == PORT_HSCIF ||
-           type == SCI_PORT_RSCI)
                device_remove_file(&dev->dev, &dev_attr_rx_fifo_timeout);
+       }
 }
 
 static const struct sci_of_data of_sci_scif_sh2 = {
@@ -3917,15 +3915,10 @@ static int sci_probe(struct platform_device *dev)
                ret = device_create_file(&dev->dev, &dev_attr_rx_fifo_trigger);
                if (ret)
                        return ret;
-       }
-       if (sp->type == PORT_SCIFA || sp->type == PORT_SCIFB ||
-           sp->type == PORT_HSCIF || sp->type == SCI_PORT_RSCI) {
+
                ret = device_create_file(&dev->dev, &dev_attr_rx_fifo_timeout);
                if (ret) {
-                       if (sp->port.fifosize > 1) {
-                               device_remove_file(&dev->dev,
-                                                  &dev_attr_rx_fifo_trigger);
-                       }
+                       device_remove_file(&dev->dev, &dev_attr_rx_fifo_trigger);
                        return ret;
                }
        }