lkml.org 
[lkml]   [2013]   [Jun]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 10/51] Input: atmel_mxt_ts - Improve error reporting and debug
    Date
    Add error messages for probe errors
    Report type in invalid object type
    Tweak some other debug output messages

    Signed-off-by: Nick Dyer <nick.dyer@itdev.co.uk>
    Acked-by: Benson Leung <bleung@chromium.org>
    ---
    drivers/input/touchscreen/atmel_mxt_ts.c | 33 +++++++++++++++++++++---------
    1 file changed, 23 insertions(+), 10 deletions(-)

    diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c
    index 11ee78a..471bc4d 100644
    --- a/drivers/input/touchscreen/atmel_mxt_ts.c
    +++ b/drivers/input/touchscreen/atmel_mxt_ts.c
    @@ -424,7 +424,8 @@ recheck:
    }

    if (val != state) {
    - dev_err(&client->dev, "Unvalid bootloader mode state\n");
    + dev_err(&client->dev, "Invalid bootloader state %02X != %02X\n",
    + val, state);
    return -EINVAL;
    }

    @@ -544,7 +545,7 @@ mxt_get_object(struct mxt_data *data, u8 type)
    return object;
    }

    - dev_err(&data->client->dev, "Invalid object type\n");
    + dev_err(&data->client->dev, "Invalid object type T%u\n", type);
    return NULL;
    }

    @@ -889,7 +890,7 @@ static int mxt_get_object_table(struct mxt_data *data)
    }

    dev_dbg(&data->client->dev,
    - "Type %2d Start %3d Size %3d Instances %2d ReportIDs %3u : %3u\n",
    + "T%u Start:%u Size:%u Instances:%u Report IDs:%u-%u\n",
    object->type, object->start_address,
    mxt_obj_size(object), mxt_obj_instances(object),
    min_id, max_id);
    @@ -944,8 +945,10 @@ static int mxt_initialize(struct mxt_data *data)

    /* Get object table information */
    error = mxt_get_object_table(data);
    - if (error)
    + if (error) {
    + dev_err(&client->dev, "Error %d reading object table\n", error);
    goto err_free_object_table;
    + }

    error = mxt_acquire_irq(data);
    if (error)
    @@ -953,8 +956,11 @@ static int mxt_initialize(struct mxt_data *data)

    /* Check register init values */
    error = mxt_check_reg_init(data);
    - if (error)
    + if (error) {
    + dev_err(&client->dev, "Error %d initialising configuration\n",
    + error);
    goto err_free_object_table;
    + }

    error = mxt_t6_command(data, MXT_COMMAND_BACKUPNV,
    MXT_BACKUP_VALUE, false);
    @@ -973,12 +979,12 @@ static int mxt_initialize(struct mxt_data *data)
    info->matrix_ysize = val;

    dev_info(&client->dev,
    - "Family ID: %u Variant ID: %u Major.Minor.Build: %u.%u.%02X\n",
    + "Family: %u Variant: %u Firmware V%u.%u.%02X\n",
    info->family_id, info->variant_id, info->version >> 4,
    info->version & 0xf, info->build);

    dev_info(&client->dev,
    - "Matrix X Size: %u Matrix Y Size: %u Object Num: %u\n",
    + "Matrix X Size: %u Matrix Y Size: %u Objects: %u\n",
    info->matrix_xsize, info->matrix_ysize,
    info->object_num);

    @@ -1187,7 +1193,8 @@ static ssize_t mxt_update_fw_store(struct device *dev,
    dev_err(dev, "The firmware update failed(%d)\n", error);
    count = error;
    } else {
    - dev_dbg(dev, "The firmware update succeeded\n");
    + dev_info(dev, "The firmware update succeeded\n");
    +
    mxt_free_object_table(data);

    error = mxt_initialize(data);
    @@ -1352,12 +1359,18 @@ static int mxt_probe(struct i2c_client *client,
    i2c_set_clientdata(client, data);

    error = input_register_device(input_dev);
    - if (error)
    + if (error) {
    + dev_err(&client->dev, "Error %d registering input device\n",
    + error);
    goto err_free_object;
    + }

    error = sysfs_create_group(&client->dev.kobj, &mxt_attr_group);
    - if (error)
    + if (error) {
    + dev_err(&client->dev, "Failure %d creating sysfs group\n",
    + error);
    goto err_unregister_device;
    + }

    return 0;

    --
    1.7.10.4


    \
     
     \ /
      Last update: 2013-06-27 16:21    [W:2.630 / U:0.024 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site