mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-30 16:13:54 +08:00
drivers/tty: make serial/mvebu-uart.c explicitly non-modular
The Kconfig currently controlling compilation of this code is: drivers/tty/serial/Kconfig:config SERIAL_MVEBU_UART drivers/tty/serial/Kconfig: bool "Marvell EBU serial port 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. 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 the code wasn't using module_init to begin with, the init ordering remains unchanged with this commit. Also note that MODULE_DEVICE_TABLE is a no-op for non-modular code. We also delete the MODULE_LICENSE tag etc. since all that information was (or is now) contained at the top of the file in the comments. Cc: Wilson Ding <dingwei@marvell.com> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Jiri Slaby <jslaby@suse.com> Cc: linux-serial@vger.kernel.org Cc: linux-kernel@vger.kernel.org Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
e31efceed2
commit
89ebc27427
@ -1,5 +1,7 @@
|
||||
/*
|
||||
* ***************************************************************************
|
||||
* Marvell Armada-3700 Serial Driver
|
||||
* Author: Wilson Ding <dingwei@marvell.com>
|
||||
* Copyright (C) 2015 Marvell International Ltd.
|
||||
* ***************************************************************************
|
||||
* This program is free software: you can redistribute it and/or modify it
|
||||
@ -23,7 +25,6 @@
|
||||
#include <linux/init.h>
|
||||
#include <linux/io.h>
|
||||
#include <linux/iopoll.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/of.h>
|
||||
#include <linux/of_address.h>
|
||||
#include <linux/of_device.h>
|
||||
@ -594,29 +595,18 @@ static int mvebu_uart_probe(struct platform_device *pdev)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int mvebu_uart_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct mvebu_uart_data *data = platform_get_drvdata(pdev);
|
||||
|
||||
uart_remove_one_port(&mvebu_uart_driver, data->port);
|
||||
data->port->private_data = NULL;
|
||||
data->port->mapbase = 0;
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* Match table for of_platform binding */
|
||||
static const struct of_device_id mvebu_uart_of_match[] = {
|
||||
{ .compatible = "marvell,armada-3700-uart", },
|
||||
{}
|
||||
};
|
||||
MODULE_DEVICE_TABLE(of, mvebu_uart_of_match);
|
||||
|
||||
static struct platform_driver mvebu_uart_platform_driver = {
|
||||
.probe = mvebu_uart_probe,
|
||||
.remove = mvebu_uart_remove,
|
||||
.driver = {
|
||||
.name = "mvebu-uart",
|
||||
.of_match_table = of_match_ptr(mvebu_uart_of_match),
|
||||
.suppress_bind_attrs = true,
|
||||
},
|
||||
};
|
||||
|
||||
@ -634,16 +624,4 @@ static int __init mvebu_uart_init(void)
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
static void __exit mvebu_uart_exit(void)
|
||||
{
|
||||
platform_driver_unregister(&mvebu_uart_platform_driver);
|
||||
uart_unregister_driver(&mvebu_uart_driver);
|
||||
}
|
||||
|
||||
arch_initcall(mvebu_uart_init);
|
||||
module_exit(mvebu_uart_exit);
|
||||
|
||||
MODULE_AUTHOR("Wilson Ding <dingwei@marvell.com>");
|
||||
MODULE_DESCRIPTION("Marvell Armada-3700 Serial Driver");
|
||||
MODULE_LICENSE("GPL");
|
||||
|
Loading…
Reference in New Issue
Block a user