diff options
| author | Dmitry Torokhov <[email protected]> | 2021-11-11 21:58:54 -0800 |
|---|---|---|
| committer | Dmitry Torokhov <[email protected]> | 2021-11-11 21:58:54 -0800 |
| commit | efe6f16c6faf724882ddaba2eda8830a87bcc2b2 (patch) | |
| tree | ab5a4ac8c5b917b07af95c866770659f330b7f2b /drivers/input/touchscreen/tsc200x-core.c | |
| parent | a02dcde595f7cbd240ccd64de96034ad91cffc40 (diff) | |
| parent | 744d0090a5f6dfa4c81b53402ccdf08313100429 (diff) | |
Merge branch 'next' into for-linus
Prepare input updates for 5.16 merge window.
Diffstat (limited to 'drivers/input/touchscreen/tsc200x-core.c')
| -rw-r--r-- | drivers/input/touchscreen/tsc200x-core.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/input/touchscreen/tsc200x-core.c b/drivers/input/touchscreen/tsc200x-core.c index b8d720d52013..27810f6c69f6 100644 --- a/drivers/input/touchscreen/tsc200x-core.c +++ b/drivers/input/touchscreen/tsc200x-core.c @@ -577,15 +577,13 @@ disable_regulator: } EXPORT_SYMBOL_GPL(tsc200x_probe); -int tsc200x_remove(struct device *dev) +void tsc200x_remove(struct device *dev) { struct tsc200x *ts = dev_get_drvdata(dev); sysfs_remove_group(&dev->kobj, &tsc200x_attr_group); regulator_disable(ts->vio); - - return 0; } EXPORT_SYMBOL_GPL(tsc200x_remove); |