|
@@ -19,13 +19,10 @@
|
|
|
*/
|
|
|
|
|
|
#include <linux/delay.h>
|
|
|
-#include <linux/mutex.h>
|
|
|
#include <linux/of_platform.h>
|
|
|
#include <asm/opal.h>
|
|
|
#include <asm/machdep.h>
|
|
|
|
|
|
-static DEFINE_MUTEX(opal_sensor_mutex);
|
|
|
-
|
|
|
/*
|
|
|
* This will return sensor information to driver based on the requested sensor
|
|
|
* handle. A handle is an opaque id for the powernv, read by the driver from the
|
|
@@ -38,13 +35,9 @@ int opal_get_sensor_data(u32 sensor_hndl, u32 *sensor_data)
|
|
|
__be32 data;
|
|
|
|
|
|
token = opal_async_get_token_interruptible();
|
|
|
- if (token < 0) {
|
|
|
- pr_err("%s: Couldn't get the token, returning\n", __func__);
|
|
|
- ret = token;
|
|
|
- goto out;
|
|
|
- }
|
|
|
+ if (token < 0)
|
|
|
+ return token;
|
|
|
|
|
|
- mutex_lock(&opal_sensor_mutex);
|
|
|
ret = opal_sensor_read(sensor_hndl, token, &data);
|
|
|
switch (ret) {
|
|
|
case OPAL_ASYNC_COMPLETION:
|
|
@@ -52,7 +45,7 @@ int opal_get_sensor_data(u32 sensor_hndl, u32 *sensor_data)
|
|
|
if (ret) {
|
|
|
pr_err("%s: Failed to wait for the async response, %d\n",
|
|
|
__func__, ret);
|
|
|
- goto out_token;
|
|
|
+ goto out;
|
|
|
}
|
|
|
|
|
|
ret = opal_error_code(opal_get_async_rc(msg));
|
|
@@ -73,10 +66,8 @@ int opal_get_sensor_data(u32 sensor_hndl, u32 *sensor_data)
|
|
|
break;
|
|
|
}
|
|
|
|
|
|
-out_token:
|
|
|
- mutex_unlock(&opal_sensor_mutex);
|
|
|
- opal_async_release_token(token);
|
|
|
out:
|
|
|
+ opal_async_release_token(token);
|
|
|
return ret;
|
|
|
}
|
|
|
EXPORT_SYMBOL_GPL(opal_get_sensor_data);
|