Received: by 2002:a05:6a10:5bc5:0:0:0:0 with SMTP id os5csp3438855pxb; Wed, 13 Oct 2021 06:08:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzLeycGCJtec1nlPHS51h+yiuOr4AFoxpfzHFfB0HoV70lzIbEvFSDbYudsDw+cqUCcb4HM X-Received: by 2002:a05:6402:3509:: with SMTP id b9mr9368642edd.187.1634130534057; Wed, 13 Oct 2021 06:08:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1634130534; cv=none; d=google.com; s=arc-20160816; b=W9Z1YueGamR4az4oORylfG6oEj/KU1nldquzCtrOQXpGBYYBfpXoZpg6xq02bian+0 k81xG+x5b4dhedKuhqvQh8nStmyj5DX6MEBVk338GqTEj0meXQ/NwW/NA8IChPkM3In+ /5w9qn5Mo+ZU9e3rZpEdxzdX4xv8L25C5FLLX3q27sPrZ0QiCxXqTh42pTen93UPVEbs 0eAZeydV+M4ImqM0H6GuRWvSpNIOEG6/wA0GxzXDQtWuwxHbVgsiLocwGHASuoQ+or/U VlDrmd6dZi9qy5J4Uh1v7cXLt8r3QTcIDekwmmWNI9cutv1CrzPvYXeYgBV1eNZa4j3F HjKQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:subject:message-id:date:from:in-reply-to :references:mime-version:dkim-signature; bh=BmxCgvHnbMyDOEQoqKbrgihOPr63Ldit95e9FjkQGkY=; b=oJ234ulFvAjgk679TtyVAlGi5yI8YJUP+YF7lxKcxX48pXhMnWcwyBazFavPWzOZKY 9nZwB+wqZC05ej+gLntNV1dP1xOUPj7AImF0PhtYNmVUQMAO03r/fe4Q7SMXoXnP0XFi 91PcuS18xxvxQZlBlaiDHcnyzKqioE/g4AEPLFiUkHkv/TWeicwhyVeaqiXlpXtxIPiv OgyLgxWt10dTojZL1KGbjJn3CciHdUkhCuZPzyZAnY0MgMAXN1gqgZR8xAuwXjDU72cB jHS875xbqpTyFZNR45w5cZno0mVHiPaxKfBza2eSnPIksX8n+T8Mw7WLJ8iqA5/MBMOq ALQw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=LHl8jelZ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id a11si18840435edf.98.2021.10.13.06.08.29; Wed, 13 Oct 2021 06:08:54 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=LHl8jelZ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234864AbhJMNI3 (ORCPT + 99 others); Wed, 13 Oct 2021 09:08:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58460 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231294AbhJMNI2 (ORCPT ); Wed, 13 Oct 2021 09:08:28 -0400 Received: from mail-il1-x130.google.com (mail-il1-x130.google.com [IPv6:2607:f8b0:4864:20::130]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 06390C061570; Wed, 13 Oct 2021 06:06:25 -0700 (PDT) Received: by mail-il1-x130.google.com with SMTP id s3so2718664ild.0; Wed, 13 Oct 2021 06:06:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=BmxCgvHnbMyDOEQoqKbrgihOPr63Ldit95e9FjkQGkY=; b=LHl8jelZkdKSOSnxp5vj9ZL3ON9uworyiozD56ig46/0AUiJC/OOaP+XbEGhgplWqg ZEVwNbjXXRmboHUK6HHlXdt/ps+5kQaLmntZ0vqB4nU/vAx7SGMx+QOjbCuQeuT0gIIa aPv1lP4oWEO8G8hQUdEHUMyp5aYBzXvfeRNrwb/m+GlKzMRCCbbbZzgWFwm85tMmD4kK YQfzNTGQTuarFj/4Co/IjiQWW7ybGIp4VAFpQqlxX1vYFxfrZbhgazYrm/S9Wdxbxyun JI4P0M0UpIB6dsdqyl1qiUR+mz5n0QvDBx0SNQOn3mmauWAdpE5nZGpuXlANxC0qZuGg gB0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=BmxCgvHnbMyDOEQoqKbrgihOPr63Ldit95e9FjkQGkY=; b=U8VvkvFJESWXkW6AoCS9uXEf0D7x2YsaxYFXTb5Bii76g8HUMcCZZTo+D02PCv3e5W 81r0jrUk1Pu8dU260AyLNFc2zfG/qSn7oCafurCKyvObxjamYgtFXt3l45cakdQClXkR GOtDv8VftIzZis0xhi+Pfwjvx8rEd92Q4JYdOgZVLY9g/XZTZcNCK4UROG7zejH1u1F6 RrIYun9HuUsjzmyXHgttR4CQ6H29xEdjDdY2lp1dZy80gdVulH7PSm/J0EHX2H46ERmB Nxt32Qa5aU3NQtl87KOg6j5vqeQcHpGANFQNRiuMWKvXR2B4AjIKCloJp4e5B+9LL2Ap ekog== X-Gm-Message-State: AOAM530ZqguieJUrQMo5e5CjhKpT91NpGMHk7mTL6i12mz9A98mgyOsi n8FYeyTxnCKtjngDHfkEfwQO65RCw4eHBUeKsvRNSvuweMeOCg== X-Received: by 2002:a05:6e02:1ba8:: with SMTP id n8mr2714576ili.74.1634130384477; Wed, 13 Oct 2021 06:06:24 -0700 (PDT) MIME-Version: 1.0 References: <20211009113707.17568-1-alistair@alistair23.me> In-Reply-To: From: Alistair Francis Date: Wed, 13 Oct 2021 23:05:58 +1000 Message-ID: Subject: Re: [PATCH 1/2] Input: wacom_i2c - Clean up the query device fields To: Dmitry Torokhov Cc: Alistair Francis , linux-input , Linux Kernel Mailing List Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Oct 13, 2021 at 1:10 PM Dmitry Torokhov wrote: > > Hi Alistair, > > On Sat, Oct 09, 2021 at 09:37:06PM +1000, Alistair Francis wrote: > > Improve the query device fields to be more verbose. > > > > Signed-off-by: Alistair Francis > > --- > > drivers/input/touchscreen/wacom_i2c.c | 49 ++++++++++++++++----------- > > 1 file changed, 30 insertions(+), 19 deletions(-) > > > > diff --git a/drivers/input/touchscreen/wacom_i2c.c b/drivers/input/touchscreen/wacom_i2c.c > > index 22826c387da5..8d7267ccc661 100644 > > --- a/drivers/input/touchscreen/wacom_i2c.c > > +++ b/drivers/input/touchscreen/wacom_i2c.c > > @@ -14,13 +14,21 @@ > > #include > > #include > > > > -#define WACOM_CMD_QUERY0 0x04 > > -#define WACOM_CMD_QUERY1 0x00 > > -#define WACOM_CMD_QUERY2 0x33 > > -#define WACOM_CMD_QUERY3 0x02 > > -#define WACOM_CMD_THROW0 0x05 > > -#define WACOM_CMD_THROW1 0x00 > > -#define WACOM_QUERY_SIZE 19 > > +// Registers > > +#define WACOM_COMMAND_LSB 0x04 > > +#define WACOM_COMMAND_MSB 0x00 > > + > > +#define WACOM_DATA_LSB 0x05 > > +#define WACOM_DATA_MSB 0x00 > > + > > +// Report types > > +#define REPORT_FEATURE 0x30 > > + > > +// Requests / operations > > +#define OPCODE_GET_REPORT 0x02 > > + > > +#define WACOM_QUERY_REPORT 3 > > +#define WACOM_QUERY_SIZE 22 > > > > struct wacom_features { > > int x_max; > > @@ -41,27 +49,30 @@ static int wacom_query_device(struct i2c_client *client, > > struct wacom_features *features) > > { > > int ret; > > - u8 cmd1[] = { WACOM_CMD_QUERY0, WACOM_CMD_QUERY1, > > - WACOM_CMD_QUERY2, WACOM_CMD_QUERY3 }; > > - u8 cmd2[] = { WACOM_CMD_THROW0, WACOM_CMD_THROW1 }; > > u8 data[WACOM_QUERY_SIZE]; > > + > > + u8 get_query_data_cmd[] = { > > + WACOM_COMMAND_LSB, > > + WACOM_COMMAND_MSB, > > + REPORT_FEATURE | WACOM_QUERY_REPORT, > > + OPCODE_GET_REPORT, > > + WACOM_DATA_LSB, > > + WACOM_DATA_MSB, > > + }; > > + > > struct i2c_msg msgs[] = { > > + // Request reading of feature ReportID: 3 (Pen Query Data) > > { > > .addr = client->addr, > > .flags = 0, > > - .len = sizeof(cmd1), > > - .buf = cmd1, > > - }, > > - { > > - .addr = client->addr, > > - .flags = 0, > > - .len = sizeof(cmd2), > > - .buf = cmd2, > > + .len = sizeof(get_query_data_cmd), > > + .buf = get_query_data_cmd, > > }, > > + // Read 21 bytes > > { > > .addr = client->addr, > > .flags = I2C_M_RD, > > - .len = sizeof(data), > > + .len = WACOM_QUERY_SIZE - 1, > > Why is this change? If we are indeed supposed to read 1 byte less this > should be a separate patch. It shouldn't be a change, we are still reading 21 bytes of data. We are just using a macro instead of sizeof(). Alistair