return 0;
 }
 
-static int tfp410_fini(struct device *dev)
+static void tfp410_fini(struct device *dev)
 {
        struct tfp410 *dvi = dev_get_drvdata(dev);
 
        drm_bridge_remove(&dvi->bridge);
-
-       return 0;
 }
 
 static int tfp410_probe(struct platform_device *pdev)
 
 static int tfp410_remove(struct platform_device *pdev)
 {
-       return tfp410_fini(&pdev->dev);
+       tfp410_fini(&pdev->dev);
+
+       return 0;
 }
 
 static const struct of_device_id tfp410_match[] = {
 
 static int tfp410_i2c_remove(struct i2c_client *client)
 {
-       return tfp410_fini(&client->dev);
+       tfp410_fini(&client->dev);
+
+       return 0;
 }
 
 static const struct i2c_device_id tfp410_i2c_ids[] = {