]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
fbdev: efifb: Use devm_register_framebuffer()
authorThomas Weißschuh <linux@weissschuh.net>
Tue, 27 Aug 2024 15:25:15 +0000 (17:25 +0200)
committerHelge Deller <deller@gmx.de>
Fri, 30 Aug 2024 16:42:38 +0000 (18:42 +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>
drivers/video/fbdev/efifb.c

index 595b8e27bea66d8b530e8a407cd6db96598163cc..ee71a65b361d5b9e72dcdee1333624cbd7477887 100644 (file)
@@ -449,7 +449,6 @@ static int efifb_probe(struct platform_device *dev)
                err = -ENOMEM;
                goto err_release_mem;
        }
-       platform_set_drvdata(dev, info);
        par = info->par;
        info->pseudo_palette = par->pseudo_palette;
 
@@ -572,7 +571,7 @@ static int efifb_probe(struct platform_device *dev)
                pr_err("efifb: cannot acquire aperture\n");
                goto err_fb_dealloc_cmap;
        }
-       err = register_framebuffer(info);
+       err = devm_register_framebuffer(&dev->dev, info);
        if (err < 0) {
                pr_err("efifb: cannot register framebuffer\n");
                goto err_fb_dealloc_cmap;
@@ -595,21 +594,12 @@ err_release_mem:
        return err;
 }
 
-static void efifb_remove(struct platform_device *pdev)
-{
-       struct fb_info *info = platform_get_drvdata(pdev);
-
-       /* efifb_destroy takes care of info cleanup */
-       unregister_framebuffer(info);
-}
-
 static struct platform_driver efifb_driver = {
        .driver = {
                .name = "efi-framebuffer",
                .dev_groups = efifb_groups,
        },
        .probe = efifb_probe,
-       .remove_new = efifb_remove,
 };
 
 builtin_platform_driver(efifb_driver);