Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fc7f47bf authored by Paul Gortmaker's avatar Paul Gortmaker Committed by Greg Kroah-Hartman
Browse files

drivers/tty: make ehv_bytechan.c explicitly non-modular 



The Kconfig currently controlling compilation of this code is:

drivers/tty/Kconfig:config PPC_EPAPR_HV_BYTECHAN
drivers/tty/Kconfig:    bool "ePAPR hypervisor byte channel driver"

...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.

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.

Since module_init translates to device_initcall in the non-modular
case, the init ordering remains unchanged with this commit.

We also delete the MODULE_LICENSE tag etc. since all that information
is already contained at the top of the file in the comments.

Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Jiri Slaby <jslaby@suse.com>
Cc: linuxppc-dev@lists.ozlabs.org
Signed-off-by: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e3c5fc4d

drivers/tty/ehv_bytechan.c

+3 −37
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ 
 * byte channel used for the console is designated as the default tty.

 */



#include <linux/module.h>

#include <linux/init.h>

#include <linux/slab.h>

#include <linux/err.h>
@@ -719,19 +718,6 @@ static int ehv_bc_tty_probe(struct platform_device *pdev) 
	return ret;

}



static int ehv_bc_tty_remove(struct platform_device *pdev)

{

	struct ehv_bc_data *bc = dev_get_drvdata(&pdev->dev);



	tty_unregister_device(ehv_bc_driver, bc - bcs);



	tty_port_destroy(&bc->port);

	irq_dispose_mapping(bc->tx_irq);

	irq_dispose_mapping(bc->rx_irq);



	return 0;

}



static const struct of_device_id ehv_bc_tty_of_ids[] = {

	{ .compatible = "epapr,hv-byte-channel" },

	{}
@@ -741,15 +727,15 @@ static struct platform_driver ehv_bc_tty_driver = { 
	.driver = {

		.name = "ehv-bc",

		.of_match_table = ehv_bc_tty_of_ids,

		.suppress_bind_attrs = true,

	},

	.probe		= ehv_bc_tty_probe,

	.remove		= ehv_bc_tty_remove,

};



/**

 * ehv_bc_init - ePAPR hypervisor byte channel driver initialization

 *

 * This function is called when this module is loaded.

 * This function is called when this driver is loaded.

 */

static int __init ehv_bc_init(void)

{
@@ -814,24 +800,4 @@ static int __init ehv_bc_init(void) 


	return ret;

}





/**

 * ehv_bc_exit - ePAPR hypervisor byte channel driver termination

 *

 * This function is called when this driver is unloaded.

 */

static void __exit ehv_bc_exit(void)

{

	platform_driver_unregister(&ehv_bc_tty_driver);

	tty_unregister_driver(ehv_bc_driver);

	put_tty_driver(ehv_bc_driver);

	kfree(bcs);

}



module_init(ehv_bc_init);

module_exit(ehv_bc_exit);



MODULE_AUTHOR("Timur Tabi <timur@freescale.com>");

MODULE_DESCRIPTION("ePAPR hypervisor byte channel driver");

MODULE_LICENSE("GPL v2");
 
device_initcall(ehv_bc_init);