Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

15 files changed, 78 insertions, 127 deletions

diff --git a/drivers/serial/68328serial.c b/drivers/serial/68328serial.c
index 78ed24bb6a35..30463862603b 100644
--- a/drivers/serial/68328serial.c
+++ b/drivers/serial/68328serial.c
@@ -1437,7 +1437,7 @@ int m68328_console_setup(struct console *cp, char *arg)
         for (i = 0; i < ARRAY_SIZE(baud_table); i++)
                 if (baud_table[i] == n)
                         break;
-        if (i < BAUD_TABLE_SIZE) {
+        if (i < ARRAY_SIZE(baud_table)) {
                 m68328_console_baud = n;
                 m68328_console_cbaud = 0;
                 if (i > 15) {
diff --git a/drivers/serial/apbuart.c b/drivers/serial/apbuart.c
index fe91319b5f65..0099b8692b60 100644
--- a/drivers/serial/apbuart.c
+++ b/drivers/serial/apbuart.c
@@ -559,7 +559,7 @@ static int __devinit apbuart_probe(struct of_device *op,
 
         i = 0;
         for (i = 0; i < grlib_apbuart_port_nr; i++) {
-                if (op->node == grlib_apbuart_nodes[i])
+                if (op->dev.of_node == grlib_apbuart_nodes[i])
                         break;
         }
 
@@ -584,12 +584,12 @@ static struct of_device_id __initdata apbuart_match[] = {
 };
 
 static struct of_platform_driver grlib_apbuart_of_driver = {
-        .match_table = apbuart_match,
         .probe = apbuart_probe,
         .driver = {
-                   .owner = THIS_MODULE,
-                   .name = "grlib-apbuart",
-                   },
+                .owner = THIS_MODULE,
+                .name = "grlib-apbuart",
+                .of_match_table = apbuart_match,
+        },
 };
 
 
diff --git a/drivers/serial/cpm_uart/cpm_uart_core.c b/drivers/serial/cpm_uart/cpm_uart_core.c
index 300cea768d74..9eb62a256e9a 100644
--- a/drivers/serial/cpm_uart/cpm_uart_core.c
+++ b/drivers/serial/cpm_uart/cpm_uart_core.c
@@ -1342,7 +1342,7 @@ static int __devinit cpm_uart_probe(struct of_device *ofdev,
         /* initialize the device pointer for the port */
         pinfo->port.dev = &ofdev->dev;
 
-        ret = cpm_uart_init_port(ofdev->node, pinfo);
+        ret = cpm_uart_init_port(ofdev->dev.of_node, pinfo);
         if (ret)
                 return ret;
 
@@ -1372,8 +1372,11 @@ static struct of_device_id cpm_uart_match[] = {
 };
 
 static struct of_platform_driver cpm_uart_driver = {
-        .name = "cpm_uart",
-        .match_table = cpm_uart_match,
+        .driver = {
+                .name = "cpm_uart",
+                .owner = THIS_MODULE,
+                .of_match_table = cpm_uart_match,
+        },
         .probe = cpm_uart_probe,
         .remove = cpm_uart_remove,
  };
diff --git a/drivers/serial/mpc52xx_uart.c b/drivers/serial/mpc52xx_uart.c
index 02469c31bf0b..84a35f699016 100644
--- a/drivers/serial/mpc52xx_uart.c
+++ b/drivers/serial/mpc52xx_uart.c
@@ -397,34 +397,10 @@ static unsigned long mpc512x_getuartclk(void *p)
         return mpc5xxx_get_bus_frequency(p);
 }
 
-#define DEFAULT_FIFO_SIZE 16
-
-static unsigned int __init get_fifo_size(struct device_node *np,
-                                         char *fifo_name)
-{
-        const unsigned int *fp;
-
-        fp = of_get_property(np, fifo_name, NULL);
-        if (fp)
-                return *fp;
-
-        pr_warning("no %s property in %s node, defaulting to %d\n",
-                   fifo_name, np->full_name, DEFAULT_FIFO_SIZE);
-
-        return DEFAULT_FIFO_SIZE;
-}
-
-#define FIFOC(_base) ((struct mpc512x_psc_fifo __iomem *) \
-                    ((u32)(_base) + sizeof(struct mpc52xx_psc)))
-
 /* Init PSC FIFO Controller */
 static int __init mpc512x_psc_fifoc_init(void)
 {
         struct device_node *np;
-        void __iomem *psc;
-        unsigned int tx_fifo_size;
-        unsigned int rx_fifo_size;
-        int fifobase = 0; /* current fifo address in 32 bit words */
 
         np = of_find_compatible_node(NULL, NULL,
                                      "fsl,mpc5121-psc-fifo");
@@ -447,51 +423,6 @@ static int __init mpc512x_psc_fifoc_init(void)
                 return -ENODEV;
         }
 
-        for_each_compatible_node(np, NULL, "fsl,mpc5121-psc-uart") {
-                tx_fifo_size = get_fifo_size(np, "fsl,tx-fifo-size");
-                rx_fifo_size = get_fifo_size(np, "fsl,rx-fifo-size");
-
-                /* size in register is in 4 byte units */
-                tx_fifo_size /= 4;
-                rx_fifo_size /= 4;
-                if (!tx_fifo_size)
-                        tx_fifo_size = 1;
-                if (!rx_fifo_size)
-                        rx_fifo_size = 1;
-
-                psc = of_iomap(np, 0);
-                if (!psc) {
-                        pr_err("%s: Can't map %s device\n",
-                                __func__, np->full_name);
-                        continue;
-                }
-
-                /* FIFO space is 4KiB, check if requested size is available */
-                if ((fifobase + tx_fifo_size + rx_fifo_size) > 0x1000) {
-                        pr_err("%s: no fifo space available for %s\n",
-                                __func__, np->full_name);
-                        iounmap(psc);
-                        /*
-                         * chances are that another device requests less
-                         * fifo space, so we continue.
-                         */
-                        continue;
-                }
-                /* set tx and rx fifo size registers */
-                out_be32(&FIFOC(psc)->txsz, (fifobase << 16) | tx_fifo_size);
-                fifobase += tx_fifo_size;
-                out_be32(&FIFOC(psc)->rxsz, (fifobase << 16) | rx_fifo_size);
-                fifobase += rx_fifo_size;
-
-                /* reset and enable the slices */
-                out_be32(&FIFOC(psc)->txcmd, 0x80);
-                out_be32(&FIFOC(psc)->txcmd, 0x01);
-                out_be32(&FIFOC(psc)->rxcmd, 0x80);
-                out_be32(&FIFOC(psc)->rxcmd, 0x01);
-
-                iounmap(psc);
-        }
-
         return 0;
 }
 
@@ -1295,14 +1226,14 @@ mpc52xx_uart_of_probe(struct of_device *op, const struct of_device_id *match)
 
         /* Check validity & presence */
         for (idx = 0; idx < MPC52xx_PSC_MAXNUM; idx++)
-                if (mpc52xx_uart_nodes[idx] == op->node)
+                if (mpc52xx_uart_nodes[idx] == op->dev.of_node)
                         break;
         if (idx >= MPC52xx_PSC_MAXNUM)
                 return -EINVAL;
         pr_debug("Found %s assigned to ttyPSC%x\n",
                  mpc52xx_uart_nodes[idx]->full_name, idx);
 
-        uartclk = psc_ops->getuartclk(op->node);
+        uartclk = psc_ops->getuartclk(op->dev.of_node);
         if (uartclk == 0) {
                 dev_dbg(&op->dev, "Could not find uart clock frequency!\n");
                 return -EINVAL;
@@ -1322,7 +1253,7 @@ mpc52xx_uart_of_probe(struct of_device *op, const struct of_device_id *match)
         port->dev       = &op->dev;
 
         /* Search for IRQ and mapbase */
-        ret = of_address_to_resource(op->node, 0, &res);
+        ret = of_address_to_resource(op->dev.of_node, 0, &res);
         if (ret)
                 return ret;
 
@@ -1332,7 +1263,7 @@ mpc52xx_uart_of_probe(struct of_device *op, const struct of_device_id *match)
                 return -EINVAL;
         }
 
-        psc_ops->get_irq(port, op->node);
+        psc_ops->get_irq(port, op->dev.of_node);
         if (port->irq == NO_IRQ) {
                 dev_dbg(&op->dev, "Could not get irq\n");
                 return -EINVAL;
@@ -1431,15 +1362,16 @@ mpc52xx_uart_of_enumerate(void)
 MODULE_DEVICE_TABLE(of, mpc52xx_uart_of_match);
 
 static struct of_platform_driver mpc52xx_uart_of_driver = {
-        .match_table    = mpc52xx_uart_of_match,
         .probe          = mpc52xx_uart_of_probe,
         .remove         = mpc52xx_uart_of_remove,
 #ifdef CONFIG_PM
         .suspend        = mpc52xx_uart_of_suspend,
         .resume         = mpc52xx_uart_of_resume,
 #endif
-        .driver         = {
-                .name   = "mpc52xx-psc-uart",
+        .driver = {
+                .name = "mpc52xx-psc-uart",
+                .owner = THIS_MODULE,
+                .of_match_table = mpc52xx_uart_of_match,
         },
 };
 
diff --git a/drivers/serial/nwpserial.c b/drivers/serial/nwpserial.c
index e1ab8ec0a4a6..3c02fa96f282 100644
--- a/drivers/serial/nwpserial.c
+++ b/drivers/serial/nwpserial.c
@@ -344,7 +344,7 @@ int nwpserial_register_port(struct uart_port *port)
 
         mutex_lock(&nwpserial_mutex);
 
-        dn = to_of_device(port->dev)->node;
+        dn = to_of_device(port->dev)->dev.of_node;
         if (dn == NULL)
                 goto out;
 
diff --git a/drivers/serial/of_serial.c b/drivers/serial/of_serial.c
index 4abfebdb0fcc..a48d9080f552 100644
--- a/drivers/serial/of_serial.c
+++ b/drivers/serial/of_serial.c
@@ -31,7 +31,7 @@ static int __devinit of_platform_serial_setup(struct of_device *ofdev,
                                         int type, struct uart_port *port)
 {
         struct resource resource;
-        struct device_node *np = ofdev->node;
+        struct device_node *np = ofdev->dev.of_node;
         const unsigned int *clk, *spd;
         const u32 *prop;
         int ret, prop_size;
@@ -88,7 +88,7 @@ static int __devinit of_platform_serial_probe(struct of_device *ofdev,
         int port_type;
         int ret;
 
-        if (of_find_property(ofdev->node, "used-by-rtas", NULL))
+        if (of_find_property(ofdev->dev.of_node, "used-by-rtas", NULL))
                 return -EBUSY;
 
         info = kmalloc(sizeof(*info), GFP_KERNEL);
@@ -175,11 +175,13 @@ static struct of_device_id __devinitdata of_platform_serial_table[] = {
 };
 
 static struct of_platform_driver of_platform_serial_driver = {
-        .owner = THIS_MODULE,
-        .name = "of_serial",
+        .driver = {
+                .name = "of_serial",
+                .owner = THIS_MODULE,
+                .of_match_table = of_platform_serial_table,
+        },
         .probe = of_platform_serial_probe,
         .remove = of_platform_serial_remove,
-        .match_table = of_platform_serial_table,
 };
 
 static int __init of_platform_serial_init(void)
diff --git a/drivers/serial/pmac_zilog.c b/drivers/serial/pmac_zilog.c
index 700e10833bf9..cabbdc7ba583 100644
--- a/drivers/serial/pmac_zilog.c
+++ b/drivers/serial/pmac_zilog.c
@@ -1611,7 +1611,7 @@ static int pmz_attach(struct macio_dev *mdev, const struct of_device_id *match)
         /* Iterate the pmz_ports array to find a matching entry
          */
         for (i = 0; i < MAX_ZS_PORTS; i++)
-                if (pmz_ports[i].node == mdev->ofdev.node) {
+                if (pmz_ports[i].node == mdev->ofdev.dev.of_node) {
                         struct uart_pmac_port *uap = &pmz_ports[i];
 
                         uap->dev = mdev;
diff --git a/drivers/serial/s5pv210.c b/drivers/serial/s5pv210.c
index 8dc03837617b..4a789e5361a4 100644
--- a/drivers/serial/s5pv210.c
+++ b/drivers/serial/s5pv210.c
@@ -119,7 +119,7 @@ static int s5p_serial_probe(struct platform_device *pdev)
         return s3c24xx_serial_probe(pdev, s5p_uart_inf[pdev->id]);
 }
 
-static struct platform_driver s5p_serial_drv = {
+static struct platform_driver s5p_serial_driver = {
         .probe          = s5p_serial_probe,
         .remove         = __devexit_p(s3c24xx_serial_remove),
         .driver         = {
@@ -130,19 +130,19 @@ static struct platform_driver s5p_serial_drv = {
 
 static int __init s5pv210_serial_console_init(void)
 {
-        return s3c24xx_serial_initconsole(&s5p_serial_drv, s5p_uart_inf);
+        return s3c24xx_serial_initconsole(&s5p_serial_driver, s5p_uart_inf);
 }
 
 console_initcall(s5pv210_serial_console_init);
 
 static int __init s5p_serial_init(void)
 {
-        return s3c24xx_serial_init(&s5p_serial_drv, *s5p_uart_inf);
+        return s3c24xx_serial_init(&s5p_serial_driver, *s5p_uart_inf);
 }
 
 static void __exit s5p_serial_exit(void)
 {
-        platform_driver_unregister(&s5p_serial_drv);
+        platform_driver_unregister(&s5p_serial_driver);
 }
 
 module_init(s5p_serial_init);
diff --git a/drivers/serial/sh-sci.c b/drivers/serial/sh-sci.c
index aaef223df676..c291b3add1d2 100644
--- a/drivers/serial/sh-sci.c
+++ b/drivers/serial/sh-sci.c
@@ -1025,8 +1025,9 @@ static void sci_rx_dma_release(struct sci_port *s, bool enable_pio)
         s->chan_rx = NULL;
         s->cookie_rx[0] = s->cookie_rx[1] = -EINVAL;
         dma_release_channel(chan);
-        dma_free_coherent(port->dev, s->buf_len_rx * 2,
-                          sg_virt(&s->sg_rx[0]), sg_dma_address(&s->sg_rx[0]));
+        if (sg_dma_address(&s->sg_rx[0]))
+                dma_free_coherent(port->dev, s->buf_len_rx * 2,
+                                  sg_virt(&s->sg_rx[0]), sg_dma_address(&s->sg_rx[0]));
         if (enable_pio)
                 sci_start_rx(port);
 }
diff --git a/drivers/serial/sunhv.c b/drivers/serial/sunhv.c
index d14cca7fb88d..890f91742962 100644
--- a/drivers/serial/sunhv.c
+++ b/drivers/serial/sunhv.c
@@ -565,7 +565,7 @@ static int __devinit hv_probe(struct of_device *op, const struct of_device_id *m
         if (err)
                 goto out_free_con_read_page;
 
-        sunserial_console_match(&sunhv_console, op->node,
+        sunserial_console_match(&sunhv_console, op->dev.of_node,
                                 &sunhv_reg, port->line, false);
 
         err = uart_add_one_port(&sunhv_reg, port);
@@ -630,8 +630,11 @@ static const struct of_device_id hv_match[] = {
 MODULE_DEVICE_TABLE(of, hv_match);
 
 static struct of_platform_driver hv_driver = {
-        .name           = "hv",
-        .match_table    = hv_match,
+        .driver = {
+                .name = "hv",
+                .owner = THIS_MODULE,
+                .of_match_table = hv_match,
+        },
         .probe          = hv_probe,
         .remove         = __devexit_p(hv_remove),
 };
diff --git a/drivers/serial/sunsab.c b/drivers/serial/sunsab.c
index d2e0321049e2..5e81bc6b48b0 100644
--- a/drivers/serial/sunsab.c
+++ b/drivers/serial/sunsab.c
@@ -883,7 +883,7 @@ static int sunsab_console_setup(struct console *con, char *options)
         printk("Console: ttyS%d (SAB82532)\n",
                (sunsab_reg.minor - 64) + con->index);
 
-        sunserial_console_termios(con, to_of_device(up->port.dev)->node);
+        sunserial_console_termios(con, to_of_device(up->port.dev)->dev.of_node);
 
         switch (con->cflag & CBAUD) {
         case B150: baud = 150; break;
@@ -1026,11 +1026,11 @@ static int __devinit sab_probe(struct of_device *op, const struct of_device_id *
         if (err)
                 goto out1;
 
-        sunserial_console_match(SUNSAB_CONSOLE(), op->node,
+        sunserial_console_match(SUNSAB_CONSOLE(), op->dev.of_node,
                                 &sunsab_reg, up[0].port.line,
                                 false);
 
-        sunserial_console_match(SUNSAB_CONSOLE(), op->node,
+        sunserial_console_match(SUNSAB_CONSOLE(), op->dev.of_node,
                                 &sunsab_reg, up[1].port.line,
                                 false);
 
@@ -1093,8 +1093,11 @@ static const struct of_device_id sab_match[] = {
 MODULE_DEVICE_TABLE(of, sab_match);
 
 static struct of_platform_driver sab_driver = {
-        .name           = "sab",
-        .match_table    = sab_match,
+        .driver = {
+                .name = "sab",
+                .owner = THIS_MODULE,
+                .of_match_table = sab_match,
+        },
         .probe          = sab_probe,
         .remove         = __devexit_p(sab_remove),
 };
diff --git a/drivers/serial/sunsu.c b/drivers/serial/sunsu.c
index 01f7731e59b8..234459c2f012 100644
--- a/drivers/serial/sunsu.c
+++ b/drivers/serial/sunsu.c
@@ -1200,7 +1200,7 @@ static int __devinit sunsu_kbd_ms_init(struct uart_sunsu_port *up)
                 return -ENODEV;
 
         printk("%s: %s port at %llx, irq %u\n",
-               to_of_device(up->port.dev)->node->full_name,
+               to_of_device(up->port.dev)->dev.of_node->full_name,
                (up->su_type == SU_PORT_KBD) ? "Keyboard" : "Mouse",
                (unsigned long long) up->port.mapbase,
                up->port.irq);
@@ -1352,7 +1352,7 @@ static int __init sunsu_console_setup(struct console *co, char *options)
         spin_lock_init(&port->lock);
 
         /* Get firmware console settings.  */
-        sunserial_console_termios(co, to_of_device(port->dev)->node);
+        sunserial_console_termios(co, to_of_device(port->dev)->dev.of_node);
 
         memset(&termios, 0, sizeof(struct ktermios));
         termios.c_cflag = co->cflag;
@@ -1409,7 +1409,7 @@ static enum su_type __devinit su_get_type(struct device_node *dp)
 static int __devinit su_probe(struct of_device *op, const struct of_device_id *match)
 {
         static int inst;
-        struct device_node *dp = op->node;
+        struct device_node *dp = op->dev.of_node;
         struct uart_sunsu_port *up;
         struct resource *rp;
         enum su_type type;
@@ -1539,8 +1539,11 @@ static const struct of_device_id su_match[] = {
 MODULE_DEVICE_TABLE(of, su_match);
 
 static struct of_platform_driver su_driver = {
-        .name           = "su",
-        .match_table    = su_match,
+        .driver = {
+                .name = "su",
+                .owner = THIS_MODULE,
+                .of_match_table = su_match,
+        },
         .probe          = su_probe,
         .remove         = __devexit_p(su_remove),
 };
diff --git a/drivers/serial/sunzilog.c b/drivers/serial/sunzilog.c
index 978b3cee02d7..f9a24f4ebb34 100644
--- a/drivers/serial/sunzilog.c
+++ b/drivers/serial/sunzilog.c
@@ -1230,7 +1230,7 @@ static int __init sunzilog_console_setup(struct console *con, char *options)
                (sunzilog_reg.minor - 64) + con->index, con->index);
 
         /* Get firmware console settings.  */
-        sunserial_console_termios(con, to_of_device(up->port.dev)->node);
+        sunserial_console_termios(con, to_of_device(up->port.dev)->dev.of_node);
 
         /* Firmware console speed is limited to 150-->38400 baud so
          * this hackish cflag thing is OK.
@@ -1408,7 +1408,7 @@ static int __devinit zs_probe(struct of_device *op, const struct of_device_id *m
         int keyboard_mouse = 0;
         int err;
 
-        if (of_find_property(op->node, "keyboard", NULL))
+        if (of_find_property(op->dev.of_node, "keyboard", NULL))
                 keyboard_mouse = 1;
 
         /* uarts must come before keyboards/mice */
@@ -1465,7 +1465,7 @@ static int __devinit zs_probe(struct of_device *op, const struct of_device_id *m
         sunzilog_init_hw(&up[1]);
 
         if (!keyboard_mouse) {
-                if (sunserial_console_match(SUNZILOG_CONSOLE(), op->node,
+                if (sunserial_console_match(SUNZILOG_CONSOLE(), op->dev.of_node,
                                             &sunzilog_reg, up[0].port.line,
                                             false))
                         up->flags |= SUNZILOG_FLAG_IS_CONS;
@@ -1475,7 +1475,7 @@ static int __devinit zs_probe(struct of_device *op, const struct of_device_id *m
                                    rp, sizeof(struct zilog_layout));
                         return err;
                 }
-                if (sunserial_console_match(SUNZILOG_CONSOLE(), op->node,
+                if (sunserial_console_match(SUNZILOG_CONSOLE(), op->dev.of_node,
                                             &sunzilog_reg, up[1].port.line,
                                             false))
                         up->flags |= SUNZILOG_FLAG_IS_CONS;
@@ -1541,8 +1541,11 @@ static const struct of_device_id zs_match[] = {
 MODULE_DEVICE_TABLE(of, zs_match);
 
 static struct of_platform_driver zs_driver = {
-        .name           = "zs",
-        .match_table    = zs_match,
+        .driver = {
+                .name = "zs",
+                .owner = THIS_MODULE,
+                .of_match_table = zs_match,
+        },
         .probe          = zs_probe,
         .remove         = __devexit_p(zs_remove),
 };
diff --git a/drivers/serial/uartlite.c b/drivers/serial/uartlite.c
index e6639a95d276..8acccd564378 100644
--- a/drivers/serial/uartlite.c
+++ b/drivers/serial/uartlite.c
@@ -591,15 +591,15 @@ ulite_of_probe(struct of_device *op, const struct of_device_id *match)
 
         dev_dbg(&op->dev, "%s(%p, %p)\n", __func__, op, match);
 
-        rc = of_address_to_resource(op->node, 0, &res);
+        rc = of_address_to_resource(op->dev.of_node, 0, &res);
         if (rc) {
                 dev_err(&op->dev, "invalid address\n");
                 return rc;
         }
 
-        irq = irq_of_parse_and_map(op->node, 0);
+        irq = irq_of_parse_and_map(op->dev.of_node, 0);
 
-        id = of_get_property(op->node, "port-number", NULL);
+        id = of_get_property(op->dev.of_node, "port-number", NULL);
 
         return ulite_assign(&op->dev, id ? *id : -1, res.start, irq);
 }
@@ -610,13 +610,12 @@ static int __devexit ulite_of_remove(struct of_device *op)
 }
 
 static struct of_platform_driver ulite_of_driver = {
-        .owner = THIS_MODULE,
-        .name = "uartlite",
-        .match_table = ulite_of_match,
         .probe = ulite_of_probe,
         .remove = __devexit_p(ulite_of_remove),
         .driver = {
                 .name = "uartlite",
+                .owner = THIS_MODULE,
+                .of_match_table = ulite_of_match,
         },
 };
 
diff --git a/drivers/serial/ucc_uart.c b/drivers/serial/ucc_uart.c
index 074904912f64..907b06f5c447 100644
--- a/drivers/serial/ucc_uart.c
+++ b/drivers/serial/ucc_uart.c
@@ -1197,7 +1197,7 @@ static void uart_firmware_cont(const struct firmware *fw, void *context)
 static int ucc_uart_probe(struct of_device *ofdev,
         const struct of_device_id *match)
 {
-        struct device_node *np = ofdev->node;
+        struct device_node *np = ofdev->dev.of_node;
         const unsigned int *iprop;      /* Integer OF properties */
         const char *sprop;      /* String OF properties */
         struct uart_qe_port *qe_port = NULL;
@@ -1486,9 +1486,11 @@ static struct of_device_id ucc_uart_match[] = {
 MODULE_DEVICE_TABLE(of, ucc_uart_match);
 
 static struct of_platform_driver ucc_uart_of_driver = {
-        .owner          = THIS_MODULE,
-        .name           = "ucc_uart",
-        .match_table    = ucc_uart_match,
+        .driver = {
+                .name = "ucc_uart",
+                .owner = THIS_MODULE,
+                .of_match_table    = ucc_uart_match,
+        },
         .probe          = ucc_uart_probe,
         .remove         = ucc_uart_remove,
 };