drivers/tty: make hvc/hvc_vio.c explicitly non-modular (e3c5fc4d) · Commits · 戴 / test

The Kconfig currently controlling compilation of this code is: drivers/tty/hvc/Kconfig:config HVC_CONSOLE drivers/tty/hvc/Kconfig: bool "pSeries Hypervisor Virtual Console support" ...meaning that it currently is not being built as a module by anyone. Lets remove the modular code that is essentially orphaned, so that when reading the driver there is no doubt it is builtin-only. Since module_init translates to device_initcall in the non-modular case, the init ordering remains unchanged with this commit. We explicitly disallow a driver unbind, since that doesn't have a sensible use case anyway, and it allows us to drop the ".remove" code for non-modular drivers. We don't replace module.h with init.h since the file already has that. Also note that MODULE_DEVICE_TABLE is a no-op for non-modular code. Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Jiri Slaby <jslaby@suse.com> Cc: Michael Ellerman <mpe@ellerman.id.au> Cc: Anton Blanchard <anton@samba.org> Cc: linuxppc-dev@lists.ozlabs.org Signed-off-by:

Paul Gortmaker <paul.gortmaker@windriver.com> Signed-off-by:

Greg Kroah-Hartman <gregkh@linuxfoundation.org>

drivers/tty/hvc/hvc_vio.c

+4 −25

Original line number	Diff line number	Diff line
		@@ -41,7 +41,6 @@
		#include <linux/delay.h>
		#include <linux/slab.h>
		#include <linux/console.h>
		#include <linux/module.h>

		#include <asm/hvconsole.h>
		#include <asm/vio.h>
		@@ -61,7 +60,6 @@ static struct vio_device_id hvc_driver_table[] = {
		#endif
		{ "", "" }
		};
		MODULE_DEVICE_TABLE(vio, hvc_driver_table);

		typedef enum hv_protocol {
		HV_PROTOCOL_RAW,
		@@ -363,26 +361,13 @@ static int hvc_vio_probe(struct vio_dev *vdev,
		return 0;
		}

		static int hvc_vio_remove(struct vio_dev *vdev)
		{
		struct hvc_struct *hp = dev_get_drvdata(&vdev->dev);
		int rc, termno;

		termno = hp->vtermno;
		rc = hvc_remove(hp);
		if (rc == 0) {
		if (hvterm_privs[termno] != &hvterm_priv0)
		kfree(hvterm_privs[termno]);
		hvterm_privs[termno] = NULL;
		}
		return rc;
		}

		static struct vio_driver hvc_vio_driver = {
		.id_table = hvc_driver_table,
		.probe = hvc_vio_probe,
		.remove = hvc_vio_remove,
		.name = hvc_driver_name,
		.driver = {
		.suppress_bind_attrs = true,
		},
		};

		static int __init hvc_vio_init(void)
		@@ -394,13 +379,7 @@ static int __init hvc_vio_init(void)

		return rc;
		}
		module_init(hvc_vio_init); /* after drivers/char/hvc_console.c */

		static void __exit hvc_vio_exit(void)
		{
		vio_unregister_driver(&hvc_vio_driver);
		}
		module_exit(hvc_vio_exit);
		device_initcall(hvc_vio_init); /* after drivers/tty/hvc/hvc_console.c */

		void __init hvc_vio_init_early(void)
		{

Admin message