Input: atmel_mxt_ts - rename pressure to amplitude to match spec

Signed-off-by: Nick Dyer <nick.dyer@itdev.co.uk>
Acked-by: Benson Leung <bleung@chromium.org>
Acked-by: Yufeng Shen <miletus@chromium.org>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c
index f628ad021d1f4010c986a06f6011815caeab000e..2d8194c249735819d45b3af1b9650952f5e32b30 100644 (file)
--- a/drivers/input/touchscreen/atmel_mxt_ts.c
+++ b/drivers/input/touchscreen/atmel_mxt_ts.c
@@ -663,7 +663,7 @@ static void mxt_input_touchevent(struct mxt_data *data,
        int x;
        int y;
        int area;
-       int pressure;
+       int amplitude;
 
        x = (message->message[1] << 4) | ((message->message[3] >> 4) & 0xf);
        y = (message->message[2] << 4) | ((message->message[3] & 0xf));
@@ -673,7 +673,7 @@ static void mxt_input_touchevent(struct mxt_data *data,
                y = y >> 2;
 
        area = message->message[4];
-       pressure = message->message[5];
+       amplitude = message->message[5];
 
        dev_dbg(dev,
                "[%u] %c%c%c%c%c%c%c%c x: %5u y: %5u area: %3u amp: %3u\n",
@@ -686,7 +686,7 @@ static void mxt_input_touchevent(struct mxt_data *data,
                (status & MXT_AMP) ? 'A' : '.',
                (status & MXT_SUPPRESS) ? 'S' : '.',
                (status & MXT_UNGRIP) ? 'U' : '.',
-               x, y, area, pressure);
+               x, y, area, amplitude);
 
        input_mt_slot(input_dev, id);
        input_mt_report_slot_state(input_dev, MT_TOOL_FINGER,
@@ -695,7 +695,7 @@ static void mxt_input_touchevent(struct mxt_data *data,
        if (status & MXT_DETECT) {
                input_report_abs(input_dev, ABS_MT_POSITION_X, x);
                input_report_abs(input_dev, ABS_MT_POSITION_Y, y);
-               input_report_abs(input_dev, ABS_MT_PRESSURE, pressure);
+               input_report_abs(input_dev, ABS_MT_PRESSURE, amplitude);
                input_report_abs(input_dev, ABS_MT_TOUCH_MAJOR, area);
        }
 }