diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2022-08-17 22:30:00 +0300 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2022-08-17 22:30:00 +0300 |
commit | 93fbff1197474d7b65e598c6f48fa82a5c334539 (patch) | |
tree | 0ae3e5a39bf0403b893979dfac75ca26356646e5 /drivers/input/mouse | |
parent | 93e719f661379c014f44bd83b361b1bc49ea7082 (diff) | |
parent | ed5c2f5fd10dda07263f79f338a512c0f49f76f5 (diff) | |
download | linux-93fbff1197474d7b65e598c6f48fa82a5c334539.tar.xz |
Merge branch 'i2c/make_remove_callback_void-immutable' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux into next
Sync up with the latest I2C code base to get updated prototype of I2C
bus remove() method.
Diffstat (limited to 'drivers/input/mouse')
-rw-r--r-- | drivers/input/mouse/synaptics_i2c.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/input/mouse/synaptics_i2c.c b/drivers/input/mouse/synaptics_i2c.c index fa304648d611..987ee67a1045 100644 --- a/drivers/input/mouse/synaptics_i2c.c +++ b/drivers/input/mouse/synaptics_i2c.c @@ -587,7 +587,7 @@ err_mem_free: return ret; } -static int synaptics_i2c_remove(struct i2c_client *client) +static void synaptics_i2c_remove(struct i2c_client *client) { struct synaptics_i2c *touch = i2c_get_clientdata(client); @@ -596,8 +596,6 @@ static int synaptics_i2c_remove(struct i2c_client *client) input_unregister_device(touch->input); kfree(touch); - - return 0; } static int __maybe_unused synaptics_i2c_suspend(struct device *dev) |