diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2022-08-26 16:14:33 +0300 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2022-08-26 16:14:33 +0300 |
| commit | 1681956cb79c99371024cec0b9536fbdd73d04c3 (patch) | |
| tree | 434a943c22e9ce78743358276dc4e5c5d0d10d01 /drivers/media/v4l2-core/tuner-core.c | |
| parent | 0684bc79cd52edca88e430b177f06d980aed5779 (diff) | |
| parent | ed5c2f5fd10dda07263f79f338a512c0f49f76f5 (diff) | |
| download | linux-1681956cb79c99371024cec0b9536fbdd73d04c3.tar.xz | |
Merge branch 'i2c/make_remove_callback_void-immutable' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux into devel
This branch is needed to make the i2c driver remove() callback in new
driver compile properly.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/media/v4l2-core/tuner-core.c')
| -rw-r--r-- | drivers/media/v4l2-core/tuner-core.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/v4l2-core/tuner-core.c b/drivers/media/v4l2-core/tuner-core.c index 2d47c10de062..33162dc1daf6 100644 --- a/drivers/media/v4l2-core/tuner-core.c +++ b/drivers/media/v4l2-core/tuner-core.c @@ -779,7 +779,7 @@ register_client: * @client: i2c_client descriptor */ -static int tuner_remove(struct i2c_client *client) +static void tuner_remove(struct i2c_client *client) { struct tuner *t = to_tuner(i2c_get_clientdata(client)); @@ -789,7 +789,6 @@ static int tuner_remove(struct i2c_client *client) list_del(&t->list); kfree(t); - return 0; } /* |