summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinas Vepstas <linas@austin.ibm.com>2007-08-09 00:02:10 +0400
committerPaul Mackerras <paulus@samba.org>2007-08-17 05:01:52 +0400
commitba28cc09316510aacb17f8421fdaae37969a4d5b (patch)
tree1f9c31e5574c266a277955ef809e7a99e3bd2eb5
parenta4fc3a3cead7f9e00dc0f6e00238b11c030f94cc (diff)
downloadlinux-ba28cc09316510aacb17f8421fdaae37969a4d5b.tar.xz
[POWERPC] pseries: Use rtas_token instead of hand-rolled code
The rtas_token() call does the same thing as this hand-rolled code. This makes the code easier to read. Signed-off-by: Linas Vepstas <linas@austin.ibm.com> ---- arch/powerpc/platforms/pseries/rtasd.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) Signed-off-by: Paul Mackerras <paulus@samba.org>
-rw-r--r--arch/powerpc/platforms/pseries/rtasd.c13
1 files changed, 2 insertions, 11 deletions
diff --git a/arch/powerpc/platforms/pseries/rtasd.c b/arch/powerpc/platforms/pseries/rtasd.c
index 762fe87629ff..48e6dc0ae15a 100644
--- a/arch/powerpc/platforms/pseries/rtasd.c
+++ b/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;
}