summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Shiyan <shc_work@mail.ru>2012-10-14 09:05:23 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-10-24 20:39:47 +0200
commit95113728f03cc6775ae895133c7fc420221cc8a4 (patch)
treeda238da9b0b17e20db16e3b39dd7ce7209e032c1
parenttty: serial: KGDB support for PXA (diff)
downloadlinux-95113728f03cc6775ae895133c7fc420221cc8a4.tar.xz
linux-95113728f03cc6775ae895133c7fc420221cc8a4.zip
serial: clps711x: Add platform_driver interface to clps711x driver
Signed-off-by: Alexander Shiyan <shc_work@mail.ru> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/tty/serial/clps711x.c39
1 files changed, 33 insertions, 6 deletions
diff --git a/drivers/tty/serial/clps711x.c b/drivers/tty/serial/clps711x.c
index d0f719fafc84..07fef1cbc115 100644
--- a/drivers/tty/serial/clps711x.c
+++ b/drivers/tty/serial/clps711x.c
@@ -37,10 +37,13 @@
#include <linux/serial_core.h>
#include <linux/serial.h>
#include <linux/io.h>
+#include <linux/platform_device.h>
#include <mach/hardware.h>
#include <asm/irq.h>
+#define UART_CLPS711X_NAME "uart-clps711x"
+
#define UART_NR 2
#define SERIAL_CLPS711X_MAJOR 204
@@ -543,7 +546,7 @@ static struct uart_driver clps711x_reg = {
.cons = CLPS711X_CONSOLE,
};
-static int __init clps711xuart_init(void)
+static int __devinit uart_clps711x_probe(struct platform_device *pdev)
{
int ret, i;
@@ -559,7 +562,7 @@ static int __init clps711xuart_init(void)
return 0;
}
-static void __exit clps711xuart_exit(void)
+static int __devexit uart_clps711x_remove(struct platform_device *pdev)
{
int i;
@@ -567,12 +570,36 @@ static void __exit clps711xuart_exit(void)
uart_remove_one_port(&clps711x_reg, &clps711x_ports[i]);
uart_unregister_driver(&clps711x_reg);
+
+ return 0;
}
-module_init(clps711xuart_init);
-module_exit(clps711xuart_exit);
+static struct platform_driver clps711x_uart_driver = {
+ .driver = {
+ .name = UART_CLPS711X_NAME,
+ .owner = THIS_MODULE,
+ },
+ .probe = uart_clps711x_probe,
+ .remove = __devexit_p(uart_clps711x_remove),
+};
+module_platform_driver(clps711x_uart_driver);
+
+static struct platform_device clps711x_uart_device = {
+ .name = UART_CLPS711X_NAME,
+};
+
+static int __init uart_clps711x_init(void)
+{
+ return platform_device_register(&clps711x_uart_device);
+}
+module_init(uart_clps711x_init);
+
+static void __exit uart_clps711x_exit(void)
+{
+ platform_device_unregister(&clps711x_uart_device);
+}
+module_exit(uart_clps711x_exit);
MODULE_AUTHOR("Deep Blue Solutions Ltd");
-MODULE_DESCRIPTION("CLPS-711x generic serial driver");
+MODULE_DESCRIPTION("CLPS711X serial driver");
MODULE_LICENSE("GPL");
-MODULE_ALIAS_CHARDEV(SERIAL_CLPS711X_MAJOR, SERIAL_CLPS711X_MINOR);