[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>

diff --git a/arch/powerpc/platforms/pseries/rtasd.c b/arch/powerpc/platforms/pseries/rtasd.c
index 762fe87629ff6ac2f9db5654ddc9077e26e75b9d..48e6dc0ae15ae3be2f0e419a3a801fdc0a347923 100644 (file)
--- 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;
 }