[PATCH v11 38/56] Input: atmel_mxt_ts - eliminate data->raw_info_block

[Jiada Wang]

Dynamically allocated in mxt_read_info_block() buffer buf is assigned
both to data->info and data->raw_info_block, having both data->info
and data->raw_info_block is redundant and confusing.

This patch eliminates data->raw_info_block.

Signed-off-by: Jiada Wang <jiada_w...@mentor.com>
Signed-off-by: George G. Davis <george_da...@mentor.com>
Signed-off-by: Vladimir Zapolskiy <vladimir_zapols...@mentor.com>
---
 drivers/input/touchscreen/atmel_mxt_ts.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c 
b/drivers/input/touchscreen/atmel_mxt_ts.c
index 92c883087a4f..a92ad9a103a1 100644
--- a/drivers/input/touchscreen/atmel_mxt_ts.c
+++ b/drivers/input/touchscreen/atmel_mxt_ts.c
@@ -324,7 +324,6 @@ struct mxt_data {
        char phys[64];          /* device physical location */
        struct mxt_object *object_table;
        struct mxt_info *info;
-       void *raw_info_block;
        unsigned int irq;
        unsigned int max_x;
        unsigned int max_y;
@@ -2053,9 +2052,8 @@ static void mxt_free_object_table(struct mxt_data *data)
        v4l2_device_unregister(&data->dbg.v4l2);
 #endif
        data->object_table = NULL;
+       kfree(data->info);
        data->info = NULL;
-       kfree(data->raw_info_block);
-       data->raw_info_block = NULL;
        kfree(data->msg_buf);
        data->msg_buf = NULL;
        data->T5_address = 0;
@@ -2224,7 +2222,7 @@ static int mxt_read_info_block(struct mxt_data *data)
        u8 *crc_ptr;
 
        /* If info block already allocated, free it */
-       if (data->raw_info_block)
+       if (data->info)
                mxt_free_object_table(data);
 
        /* Read 7-byte ID information block starting at address 0 */
@@ -2275,7 +2273,6 @@ static int mxt_read_info_block(struct mxt_data *data)
                goto err_free_mem;
        }
 
-       data->raw_info_block = id_buf;
        data->info = (struct mxt_info *)id_buf;
 
        dev_info(&client->dev,
-- 
2.17.1