lkml.org 
[lkml]   [2020]   [Mar]   [31]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v10 36/55] Input: atmel_mxt_ts - eliminate data->raw_info_block
    Date
    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_wang@mentor.com>
    Signed-off-by: George G. Davis <george_davis@mentor.com>
    Signed-off-by: Vladimir Zapolskiy <vladimir_zapolskiy@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 9476326596d9..36a87d9b9c83 100644
    --- a/drivers/input/touchscreen/atmel_mxt_ts.c
    +++ b/drivers/input/touchscreen/atmel_mxt_ts.c
    @@ -323,7 +323,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;
    @@ -2067,9 +2066,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;
    @@ -2238,7 +2236,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 */
    @@ -2289,7 +2287,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
    \
     
     \ /
      Last update: 2020-03-31 12:55    [W:3.695 / U:0.276 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site