video: fbdev: controlfb: remove obsolete module support (72155824) · Commits · 戴 / test

CONFIG_FB_CONTROL is bool, hence the Apple "control" frame buffer driver cannot be built as a module. Replace module_init() by device_initcall(). Acked-by:

Sam Ravnborg <sam@ravnborg.org> Signed-off-by:

Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> Link: https://patchwork.freedesktop.org/patch/msgid/20200324134508.25120-4-b.zolnierkie@samsung.com

drivers/video/fbdev/controlfb.c

+1 −24

Original line number	Diff line number	Diff line
		@@ -31,7 +31,6 @@
		* more details.
		*/

		#include <linux/module.h>
		#include <linux/kernel.h>
		#include <linux/errno.h>
		#include <linux/string.h>
		@@ -198,28 +197,6 @@ static const struct fb_ops controlfb_ops = {

		/****************** The functions for controlfb_ops ******************/

		#ifdef MODULE
		MODULE_LICENSE("GPL");

		int init_module(void)
		{
		struct device_node *dp;
		int ret = -ENXIO;

		dp = of_find_node_by_name(NULL, "control");
		if (dp && !control_of_init(dp))
		ret = 0;
		of_node_put(dp);

		return ret;
		}

		void cleanup_module(void)
		{
		control_cleanup();
		}
		#endif

		/*
		* Checks a var structure
		*/
		@@ -612,7 +589,7 @@ static int __init control_init(void)
		return ret;
		}

		module_init(control_init);
		device_initcall(control_init);

		/* Work out which banks of VRAM we have installed. */
		/* danj: I guess the card just ignores writes to nonexistant VRAM... */

Admin message