[Armadeus-commitlog] armadeus branch, master, updated. release-3.4-246-g044fd59

[Julien B a. A. <ar...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  044fd59f56b8510b6074c264d088403a574d7b09 (commit)
      from  ee8eb7655cb49b082c0c601e590a389bbeb153e9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 044fd59f56b8510b6074c264d088403a574d7b09
Author: Julien Boibessot <jul...@ar...>
Date:   Tue Jun 28 10:42:54 2011 +0200

    [LINUX] fpga/wishbone_twin_uart: correct the way platform_devices are registered

-----------------------------------------------------------------------

Summary of changes:
 .../linux/modules/fpga/wishbone_twin_uart/16750.c  |   40 ++++++++-----------
 1 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/target/linux/modules/fpga/wishbone_twin_uart/16750.c b/target/linux/modules/fpga/wishbone_twin_uart/16750.c
index 20a418d..caf1c1b 100644
--- a/target/linux/modules/fpga/wishbone_twin_uart/16750.c
+++ b/target/linux/modules/fpga/wishbone_twin_uart/16750.c
@@ -62,21 +62,22 @@ static struct plat_serial8250_port ocore_16750_uart1_data[] = {
 	}
 };
 
-static struct platform_device ocore_16750_uart0_device = {
-	.name	= "serial8250",
-	.id	= 0,
-	.dev	= {
-		.release	= plat_uart_release,
-		.platform_data	= ocore_16750_uart0_data,
+static struct platform_device ocore_16750_uart_devices[] = {
+	{
+		.name	= "serial8250",
+		.id	= 0,
+		.dev	= {
+			.release	= plat_uart_release,
+			.platform_data	= ocore_16750_uart0_data,
+		},
 	},
-};
-
-static struct platform_device ocore_16750_uart1_device = {
-	.name	= "serial8250",
-	.id	= 1,
-	.dev	= {
-		.release	= plat_uart_release,
-		.platform_data	= ocore_16750_uart1_data,
+	{
+		.name	= "serial8250",
+		.id	= 1,
+		.dev	= {
+			.release	= plat_uart_release,
+			.platform_data	= ocore_16750_uart1_data,
+		},
 	},
 };
 
@@ -113,21 +114,14 @@ static int __init ocore_16750_init(void)
 		return -ENODEV;
 	}
 
-	ret = platform_device_register(&ocore_16750_uart0_device);
-	if (ret < 0)
-		return ret;
-
-	ret = platform_device_register(&ocore_16750_uart1_device);
-	if (ret < 0)
-		return ret;
+	ret = platform_device_register(ocore_16750_uart_devices);
 
 	return ret;
 }
 
 static void __exit ocore_16750_exit(void)
 {
-	platform_device_unregister(&ocore_16750_uart0_device);
-	platform_device_unregister(&ocore_16750_uart1_device);
+	platform_device_unregister(ocore_16750_uart_devices);
 }
 
 module_init(ocore_16750_init);


hooks/post-receive
-- 
armadeus