X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/d27e7369f5ef5d9c92f94c086be55a33749e366f..84e11fcd5aa6892de8ae5cbbee629d428c1afcab:/target/linux/amazon/files/drivers/serial/amazon_asc.c

diff --git a/target/linux/amazon/files/drivers/serial/amazon_asc.c b/target/linux/amazon/files/drivers/serial/amazon_asc.c
index 629754945..fe7050c79 100644
--- a/target/linux/amazon/files/drivers/serial/amazon_asc.c
+++ b/target/linux/amazon/files/drivers/serial/amazon_asc.c
@@ -44,6 +44,7 @@
 #include <linux/console.h>
 #include <linux/sysrq.h>
 #include <linux/irq.h>
+#include <linux/platform_device.h>
 
 #include <asm/system.h>
 #include <asm/io.h>
@@ -107,10 +108,10 @@ static void amazonasc_enable_ms(struct uart_port *port)
 static void
 amazonasc_rx_chars(struct uart_port *port)
 {
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 26))
-	struct tty_struct *tty = port->info->port.tty;
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 31))
+	struct tty_struct *tty = port->state->port.tty;
 #else
-	struct tty_struct *tty = port->info->tty;
+	struct tty_struct *tty = port->info->port.tty;
 #endif
 	unsigned int ch = 0, rsr = 0, fifocnt;
 
@@ -168,7 +169,11 @@ amazonasc_rx_chars(struct uart_port *port)
 
 static void amazonasc_tx_chars(struct uart_port *port)
 {
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 31))
+	struct circ_buf *xmit = &port->state->xmit;
+#else
 	struct circ_buf *xmit = &port->info->xmit;
+#endif
 
 	if (uart_tx_stopped(port)) {
 		amazonasc_stop_tx(port);
@@ -670,7 +675,7 @@ static struct uart_driver amazonasc_reg = {
 	.cons =				&amazonasc_console,
 };
 
-static int __init amazonasc_init(void)
+static int __init amazon_asc_probe(struct platform_device *dev)
 {
 	unsigned char res;
 	uart_register_driver(&amazonasc_reg);
@@ -678,14 +683,38 @@ static int __init amazonasc_init(void)
 	return res;
 }
 
-static void __exit amazonasc_exit(void)
+static int amazon_asc_remove(struct platform_device *dev)
 {
 	uart_unregister_driver(&amazonasc_reg);
+	return 0;
+}
+
+static struct platform_driver amazon_asc_driver = {
+	.probe = amazon_asc_probe,
+	.remove = amazon_asc_remove,
+	.driver = {
+		.name = "amazon_asc",
+		.owner = THIS_MODULE,
+	},
+};
+
+static int __init amazon_asc_init(void)
+{
+	int ret = platform_driver_register(&amazon_asc_driver);
+	if (ret)
+		printk(KERN_WARNING "amazon_asc: error registering platfom driver!\n");
+	return ret;
 }
 
-module_init(amazonasc_init);
-module_exit(amazonasc_exit);
+static void __exit amazon_asc_cleanup(void)
+{
+	platform_driver_unregister(&amazon_asc_driver);
+}
+
+module_init(amazon_asc_init);
+module_exit(amazon_asc_cleanup);
 
 MODULE_AUTHOR("Gary Jennejohn, Felix Fietkau, John Crispin");
 MODULE_DESCRIPTION("MIPS AMAZONASC serial port driver");
 MODULE_LICENSE("GPL");
+