107 lines
3.0 KiB
Diff
107 lines
3.0 KiB
Diff
From: Henrik Rydberg <rydberg@euromail.se>
|
|
Date: Wed, 20 Jun 2012 18:00:06 +0200
|
|
Subject: [1/5] hwmon: (applesmc) Skip sensor mapping
|
|
|
|
commit edf48f3a73b027a99c92edab2b07d78fe77523cc upstream.
|
|
|
|
The special motion sensor mapping is unnecessary; remove it.
|
|
|
|
Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
|
|
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
|
|
---
|
|
drivers/hwmon/applesmc.c | 41 +++++++++++++----------------------------
|
|
1 file changed, 13 insertions(+), 28 deletions(-)
|
|
|
|
diff --git a/drivers/hwmon/applesmc.c b/drivers/hwmon/applesmc.c
|
|
index 2cde9ec..0162f55 100644
|
|
--- a/drivers/hwmon/applesmc.c
|
|
+++ b/drivers/hwmon/applesmc.c
|
|
@@ -96,10 +96,6 @@ static const char *const fan_speed_fmt[] = {
|
|
#define APPLESMC_INPUT_FUZZ 4 /* input event threshold */
|
|
#define APPLESMC_INPUT_FLAT 4
|
|
|
|
-#define SENSOR_X 0
|
|
-#define SENSOR_Y 1
|
|
-#define SENSOR_Z 2
|
|
-
|
|
#define to_index(attr) (to_sensor_dev_attr(attr)->index & 0xffff)
|
|
#define to_option(attr) (to_sensor_dev_attr(attr)->index >> 16)
|
|
|
|
@@ -432,30 +428,19 @@ static int applesmc_has_key(const char *key, bool *value)
|
|
}
|
|
|
|
/*
|
|
- * applesmc_read_motion_sensor - Read motion sensor (X, Y or Z).
|
|
+ * applesmc_read_s16 - Read 16-bit signed big endian register
|
|
*/
|
|
-static int applesmc_read_motion_sensor(int index, s16 *value)
|
|
+static int applesmc_read_s16(const char *key, s16 *value)
|
|
{
|
|
u8 buffer[2];
|
|
int ret;
|
|
|
|
- switch (index) {
|
|
- case SENSOR_X:
|
|
- ret = applesmc_read_key(MOTION_SENSOR_X_KEY, buffer, 2);
|
|
- break;
|
|
- case SENSOR_Y:
|
|
- ret = applesmc_read_key(MOTION_SENSOR_Y_KEY, buffer, 2);
|
|
- break;
|
|
- case SENSOR_Z:
|
|
- ret = applesmc_read_key(MOTION_SENSOR_Z_KEY, buffer, 2);
|
|
- break;
|
|
- default:
|
|
- ret = -EINVAL;
|
|
- }
|
|
+ ret = applesmc_read_key(key, buffer, 2);
|
|
+ if (ret)
|
|
+ return ret;
|
|
|
|
*value = ((s16)buffer[0] << 8) | buffer[1];
|
|
-
|
|
- return ret;
|
|
+ return 0;
|
|
}
|
|
|
|
/*
|
|
@@ -624,8 +609,8 @@ static struct platform_driver applesmc_driver = {
|
|
*/
|
|
static void applesmc_calibrate(void)
|
|
{
|
|
- applesmc_read_motion_sensor(SENSOR_X, &rest_x);
|
|
- applesmc_read_motion_sensor(SENSOR_Y, &rest_y);
|
|
+ applesmc_read_s16(MOTION_SENSOR_X_KEY, &rest_x);
|
|
+ applesmc_read_s16(MOTION_SENSOR_Y_KEY, &rest_y);
|
|
rest_x = -rest_x;
|
|
}
|
|
|
|
@@ -634,9 +619,9 @@ static void applesmc_idev_poll(struct input_polled_dev *dev)
|
|
struct input_dev *idev = dev->input;
|
|
s16 x, y;
|
|
|
|
- if (applesmc_read_motion_sensor(SENSOR_X, &x))
|
|
+ if (applesmc_read_s16(MOTION_SENSOR_X_KEY, &x))
|
|
return;
|
|
- if (applesmc_read_motion_sensor(SENSOR_Y, &y))
|
|
+ if (applesmc_read_s16(MOTION_SENSOR_Y_KEY, &y))
|
|
return;
|
|
|
|
x = -x;
|
|
@@ -659,13 +644,13 @@ static ssize_t applesmc_position_show(struct device *dev,
|
|
int ret;
|
|
s16 x, y, z;
|
|
|
|
- ret = applesmc_read_motion_sensor(SENSOR_X, &x);
|
|
+ ret = applesmc_read_s16(MOTION_SENSOR_X_KEY, &x);
|
|
if (ret)
|
|
goto out;
|
|
- ret = applesmc_read_motion_sensor(SENSOR_Y, &y);
|
|
+ ret = applesmc_read_s16(MOTION_SENSOR_Y_KEY, &y);
|
|
if (ret)
|
|
goto out;
|
|
- ret = applesmc_read_motion_sensor(SENSOR_Z, &z);
|
|
+ ret = applesmc_read_s16(MOTION_SENSOR_Z_KEY, &z);
|
|
if (ret)
|
|
goto out;
|
|
|