Merge remote-tracking branch 'usb/usb-next'

[karo-tx-linux.git] / drivers / tty / serial / 8250 / 8250_ingenic.c

diff --git a/drivers/tty/serial/8250/8250_ingenic.c b/drivers/tty/serial/8250/8250_ingenic.c
index d6e1ec9b4fdeb7ab8f3efe626d6a2fc0467a4183..b4e1d39805b2182c2768ce9c8c3c6a42d869edf2 100644 (file)
--- a/drivers/tty/serial/8250/8250_ingenic.c
+++ b/drivers/tty/serial/8250/8250_ingenic.c
@@ -4,6 +4,8 @@
  *
  * Ingenic SoC UART support
  *
+ * Author: Paul Burton <paul.burton@imgtec.com>
+ *
  * This program is free software; you can redistribute  it and/or modify it
  * under  the terms of  the GNU General  Public License as published by the
  * Free Software Foundation;  either version 2 of the  License, or (at your
@@ -18,7 +20,7 @@
 #include <linux/console.h>
 #include <linux/io.h>
 #include <linux/libfdt.h>
-#include <linux/module.h>
+#include <linux/init.h>
 #include <linux/of.h>
 #include <linux/of_fdt.h>
 #include <linux/of_device.h>
@@ -154,14 +156,18 @@ static void ingenic_uart_serial_out(struct uart_port *p, int offset, int value)
                break;
 
        case UART_IER:
-               /* Enable receive timeout interrupt with the
-                * receive line status interrupt */
+               /*
+                * Enable receive timeout interrupt with the receive line
+                * status interrupt.
+                */
                value |= (value & 0x4) << 2;
                break;
 
        case UART_MCR:
-               /* If we have enabled modem status IRQs we should enable modem
-                * mode. */
+               /*
+                * If we have enabled modem status IRQs we should enable
+                * modem mode.
+                */
                ier = p->serial_in(p, UART_IER);
 
                if (ier & UART_IER_MSI)
@@ -297,16 +303,6 @@ out:
        return err;
 }
 
-static int ingenic_uart_remove(struct platform_device *pdev)
-{
-       struct ingenic_uart_data *data = platform_get_drvdata(pdev);
-
-       serial8250_unregister_port(data->line);
-       clk_disable_unprepare(data->clk_module);
-       clk_disable_unprepare(data->clk_baud);
-       return 0;
-}
-
 static const struct ingenic_uart_config jz4740_uart_config = {
        .tx_loadsz = 8,
        .fifosize = 16,
@@ -329,19 +325,13 @@ static const struct of_device_id of_match[] = {
        { .compatible = "ingenic,jz4780-uart", .data = &jz4780_uart_config },
        { /* sentinel */ }
 };
-MODULE_DEVICE_TABLE(of, of_match);
 
 static struct platform_driver ingenic_uart_platform_driver = {
        .driver = {
-               .name           = "ingenic-uart",
-               .of_match_table = of_match,
+               .name                   = "ingenic-uart",
+               .of_match_table         = of_match,
+               .suppress_bind_attrs    = true,
        },
        .probe                  = ingenic_uart_probe,
-       .remove                 = ingenic_uart_remove,
 };
-
-module_platform_driver(ingenic_uart_platform_driver);
-
-MODULE_AUTHOR("Paul Burton");
-MODULE_LICENSE("GPL");
-MODULE_DESCRIPTION("Ingenic SoC UART driver");
+builtin_platform_driver(ingenic_uart_platform_driver);