m68k: amiga - Serial port platform device conversion

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>

m68k: amiga - Serial port platform device conversion
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Geert Uytterhoeven
1 parent 314c926f64
Showing 2 changed files with 38 additions and 26 deletions Side-by-side Diff
arch/m68k/amiga/platform.c
drivers/char/amiserial.c
@@ -168,6 +168,9 @@
 	if (AMIGAHW_PRESENT(AMI_MOUSE))
 		platform_device_register_simple("amiga-mouse", -1, NULL, 0);
  
+	if (AMIGAHW_PRESENT(AMI_SERIAL))
+		platform_device_register_simple("amiga-serial", -1, NULL, 0);
+
 	return 0;
 }
  
@@ -84,6 +84,7 @@
 #include <linux/smp_lock.h>
 #include <linux/init.h>
 #include <linux/bitops.h>
+#include <linux/platform_device.h>
  
 #include <asm/setup.h>
  
  
  
@@ -1954,29 +1955,16 @@
 /*
  * The serial driver boot-time initialization code!
  */
-static int __init rs_init(void)
+static int __init amiga_serial_probe(struct platform_device *pdev)
 {
 	unsigned long flags;
 	struct serial_state * state;
 	int error;
  
-	if (!MACH_IS_AMIGA || !AMIGAHW_PRESENT(AMI_SERIAL))
-		return -ENODEV;
-
 	serial_driver = alloc_tty_driver(1);
 	if (!serial_driver)
 		return -ENOMEM;
  
-	/*
-	 *  We request SERDAT and SERPER only, because the serial registers are
-	 *  too spreaded over the custom register space
-	 */
-	if (!request_mem_region(CUSTOM_PHYSADDR+0x30, 4,
-				"amiserial [Paula]")) {
-		error = -EBUSY;
-		goto fail_put_tty_driver;
-	}
-
 	IRQ_ports = NULL;
  
 	show_serial_version();
@@ -1998,7 +1986,7 @@
  
 	error = tty_register_driver(serial_driver);
 	if (error)
-		goto fail_release_mem_region;
+		goto fail_put_tty_driver;
  
 	state = rs_table;
 	state->magic = SSTATE_MAGIC;
  
  
  
@@ -2050,23 +2038,24 @@
 	ciab.ddra |= (SER_DTR | SER_RTS);   /* outputs */
 	ciab.ddra &= ~(SER_DCD | SER_CTS | SER_DSR);  /* inputs */
  
+	platform_set_drvdata(pdev, state);
+
 	return 0;
  
 fail_free_irq:
 	free_irq(IRQ_AMIGA_TBE, state);
 fail_unregister:
 	tty_unregister_driver(serial_driver);
-fail_release_mem_region:
-	release_mem_region(CUSTOM_PHYSADDR+0x30, 4);
 fail_put_tty_driver:
 	put_tty_driver(serial_driver);
 	return error;
 }
  
-static __exit void rs_exit(void) 
+static int __exit amiga_serial_remove(struct platform_device *pdev)
 {
 	int error;
-	struct async_struct *info = rs_table[0].info;
+	struct serial_state *state = platform_get_drvdata(pdev);
+	struct async_struct *info = state->info;
  
 	/* printk("Unloading %s: version %s\n", serial_name, serial_version); */
 	tasklet_kill(&info->tlet);
  
  
  
  
@@ -2075,21 +2064,40 @@
 		       error);
 	put_tty_driver(serial_driver);
  
-	if (info) {
-	  rs_table[0].info = NULL;
-	  kfree(info);
-	}
+	rs_table[0].info = NULL;
+	kfree(info);
  
 	free_irq(IRQ_AMIGA_TBE, rs_table);
 	free_irq(IRQ_AMIGA_RBF, rs_table);
  
-	release_mem_region(CUSTOM_PHYSADDR+0x30, 4);
+	platform_set_drvdata(pdev, NULL);
+
+	return error;
 }
  
-module_init(rs_init)
-module_exit(rs_exit)
+static struct platform_driver amiga_serial_driver = {
+	.remove = __exit_p(amiga_serial_remove),
+	.driver   = {
+		.name	= "amiga-serial",
+		.owner	= THIS_MODULE,
+	},
+};
  
+static int __init amiga_serial_init(void)
+{
+	return platform_driver_probe(&amiga_serial_driver, amiga_serial_probe);
+}
  
+module_init(amiga_serial_init);
+
+static void __exit amiga_serial_exit(void)
+{
+	platform_driver_unregister(&amiga_serial_driver);
+}
+
+module_exit(amiga_serial_exit);
+
+
 #if defined(CONFIG_SERIAL_CONSOLE) && !defined(MODULE)
  
 /*
@@ -2154,4 +2162,5 @@
 #endif /* CONFIG_SERIAL_CONSOLE && !MODULE */
  
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:amiga-serial");
...	...	@@ -168,6 +168,9 @@
168	168	if (AMIGAHW_PRESENT(AMI_MOUSE))
169	169	platform_device_register_simple("amiga-mouse", -1, NULL, 0);
170	170
	171	+ if (AMIGAHW_PRESENT(AMI_SERIAL))
	172	+ platform_device_register_simple("amiga-serial", -1, NULL, 0);
	173	+
171	174	return 0;
172	175	}
173	176
...	...	@@ -84,6 +84,7 @@
84	84	#include <linux/smp_lock.h>
85	85	#include <linux/init.h>
86	86	#include <linux/bitops.h>
	87	+#include <linux/platform_device.h>
