diff options
Diffstat (limited to 'drivers/media/platform/ti/davinci/vpif_display.c')
| -rw-r--r-- | drivers/media/platform/ti/davinci/vpif_display.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/media/platform/ti/davinci/vpif_display.c b/drivers/media/platform/ti/davinci/vpif_display.c index b2df81603f62..f8ec2991c667 100644 --- a/drivers/media/platform/ti/davinci/vpif_display.c +++ b/drivers/media/platform/ti/davinci/vpif_display.c @@ -1305,7 +1305,7 @@ vpif_free: /* * vpif_remove: It un-register channels from V4L2 driver */ -static int vpif_remove(struct platform_device *device) +static void vpif_remove(struct platform_device *device) { struct channel_obj *ch; int i; @@ -1321,8 +1321,6 @@ static int vpif_remove(struct platform_device *device) video_unregister_device(&ch->video_dev); } free_vpif_objs(); - - return 0; } #ifdef CONFIG_PM_SLEEP @@ -1399,7 +1397,7 @@ static __refdata struct platform_driver vpif_driver = { .pm = &vpif_pm_ops, }, .probe = vpif_probe, - .remove = vpif_remove, + .remove_new = vpif_remove, }; module_platform_driver(vpif_driver); |