summaryrefslogtreecommitdiffstats
path: root/drivers/input/mouse/synaptics.c
diff options
context:
space:
mode:
authorVincent Huang <vincent.huang@tw.synaptics.com>2020-10-04 19:42:47 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2020-10-04 19:51:43 -0700
commit261bfb3328b89c63ca410ae30a0c87cd3955344c (patch)
tree86d4134e3bd29eb1a31dc0fd15b719d899017c52 /drivers/input/mouse/synaptics.c
parent26822652c85eff14e40115255727b2693400c524 (diff)
downloadlinux-stable-261bfb3328b89c63ca410ae30a0c87cd3955344c.tar.gz
linux-stable-261bfb3328b89c63ca410ae30a0c87cd3955344c.tar.bz2
linux-stable-261bfb3328b89c63ca410ae30a0c87cd3955344c.zip
Input: synaptics-rmi4 - rename f30_data to gpio_data
f30_data in rmi_device_platform_data could be also referenced by RMI function 3A, so rename it and the structure name to avoid confusion. Signed-off-by: Vincent Huang <vincent.huang@tw.synaptics.com> Reviewed-by: Hans de Goede <hdegoede@redhat.com> Tested-by: Hans de Goede <hdegoede@redhat.com> Reviewed-by: Andrew Duggan <aduggan@synaptics.com> Link: https://lore.kernel.org/r/20200930094147.635556-2-vincent.huang@tw.synaptics.com Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input/mouse/synaptics.c')
-rw-r--r--drivers/input/mouse/synaptics.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c
index 4b81b2d0fe06..8a54efd6eb95 100644
--- a/drivers/input/mouse/synaptics.c
+++ b/drivers/input/mouse/synaptics.c
@@ -1752,7 +1752,7 @@ static int synaptics_create_intertouch(struct psmouse *psmouse,
.kernel_tracking = false,
.topbuttonpad = topbuttonpad,
},
- .f30_data = {
+ .gpio_data = {
.buttonpad = SYN_CAP_CLICKPAD(info->ext_cap_0c),
.trackstick_buttons =
!!SYN_CAP_EXT_BUTTONS_STICK(info->ext_cap_10),