From: Hans de Goede <hdegoede@redhat.com>
To: Dmitry Torokhov <dmitry.torokhov@gmail.com>,
Bastien Nocera <hadess@hadess.net>
Cc: Hans de Goede <hdegoede@redhat.com>,
linux-input@vger.kernel.org, Dmitry Mastykin <mastichi@gmail.com>
Subject: [PATCH v2 07/11] Input: goodix - Move defines to above struct goodix_ts_data declaration
Date: Thu, 5 Mar 2020 23:01:28 +0100 [thread overview]
Message-ID: <20200305220132.228722-7-hdegoede@redhat.com> (raw)
In-Reply-To: <20200305220132.228722-1-hdegoede@redhat.com>
Move the defines to above the struct goodix_ts_data declaration, so
that the MAX defines can be used inside the struct goodix_ts_data
declaration. No functional changes, just moving a block of code.
BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=1786317
BugLink: https://github.com/nexus511/gpd-ubuntu-packages/issues/10
BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=199207
Cc: Dmitry Mastykin <mastichi@gmail.com>
Reviewed-by: Bastien Nocera <hadess@hadess.net>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
drivers/input/touchscreen/goodix.c | 60 +++++++++++++++---------------
1 file changed, 30 insertions(+), 30 deletions(-)
diff --git a/drivers/input/touchscreen/goodix.c b/drivers/input/touchscreen/goodix.c
index b69eba353881..e6233d8695b2 100644
--- a/drivers/input/touchscreen/goodix.c
+++ b/drivers/input/touchscreen/goodix.c
@@ -29,6 +29,36 @@
#include <linux/of.h>
#include <asm/unaligned.h>
+#define GOODIX_GPIO_INT_NAME "irq"
+#define GOODIX_GPIO_RST_NAME "reset"
+
+#define GOODIX_MAX_HEIGHT 4096
+#define GOODIX_MAX_WIDTH 4096
+#define GOODIX_INT_TRIGGER 1
+#define GOODIX_CONTACT_SIZE 8
+#define GOODIX_MAX_CONTACT_SIZE 9
+#define GOODIX_MAX_CONTACTS 10
+
+#define GOODIX_CONFIG_MAX_LENGTH 240
+#define GOODIX_CONFIG_911_LENGTH 186
+#define GOODIX_CONFIG_967_LENGTH 228
+
+/* Register defines */
+#define GOODIX_REG_COMMAND 0x8040
+#define GOODIX_CMD_SCREEN_OFF 0x05
+
+#define GOODIX_READ_COOR_ADDR 0x814E
+#define GOODIX_GT1X_REG_CONFIG_DATA 0x8050
+#define GOODIX_GT9X_REG_CONFIG_DATA 0x8047
+#define GOODIX_REG_ID 0x8140
+
+#define GOODIX_BUFFER_STATUS_READY BIT(7)
+#define GOODIX_BUFFER_STATUS_TIMEOUT 20
+
+#define RESOLUTION_LOC 1
+#define MAX_CONTACTS_LOC 5
+#define TRIGGER_LOC 6
+
struct goodix_ts_data;
enum goodix_irq_pin_access_method {
@@ -68,36 +98,6 @@ struct goodix_ts_data {
unsigned int contact_size;
};
-#define GOODIX_GPIO_INT_NAME "irq"
-#define GOODIX_GPIO_RST_NAME "reset"
-
-#define GOODIX_MAX_HEIGHT 4096
-#define GOODIX_MAX_WIDTH 4096
-#define GOODIX_INT_TRIGGER 1
-#define GOODIX_CONTACT_SIZE 8
-#define GOODIX_MAX_CONTACT_SIZE 9
-#define GOODIX_MAX_CONTACTS 10
-
-#define GOODIX_CONFIG_MAX_LENGTH 240
-#define GOODIX_CONFIG_911_LENGTH 186
-#define GOODIX_CONFIG_967_LENGTH 228
-
-/* Register defines */
-#define GOODIX_REG_COMMAND 0x8040
-#define GOODIX_CMD_SCREEN_OFF 0x05
-
-#define GOODIX_READ_COOR_ADDR 0x814E
-#define GOODIX_GT1X_REG_CONFIG_DATA 0x8050
-#define GOODIX_GT9X_REG_CONFIG_DATA 0x8047
-#define GOODIX_REG_ID 0x8140
-
-#define GOODIX_BUFFER_STATUS_READY BIT(7)
-#define GOODIX_BUFFER_STATUS_TIMEOUT 20
-
-#define RESOLUTION_LOC 1
-#define MAX_CONTACTS_LOC 5
-#define TRIGGER_LOC 6
-
static int goodix_check_cfg_8(struct goodix_ts_data *ts,
const struct firmware *cfg);
static int goodix_check_cfg_16(struct goodix_ts_data *ts,
--
2.25.1
next prev parent reply other threads:[~2020-03-05 22:01 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-05 22:01 [PATCH v2 01/11] Input: goodix - Refactor IRQ pin GPIO accesses Hans de Goede
2020-03-05 22:01 ` [PATCH v2 02/11] Input: goodix - Make loading the config from disk independent from the GPIO setup Hans de Goede
2020-03-06 4:04 ` Dmitry Torokhov
2020-03-06 9:01 ` Hans de Goede
2020-03-07 0:14 ` Dmitry Torokhov
2020-03-05 22:01 ` [PATCH v2 03/11] Input: goodix - Make resetting the controller at probe " Hans de Goede
2020-03-05 22:01 ` [PATCH v2 04/11] Input: goodix - Add support for getting IRQ + reset GPIOs on Cherry Trail devices Hans de Goede
2020-03-05 22:01 ` [PATCH v2 05/11] Input: goodix - Add support for getting IRQ + reset GPIOs on Bay " Hans de Goede
2020-03-05 22:01 ` [PATCH v2 06/11] Input: goodix - Add support for controlling the IRQ pin through ACPI methods Hans de Goede
2020-03-05 22:01 ` Hans de Goede [this message]
2020-03-05 22:01 ` [PATCH v2 08/11] Input: goodix - Save a copy of the config from goodix_read_config() Hans de Goede
2020-03-05 22:01 ` [PATCH v2 09/11] Input: goodix - Add minimum firmware size check Hans de Goede
2020-03-05 22:01 ` [PATCH v2 10/11] Input: goodix - Make goodix_send_cfg() take a raw buffer as argument Hans de Goede
2020-03-05 22:01 ` [PATCH v2 11/11] Input: goodix - Restore config on resume if necessary Hans de Goede
2020-03-06 4:03 ` [PATCH v2 01/11] Input: goodix - Refactor IRQ pin GPIO accesses Dmitry Torokhov
2020-03-06 8:54 ` Hans de Goede
2020-03-06 23:58 ` Dmitry Torokhov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200305220132.228722-7-hdegoede@redhat.com \
--to=hdegoede@redhat.com \
--cc=dmitry.torokhov@gmail.com \
--cc=hadess@hadess.net \
--cc=linux-input@vger.kernel.org \
--cc=mastichi@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.