Skip to content

Commit 0770917

Browse files
t-8chhdeller
authored andcommitted
fbdev: efifb: Use devm_register_framebuffer()
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 <[email protected]> Signed-off-by: Helge Deller <[email protected]>
1 parent 95cdd53 commit 0770917

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
@@ -449,7 +449,6 @@ static int efifb_probe(struct platform_device *dev)
449449
err = -ENOMEM;
450450
goto err_release_mem;
451451
}
452-
platform_set_drvdata(dev, info);
453452
par = info->par;
454453
info->pseudo_palette = par->pseudo_palette;
455454

@@ -572,7 +571,7 @@ static int efifb_probe(struct platform_device *dev)
572571
pr_err("efifb: cannot acquire aperture\n");
573572
goto err_fb_dealloc_cmap;
574573
}
575-
err = register_framebuffer(info);
574+
err = devm_register_framebuffer(&dev->dev, info);
576575
if (err < 0) {
577576
pr_err("efifb: cannot register framebuffer\n");
578577
goto err_fb_dealloc_cmap;
@@ -595,21 +594,12 @@ static int efifb_probe(struct platform_device *dev)
595594
return err;
596595
}
597596

598-
static void efifb_remove(struct platform_device *pdev)
599-
{
600-
struct fb_info *info = platform_get_drvdata(pdev);
601-
602-
/* efifb_destroy takes care of info cleanup */
603-
unregister_framebuffer(info);
604-
}
605-
606597
static struct platform_driver efifb_driver = {
607598
.driver = {
608599
.name = "efi-framebuffer",
609600
.dev_groups = efifb_groups,
610601
},
611602
.probe = efifb_probe,
612-
.remove_new = efifb_remove,
613603
};
614604

615605
builtin_platform_driver(efifb_driver);

0 commit comments

Comments
 (0)