[Gc-linux-cvs] linux/arch/powerpc/platforms/embedded6xx starlet-ipc.c, 1.4, 1.5

[Albert H. <he...@us...>]

Update of /cvsroot/gc-linux/linux/arch/powerpc/platforms/embedded6xx
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv32110/arch/powerpc/platforms/embedded6xx

Modified Files:
	starlet-ipc.c 
Log Message:
- move memory allocation functions to starlet-malloc
- add gfp_t flags to starlet_ipc_alloc_request
- bootstrap malloc library from ipc initialization code
- change (experiment) a bit with the irq completion logic for ipc
- use per call type automatic completion handlers
- separate the allocation and preparation of ipc requests
- close the 24 file descriptors on startup
- comment out part of the debugging code
- add (disabled) watchdog code to report long-standing ipc requests



Index: starlet-ipc.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/powerpc/platforms/embedded6xx/starlet-ipc.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- starlet-ipc.c	12 Apr 2008 17:22:28 -0000	1.4
+++ starlet-ipc.c	2 Jul 2008 20:38:46 -0000	1.5
@@ -14,7 +14,8 @@
 
 #define DEBUG
 
-#define DBG(fmt, arg...)	pr_debug(fmt, ##arg)
+//#define DBG(fmt, arg...)	pr_debug(fmt, ##arg)
+#define DBG(fmt, arg...)	drv_printk(KERN_INFO, fmt, ##arg)
 
 #include <linux/kernel.h>
 #include <linux/module.h>
@@ -22,6 +23,7 @@
 #include <linux/of_platform.h>
[...1326 lines suppressed...]
+	int error;
 
-	retval = of_address_to_resource(odev->node, 0, &res);
-	if (retval) {
+	error = of_address_to_resource(odev->node, 0, &mem[0]);
+	if (error) {
 		drv_printk(KERN_ERR, "no io memory range found\n");
 		return -ENODEV;
 	}
+	error = of_address_to_resource(odev->node, 1, &mem[1]);
+	if (error) {
+		drv_printk(KERN_ERR, "missing ioh memory area (%d)\n", error);
+		return -ENODEV;
+	}
 
-	return starlet_ipc_do_probe(&odev->dev, &res,
+	return starlet_ipc_do_probe(&odev->dev, mem,
 				    irq_of_parse_and_map(odev->node, 0));
 }