diff options
| author | Maxime Ripard <maxime@cerno.tech> | 2023-05-09 16:03:40 +0300 |
|---|---|---|
| committer | Maxime Ripard <maxime@cerno.tech> | 2023-05-09 16:03:40 +0300 |
| commit | ff32fcca64437f679a2bf1c0a19d5def389a18e2 (patch) | |
| tree | 122863d5d6159b30fd6834cbe599f8ce1b9e8144 /drivers/video/fbdev/ffb.c | |
| parent | 79c87edd18ec49f5b6fb40175bd1b1fea9398fdb (diff) | |
| parent | ac9a78681b921877518763ba0e89202254349d1b (diff) | |
| download | linux-ff32fcca64437f679a2bf1c0a19d5def389a18e2.tar.xz | |
Merge drm/drm-next into drm-misc-next
Start the 6.5 release cycle.
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Diffstat (limited to 'drivers/video/fbdev/ffb.c')
| -rw-r--r-- | drivers/video/fbdev/ffb.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/video/fbdev/ffb.c b/drivers/video/fbdev/ffb.c index 7cba3969a970..c6d3111dcbb0 100644 --- a/drivers/video/fbdev/ffb.c +++ b/drivers/video/fbdev/ffb.c @@ -1023,7 +1023,7 @@ out_err: return err; } -static int ffb_remove(struct platform_device *op) +static void ffb_remove(struct platform_device *op) { struct fb_info *info = dev_get_drvdata(&op->dev); struct ffb_par *par = info->par; @@ -1035,8 +1035,6 @@ static int ffb_remove(struct platform_device *op) of_iounmap(&op->resource[1], par->dac, sizeof(struct ffb_dac)); framebuffer_release(info); - - return 0; } static const struct of_device_id ffb_match[] = { @@ -1056,7 +1054,7 @@ static struct platform_driver ffb_driver = { .of_match_table = ffb_match, }, .probe = ffb_probe, - .remove = ffb_remove, + .remove_new = ffb_remove, }; static int __init ffb_init(void) |