Merge tag 'media/v6.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[linux-block.git] / drivers / media / i2c / adv7842.c

diff --git a/drivers/media/i2c/adv7842.c b/drivers/media/i2c/adv7842.c
index c541f9b3444b5b5dec5714dc1c455dac5357c414..7731cc1887e671e243120ca068e6909726d21104 100644 (file)
--- a/drivers/media/i2c/adv7842.c
+++ b/drivers/media/i2c/adv7842.c
@@ -3593,7 +3593,7 @@ err_hdl:
 
 /* ----------------------------------------------------------------------- */
 
-static int adv7842_remove(struct i2c_client *client)
+static void adv7842_remove(struct i2c_client *client)
 {
        struct v4l2_subdev *sd = i2c_get_clientdata(client);
        struct adv7842_state *state = to_state(sd);
@@ -3604,7 +3604,6 @@ static int adv7842_remove(struct i2c_client *client)
        media_entity_cleanup(&sd->entity);
        adv7842_unregister_clients(sd);
        v4l2_ctrl_handler_free(sd->ctrl_handler);
-       return 0;
 }
 
 /* ----------------------------------------------------------------------- */