Input: atmel_mxt_ts - remove unused defines

Many of these values are out of date and they aren't used in the driver
- all they do is increase the size of the kernel source.

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 0e743b3a691bdc87b080bb8dfa3a41030dd59a86..d53d4ac57f335065f1494140be51e2d19d97f171 100644 (file)
--- a/drivers/input/touchscreen/atmel_mxt_ts.c
+++ b/drivers/input/touchscreen/atmel_mxt_ts.c
@@ -29,27 +29,13 @@
 #include <linux/slab.h>
 #include <asm/unaligned.h>
 
-/* Version */
-#define MXT_VER_20             20
-#define MXT_VER_21             21
-#define MXT_VER_22             22
-
 /* Firmware files */
 #define MXT_FW_NAME            "maxtouch.fw"
 #define MXT_CFG_NAME           "maxtouch.cfg"
 #define MXT_CFG_MAGIC          "OBP_RAW V1"
 
 /* Registers */
-#define MXT_INFO               0x00
-#define MXT_FAMILY_ID          0x00
-#define MXT_VARIANT_ID         0x01
-#define MXT_VERSION            0x02
-#define MXT_BUILD              0x03
-#define MXT_MATRIX_X_SIZE      0x04
-#define MXT_MATRIX_Y_SIZE      0x05
-#define MXT_OBJECT_NUM         0x06
 #define MXT_OBJECT_START       0x07
-
 #define MXT_OBJECT_SIZE                6
 #define MXT_INFO_CHECKSUM_SIZE 3
 #define MXT_MAX_BLOCK_WRITE    256
@@ -111,15 +97,6 @@ struct t7_config {
 #define MXT_POWER_CFG_RUN              0
 #define MXT_POWER_CFG_DEEPSLEEP                1
 
-/* MXT_GEN_ACQUIRE_T8 field */
-#define MXT_ACQUIRE_CHRGTIME   0
-#define MXT_ACQUIRE_TCHDRIFT   2
-#define MXT_ACQUIRE_DRIFTST    3
-#define MXT_ACQUIRE_TCHAUTOCAL 4
-#define MXT_ACQUIRE_SYNC       5
-#define MXT_ACQUIRE_ATCHCALST  6
-#define MXT_ACQUIRE_ATCHCALSTHR        7
-
 /* MXT_TOUCH_MULTI_T9 field */
 #define MXT_T9_CTRL            0
 #define MXT_T9_ORIENT          9
@@ -143,51 +120,10 @@ struct t9_range {
 /* MXT_TOUCH_MULTI_T9 orient */
 #define MXT_T9_ORIENT_SWITCH   (1 << 0)
 
-/* MXT_PROCI_GRIPFACE_T20 field */
-#define MXT_GRIPFACE_CTRL      0
-#define MXT_GRIPFACE_XLOGRIP   1
-#define MXT_GRIPFACE_XHIGRIP   2
-#define MXT_GRIPFACE_YLOGRIP   3
-#define MXT_GRIPFACE_YHIGRIP   4
-#define MXT_GRIPFACE_MAXTCHS   5
-#define MXT_GRIPFACE_SZTHR1    7
-#define MXT_GRIPFACE_SZTHR2    8
-#define MXT_GRIPFACE_SHPTHR1   9
-#define MXT_GRIPFACE_SHPTHR2   10
-#define MXT_GRIPFACE_SUPEXTTO  11
-
-/* MXT_PROCI_NOISE field */
-#define MXT_NOISE_CTRL         0
-#define MXT_NOISE_OUTFLEN      1
-#define MXT_NOISE_GCAFUL_LSB   3
-#define MXT_NOISE_GCAFUL_MSB   4
-#define MXT_NOISE_GCAFLL_LSB   5
-#define MXT_NOISE_GCAFLL_MSB   6
-#define MXT_NOISE_ACTVGCAFVALID        7
-#define MXT_NOISE_NOISETHR     8
-#define MXT_NOISE_FREQHOPSCALE 10
-#define MXT_NOISE_FREQ0                11
-#define MXT_NOISE_FREQ1                12
-#define MXT_NOISE_FREQ2                13
-#define MXT_NOISE_FREQ3                14
-#define MXT_NOISE_FREQ4                15
-#define MXT_NOISE_IDLEGCAFVALID        16
-
 /* MXT_SPT_COMMSCONFIG_T18 */
 #define MXT_COMMS_CTRL         0
 #define MXT_COMMS_CMD          1
 
-/* MXT_SPT_CTECONFIG_T28 field */
-#define MXT_CTE_CTRL           0
-#define MXT_CTE_CMD            1
-#define MXT_CTE_MODE           2
-#define MXT_CTE_IDLEGCAFDEPTH  3
-#define MXT_CTE_ACTVGCAFDEPTH  4
-#define MXT_CTE_VOLTAGE                5
-
-#define MXT_VOLTAGE_DEFAULT    2700000
-#define MXT_VOLTAGE_STEP       10000
-
 /* Define for MXT_GEN_COMMAND_T6 */
 #define MXT_BOOT_VALUE         0xa5
 #define MXT_RESET_VALUE                0x01
@@ -1543,7 +1479,7 @@ static int mxt_get_info(struct mxt_data *data)
        int error;
 
        /* Read 7-byte info block starting at address 0 */
-       error = __mxt_read_reg(client, MXT_INFO, sizeof(*info), info);
+       error = __mxt_read_reg(client, 0, sizeof(*info), info);
        if (error)
                return error;