From 35e35e1e9a7529860a2d0ed893d3b0e9a2780263 Mon Sep 17 00:00:00 2001 From: Anton Blanchard Date: Wed, 21 Mar 2012 15:53:43 +0000 Subject: [PATCH] --- yaml --- r: 297181 b: refs/heads/master c: 587f83e8dd50d22bc0c62e32ec49fd319b0912fe h: refs/heads/master i: 297179: df0ef3ba7cbdf2028803b41864230ba0d3669e2a v: v3 --- [refs] | 2 +- trunk/arch/powerpc/platforms/pseries/ras.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 5a5e7e67acbb..851ca64721b7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 55fc0c561742c710857dc5a7a591b461a561cf1f +refs/heads/master: 587f83e8dd50d22bc0c62e32ec49fd319b0912fe diff --git a/trunk/arch/powerpc/platforms/pseries/ras.c b/trunk/arch/powerpc/platforms/pseries/ras.c index 4246d7b9dce9..670b45bde8f1 100644 --- a/trunk/arch/powerpc/platforms/pseries/ras.c +++ b/trunk/arch/powerpc/platforms/pseries/ras.c @@ -59,7 +59,6 @@ static DEFINE_SPINLOCK(ras_log_buf_lock); static char global_mce_data_buf[RTAS_ERROR_LOG_MAX]; static DEFINE_PER_CPU(__u64, mce_data_buf); -static int ras_get_sensor_state_token; static int ras_check_exception_token; #define EPOW_SENSOR_TOKEN 9 @@ -77,7 +76,6 @@ static int __init init_ras_IRQ(void) { struct device_node *np; - ras_get_sensor_state_token = rtas_token("get-sensor-state"); ras_check_exception_token = rtas_token("check-exception"); /* Internal Errors */ @@ -213,8 +211,7 @@ static irqreturn_t ras_epow_interrupt(int irq, void *dev_id) int state; int critical; - status = rtas_call(ras_get_sensor_state_token, 2, 2, &state, - EPOW_SENSOR_TOKEN, EPOW_SENSOR_INDEX); + status = rtas_get_sensor(EPOW_SENSOR_TOKEN, EPOW_SENSOR_INDEX, &state); if (state > 3) critical = 1; /* Time Critical */