summaryrefslogtreecommitdiff
path: root/drivers/video/fbdev/ocfb.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/video/fbdev/ocfb.c')
-rw-r--r--drivers/video/fbdev/ocfb.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/video/fbdev/ocfb.c b/drivers/video/fbdev/ocfb.c
index da7e1457e58f..7ebe794583e1 100644
--- a/drivers/video/fbdev/ocfb.c
+++ b/drivers/video/fbdev/ocfb.c
@@ -370,7 +370,7 @@ err_dma_free:
return ret;
}
-static int ocfb_remove(struct platform_device *pdev)
+static void ocfb_remove(struct platform_device *pdev)
{
struct ocfb_dev *fbdev = platform_get_drvdata(pdev);
@@ -383,8 +383,6 @@ static int ocfb_remove(struct platform_device *pdev)
ocfb_writereg(fbdev, OCFB_CTRL, 0);
platform_set_drvdata(pdev, NULL);
-
- return 0;
}
static const struct of_device_id ocfb_match[] = {
@@ -395,7 +393,7 @@ MODULE_DEVICE_TABLE(of, ocfb_match);
static struct platform_driver ocfb_driver = {
.probe = ocfb_probe,
- .remove = ocfb_remove,
+ .remove_new = ocfb_remove,
.driver = {
.name = "ocfb_fb",
.of_match_table = ocfb_match,