---

yaml --- r: 67193 b: refs/heads/master c: ba28cc0 h: refs/heads/master i: 67191: 847b40a v: v3
git-mirror · Aug 17, 2007 · ba3b80b · ba3b80b
1 parent 56906dd
commit ba3b80b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 12 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a4fc3a3cead7f9e00dc0f6e00238b11c030f94cc
+refs/heads/master: ba28cc09316510aacb17f8421fdaae37969a4d5b
diff --git a/trunk/arch/powerpc/platforms/pseries/rtasd.c b/trunk/arch/powerpc/platforms/pseries/rtasd.c
@@ -361,26 +361,17 @@ static int enable_surveillance(int timeout)
 
 static int get_eventscan_parms(void)
 {
-	struct device_node *node;
-	const int *ip;
-
-	node = of_find_node_by_path("/rtas");
-
-	ip = of_get_property(node, "rtas-event-scan-rate", NULL);
-	if (ip == NULL) {
+	rtas_event_scan_rate = rtas_token("rtas-event-scan-rate");
+	if (rtas_event_scan_rate == RTAS_UNKNOWN_SERVICE) {
 		printk(KERN_ERR "rtasd: no rtas-event-scan-rate\n");
-		of_node_put(node);
 		return -1;
 	}
-	rtas_event_scan_rate = *ip;
 	DEBUG("rtas-event-scan-rate %d\n", rtas_event_scan_rate);
 
 	/* Make room for the sequence number */
 	rtas_error_log_max = rtas_get_error_log_max();
 	rtas_error_log_buffer_max = rtas_error_log_max + sizeof(int);
 
-	of_node_put(node);
-
 	return 0;
 }