87	88
88	89	#include <asm/setup.h>
89	90
90	91
91	92
...	...	@@ -1954,29 +1955,16 @@
1954	1955	/*
1955	1956	* The serial driver boot-time initialization code!
1956	1957	*/
1957		-static int __init rs_init(void)
	1958	+static int __init amiga_serial_probe(struct platform_device *pdev)
1958	1959	{
1959	1960	unsigned long flags;
1960	1961	struct serial_state * state;
1961	1962	int error;
1962	1963
1963		- if (!MACH_IS_AMIGA \|\| !AMIGAHW_PRESENT(AMI_SERIAL))
1964		- return -ENODEV;
1965		-
1966	1964	serial_driver = alloc_tty_driver(1);
1967	1965	if (!serial_driver)
1968	1966	return -ENOMEM;
1969	1967
1970		- /*
1971		- * We request SERDAT and SERPER only, because the serial registers are
1972		- * too spreaded over the custom register space
1973		- */
1974		- if (!request_mem_region(CUSTOM_PHYSADDR+0x30, 4,
1975		- "amiserial [Paula]")) {
1976		- error = -EBUSY;
1977		- goto fail_put_tty_driver;
1978		- }
1979		-
1980	1968	IRQ_ports = NULL;
1981	1969
1982	1970	show_serial_version();
...	...	@@ -1998,7 +1986,7 @@
1998	1986
1999	1987	error = tty_register_driver(serial_driver);
2000	1988	if (error)
2001		- goto fail_release_mem_region;
	1989	+ goto fail_put_tty_driver;
2002	1990
2003	1991	state = rs_table;
2004	1992	state->magic = SSTATE_MAGIC;
2005	1993
2006	1994
2007	1995
...	...	@@ -2050,23 +2038,24 @@
2050	2038	ciab.ddra \|= (SER_DTR \| SER_RTS); /* outputs */
2051	2039	ciab.ddra &= ~(SER_DCD \| SER_CTS \| SER_DSR); /* inputs */
2052	2040
	2041	+ platform_set_drvdata(pdev, state);
	2042	+
2053	2043	return 0;
2054	2044
2055	2045	fail_free_irq:
2056	2046	free_irq(IRQ_AMIGA_TBE, state);
2057	2047	fail_unregister:
2058	2048	tty_unregister_driver(serial_driver);
2059		-fail_release_mem_region:
2060		- release_mem_region(CUSTOM_PHYSADDR+0x30, 4);
2061	2049	fail_put_tty_driver:
2062	2050	put_tty_driver(serial_driver);
2063	2051	return error;
2064	2052	}
2065	2053
2066		-static __exit void rs_exit(void)
	2054	+static int __exit amiga_serial_remove(struct platform_device *pdev)
2067	2055	{
2068	2056	int error;
2069		- struct async_struct *info = rs_table[0].info;
	2057	+ struct serial_state *state = platform_get_drvdata(pdev);
	2058	+ struct async_struct *info = state->info;
2070	2059
2071	2060	/* printk("Unloading %s: version %s\n", serial_name, serial_version); */
2072	2061	tasklet_kill(&info->tlet);
2073	2062
2074	2063
2075	2064
2076	2065
...	...	@@ -2075,21 +2064,40 @@
2075	2064	error);
2076	2065	put_tty_driver(serial_driver);
2077	2066
2078		- if (info) {
2079		- rs_table[0].info = NULL;
2080		- kfree(info);
2081		- }
	2067	+ rs_table[0].info = NULL;
	2068	+ kfree(info);
2082	2069
2083	2070	free_irq(IRQ_AMIGA_TBE, rs_table);
2084	2071	free_irq(IRQ_AMIGA_RBF, rs_table);
2085	2072
2086		- release_mem_region(CUSTOM_PHYSADDR+0x30, 4);
	2073	+ platform_set_drvdata(pdev, NULL);
	2074	+
	2075	+ return error;
2087	2076	}
2088	2077
2089		-module_init(rs_init)
2090		-module_exit(rs_exit)
	2078	+static struct platform_driver amiga_serial_driver = {
	2079	+ .remove = __exit_p(amiga_serial_remove),
	2080	+ .driver = {
	2081	+ .name = "amiga-serial",
	2082	+ .owner = THIS_MODULE,
	2083	+ },
	2084	+};
2091	2085
	2086	+static int __init amiga_serial_init(void)
	2087	+{
	2088	+ return platform_driver_probe(&amiga_serial_driver, amiga_serial_probe);
	2089	+}
2092	2090
	2091	+module_init(amiga_serial_init);
	2092	+
	2093	+static void __exit amiga_serial_exit(void)
	2094	+{
	2095	+ platform_driver_unregister(&amiga_serial_driver);
	2096	+}
	2097	+
	2098	+module_exit(amiga_serial_exit);
	2099	+
	2100	+
2093	2101	#if defined(CONFIG_SERIAL_CONSOLE) && !defined(MODULE)
2094	2102
2095	2103	/*
...	...	@@ -2154,4 +2162,5 @@
2154	2162	#endif /* CONFIG_SERIAL_CONSOLE && !MODULE */
2155	2163
2156	2164	MODULE_LICENSE("GPL");
	2165	+MODULE_ALIAS("platform:amiga-serial");