Skip to content

Commit f1ecc92

Browse files
author
Jocelyn Falempe
committed
fbdev: efifb: Use devm_register_framebuffer()
JIRA: https://issues.redhat.com/browse/RHEL-75953 Upstream Status: v6.12-rc1 commit 0770917 Author: Thomas Weißschuh <linux@weissschuh.net> AuthorDate: Tue Aug 27 17:25:15 2024 +0200 Commit: Helge Deller <deller@gmx.de> CommitDate: Fri Aug 30 18:42:38 2024 +0200 This simplifies the error handling. Also the drvdata slot is now unused and can be used for other usecases. Signed-off-by: Thomas Weißschuh <linux@weissschuh.net> Signed-off-by: Helge Deller <deller@gmx.de> Signed-off-by: Jocelyn Falempe <jfalempe@redhat.com>
1 parent afbe845 commit f1ecc92

File tree

1 file changed

+1
-11
lines changed

1 file changed

+1
-11
lines changed

drivers/video/fbdev/efifb.c

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -451,7 +451,6 @@ static int efifb_probe(struct platform_device *dev)
451451
err = -ENOMEM;
452452
goto err_release_mem;
453453
}
454-
platform_set_drvdata(dev, info);
455454
par = info->par;
456455
info->pseudo_palette = par->pseudo_palette;
457456

@@ -574,7 +573,7 @@ static int efifb_probe(struct platform_device *dev)
574573
pr_err("efifb: cannot acquire aperture\n");
575574
goto err_fb_dealloc_cmap;
576575
}
577-
err = register_framebuffer(info);
576+
err = devm_register_framebuffer(&dev->dev, info);
578577
if (err < 0) {
579578
pr_err("efifb: cannot register framebuffer\n");
580579
goto err_fb_dealloc_cmap;
@@ -597,21 +596,12 @@ static int efifb_probe(struct platform_device *dev)
597596
return err;
598597
}
599598

600-
static void efifb_remove(struct platform_device *pdev)
601-
{
602-
struct fb_info *info = platform_get_drvdata(pdev);
603-
604-
/* efifb_destroy takes care of info cleanup */
605-
unregister_framebuffer(info);
606-
}
607-
608599
static struct platform_driver efifb_driver = {
609600
.driver = {
610601
.name = "efi-framebuffer",
611602
.dev_groups = efifb_groups,
612603
},
613604
.probe = efifb_probe,
614-
.remove_new = efifb_remove,
615605
};
616606

617607
builtin_platform_driver(efifb_driver);

0 commit comments

Comments
 (0)