On Wed, Aug 19, 2015 at 05:48:08PM -0400, Paul Gortmaker wrote:
> The Kconfig for this driver is currently:
>
> config SERIAL_MPSC
> bool "Marvell MPSC 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.
>
> Since module_init translates to device_initcall in the non-modular
> case, the init ordering remains unchanged with this commit.
>
> We leave some tags like MODULE_AUTHOR for documentation purposes.
>
> Cc: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
> Cc: Jiri Slaby <jslaby@xxxxxxxx>
> Cc: linux-serial@xxxxxxxxxxxxxxx
> Signed-off-by: Paul Gortmaker <paul.gortmaker@xxxxxxxxxxxxx>
> ---
> drivers/tty/serial/mpsc.c | 36 +++---------------------------------
> 1 file changed, 3 insertions(+), 33 deletions(-)
>
> diff --git a/drivers/tty/serial/mpsc.c b/drivers/tty/serial/mpsc.c
> index 82bb6d1fe23b..edb32e3f1e84 100644
> --- a/drivers/tty/serial/mpsc.c
> +++ b/drivers/tty/serial/mpsc.c
> @@ -55,8 +55,6 @@
> #define SUPPORT_SYSRQ
> #endif
>
> -#include <linux/module.h>
> -#include <linux/moduleparam.h>
> #include <linux/tty.h>
> #include <linux/tty_flip.h>
> #include <linux/ioport.h>
> @@ -2108,24 +2106,8 @@ static int mpsc_drv_probe(struct platform_device *dev)
> return rc;
> }
>
> -static int mpsc_drv_remove(struct platform_device *dev)
> -{
> - pr_debug("mpsc_drv_exit: Removing MPSC %d\n", dev->id);
> -
> - if (dev->id < MPSC_NUM_CTLRS) {
> - uart_remove_one_port(&mpsc_reg, &mpsc_ports[dev->id].port);
> - mpsc_release_port((struct uart_port *)
> - &mpsc_ports[dev->id].port);
> - mpsc_drv_unmap_regs(&mpsc_ports[dev->id]);
> - return 0;
> - } else {
> - return -ENODEV;
> - }
> -}
> -
> static struct platform_driver mpsc_driver = {
> .probe = mpsc_drv_probe,
> - .remove = mpsc_drv_remove,
> .driver = {
> .name = MPSC_CTLR_NAME,
> },
I don't think this is right. The driver can always be unbound from the
device via sysfs, in which case it will now leak resources and leave
behind a dangling UART port.
Thierry
Attachment:
signature.asc
Description: PGP signature
