summaryrefslogtreecommitdiff
path: root/drivers/input/touchscreen/tsc200x-core.h
diff options
context:
space:
mode:
authorMichael Welling <mwelling@ieee.org>2016-07-20 10:02:07 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-08-10 11:49:26 +0200
commitaab045e9a95b139aa628498787ce132ade04ff47 (patch)
tree64bd2eab2a7db35cf0315d4378eb934ea91bda00 /drivers/input/touchscreen/tsc200x-core.h
parentc2e5023425c82caf1957e401a5183b9e62f43ebb (diff)
Input: tsc200x - report proper input_dev name
commit e9003c9cfaa17d26991688268b04244adb67ee2b upstream. Passes input_id struct to the common probe function for the tsc200x drivers instead of just the bustype. This allows for the use of the product variable to set the input_dev->name variable according to the type of touchscreen used. Note that when we introduced support for TSC2004 we started calling everything TSC200X, so let's keep this quirk. Signed-off-by: Michael Welling <mwelling@ieee.org> Acked-by: Pavel Machek <pavel@ucw.cz> Acked-by: Pali Rohár <pali.rohar@gmail.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/input/touchscreen/tsc200x-core.h')
-rw-r--r--drivers/input/touchscreen/tsc200x-core.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/touchscreen/tsc200x-core.h b/drivers/input/touchscreen/tsc200x-core.h
index 7a482d102614..49a63a3c6840 100644
--- a/drivers/input/touchscreen/tsc200x-core.h
+++ b/drivers/input/touchscreen/tsc200x-core.h
@@ -70,7 +70,7 @@
extern const struct regmap_config tsc200x_regmap_config;
extern const struct dev_pm_ops tsc200x_pm_ops;
-int tsc200x_probe(struct device *dev, int irq, __u16 bustype,
+int tsc200x_probe(struct device *dev, int irq, const struct input_id *tsc_id,
struct regmap *regmap,
int (*tsc200x_cmd)(struct device *dev, u8 cmd));
int tsc200x_remove(struct device *dev);