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

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

diff --git a/drivers/media/i2c/adv7604.c b/drivers/media/i2c/adv7604.c
index 815fe108281f6299ca9bfe3a9b5046a1bcd3b33a..bda0c547ce44525decb5868166bd01097276537d 100644 (file)
--- a/drivers/media/i2c/adv7604.c
+++ b/drivers/media/i2c/adv7604.c
@@ -3660,7 +3660,7 @@ err_hdl:
 
 /* ----------------------------------------------------------------------- */
 
-static int adv76xx_remove(struct i2c_client *client)
+static void adv76xx_remove(struct i2c_client *client)
 {
        struct v4l2_subdev *sd = i2c_get_clientdata(client);
        struct adv76xx_state *state = to_state(sd);
@@ -3677,7 +3677,6 @@ static int adv76xx_remove(struct i2c_client *client)
        media_entity_cleanup(&sd->entity);
        adv76xx_unregister_clients(to_state(sd));
        v4l2_ctrl_handler_free(sd->ctrl_handler);
-       return 0;
 }
 
 /* ----------------------------------------------------------------------- */