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

Commit 49c56bfc authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Greg Kroah-Hartman
Browse files

Revert "drivers/tty/serial: make 8250/8250_ingenic.c explicitly non-modular" 



This reverts commit cafe1ac6  ("drivers/tty: make serial
8250_ingenic.c explicitly non-modular"), which attempted to remove dead
code but did not have the desired effect when the main 8250 driver was
a loadable module itself.

This would normally result in a link error, but as the entire
drivers/tty/serial/8250/ directory is only entered when CONFIG_SERIAL_8250
is set, we never notice that the driver does not get built in this
configuration.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 88725e91

drivers/tty/serial/8250/8250_ingenic.c

+21 −7
Original line number Diff line number Diff line
@@ -4,8 +4,6 @@ 
 *

 * Ingenic SoC UART support

 *

 * Author: Paul Burton <paul.burton@imgtec.com>

 *

 * This program is free software; you can redistribute	 it and/or modify it

 * under  the terms of	 the GNU General  Public License as published by the

 * Free Software Foundation;  either version 2 of the	License, or (at your
@@ -20,7 +18,7 @@ 
#include <linux/console.h>

#include <linux/io.h>

#include <linux/libfdt.h>

#include <linux/init.h>

#include <linux/module.h>

#include <linux/of.h>

#include <linux/of_fdt.h>

#include <linux/of_device.h>
@@ -303,6 +301,16 @@ static int ingenic_uart_probe(struct platform_device *pdev) 
	return err;

}



static int ingenic_uart_remove(struct platform_device *pdev)

{

	struct ingenic_uart_data *data = platform_get_drvdata(pdev);



	serial8250_unregister_port(data->line);

	clk_disable_unprepare(data->clk_module);

	clk_disable_unprepare(data->clk_baud);

	return 0;

}



static const struct ingenic_uart_config jz4740_uart_config = {

	.tx_loadsz = 8,

	.fifosize = 16,
@@ -325,13 +333,19 @@ static const struct of_device_id of_match[] = { 
	{ .compatible = "ingenic,jz4780-uart", .data = &jz4780_uart_config },

	{ /* sentinel */ }

};

MODULE_DEVICE_TABLE(of, of_match);



static struct platform_driver ingenic_uart_platform_driver = {

	.driver = {

		.name		= "ingenic-uart",

		.of_match_table	= of_match,

		.suppress_bind_attrs	= true,

	},

	.probe			= ingenic_uart_probe,

	.remove			= ingenic_uart_remove,

};

builtin_platform_driver(ingenic_uart_platform_driver);
 


module_platform_driver(ingenic_uart_platform_driver);



MODULE_AUTHOR("Paul Burton");

MODULE_LICENSE("GPL");

MODULE_DESCRIPTION("Ingenic SoC UART driver");