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

[linux-2.6-microblaze.git] / drivers / media / i2c / ov5640.c

diff --git a/drivers/media/i2c/ov5640.c b/drivers/media/i2c/ov5640.c
index 94db427..2d74039 100644 (file)
--- a/drivers/media/i2c/ov5640.c
+++ b/drivers/media/i2c/ov5640.c
@@ -3924,7 +3924,7 @@ entity_cleanup:
        return ret;
 }
 
-static int ov5640_remove(struct i2c_client *client)
+static void ov5640_remove(struct i2c_client *client)
 {
        struct v4l2_subdev *sd = i2c_get_clientdata(client);
        struct ov5640_dev *sensor = to_ov5640_dev(sd);
@@ -3939,8 +3939,6 @@ static int ov5640_remove(struct i2c_client *client)
        media_entity_cleanup(&sensor->sd.entity);
        v4l2_ctrl_handler_free(&sensor->ctrls.handler);
        mutex_destroy(&sensor->lock);
-
-       return 0;
 }
 
 static const struct dev_pm_ops ov5640_pm_ops = {