Commit 07709172 authored by Thomas Weißschuh's avatar Thomas Weißschuh Committed by Helge Deller
Browse files

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: default avatarThomas Weißschuh <linux@weissschuh.net>
Signed-off-by: default avatarHelge Deller <deller@gmx.de>
parent 95cdd538

drivers/video/fbdev/efifb.c

+1 −11
Original line number Diff line number Diff line
@@ -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 @@ static int efifb_probe(struct platform_device *dev) 
	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);