Commit 5a1cc963 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

tty: vc_screen: make vc_class constant 

Now that the driver core allows for struct class to be in read-only
memory, making all 'class' structures to be declared at build time
placing them into read-only memory, instead of having to be dynamically
allocated at load time.

Cc: Jiri Slaby <jirislaby@kernel.org>
Link: https://lore.kernel.org/r/2023100549-sixth-anger-ac34@gregkh


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3abe1144

drivers/tty/vt/vc_screen.c

+14 −14
Original line number Diff line number Diff line
@@ -786,23 +786,22 @@ static const struct file_operations vcs_fops = { 
	.release	= vcs_release,

};



static struct class *vc_class;

static const struct class vc_class = {

	.name = "vc",

};



void vcs_make_sysfs(int index)

{

	device_create(vc_class, NULL, MKDEV(VCS_MAJOR, index + 1), NULL,

		      "vcs%u", index + 1);

	device_create(vc_class, NULL, MKDEV(VCS_MAJOR, index + 65), NULL,

		      "vcsu%u", index + 1);

	device_create(vc_class, NULL, MKDEV(VCS_MAJOR, index + 129), NULL,

		      "vcsa%u", index + 1);

	device_create(&vc_class, NULL, MKDEV(VCS_MAJOR, index + 1), NULL, "vcs%u", index + 1);

	device_create(&vc_class, NULL, MKDEV(VCS_MAJOR, index + 65), NULL, "vcsu%u", index + 1);

	device_create(&vc_class, NULL, MKDEV(VCS_MAJOR, index + 129), NULL, "vcsa%u", index + 1);

}



void vcs_remove_sysfs(int index)

{

	device_destroy(vc_class, MKDEV(VCS_MAJOR, index + 1));

	device_destroy(vc_class, MKDEV(VCS_MAJOR, index + 65));

	device_destroy(vc_class, MKDEV(VCS_MAJOR, index + 129));

	device_destroy(&vc_class, MKDEV(VCS_MAJOR, index + 1));

	device_destroy(&vc_class, MKDEV(VCS_MAJOR, index + 65));

	device_destroy(&vc_class, MKDEV(VCS_MAJOR, index + 129));

}



int __init vcs_init(void)
@@ -811,11 +810,12 @@ int __init vcs_init(void) 


	if (register_chrdev(VCS_MAJOR, "vcs", &vcs_fops))

		panic("unable to get major %d for vcs device", VCS_MAJOR);

	vc_class = class_create("vc");

	if (class_register(&vc_class))

		panic("unable to create vc_class");



	device_create(vc_class, NULL, MKDEV(VCS_MAJOR, 0), NULL, "vcs");

	device_create(vc_class, NULL, MKDEV(VCS_MAJOR, 64), NULL, "vcsu");

	device_create(vc_class, NULL, MKDEV(VCS_MAJOR, 128), NULL, "vcsa");

	device_create(&vc_class, NULL, MKDEV(VCS_MAJOR, 0), NULL, "vcs");

	device_create(&vc_class, NULL, MKDEV(VCS_MAJOR, 64), NULL, "vcsu");

	device_create(&vc_class, NULL, MKDEV(VCS_MAJOR, 128), NULL, "vcsa");

	for (i = 0; i < MIN_NR_CONSOLES; i++)

		vcs_make_sysfs(i);

	return 0;