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

Commit 4e33870b authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Greg Kroah-Hartman
Browse files

serial: of: CONFIG_SERIAL_8250 is always set 



The only other user of this code was the nwp-serial driver, but that
is now gone, so we can remove a couple of #ifdef statments in this
driver.

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

drivers/tty/serial/of_serial.c

+0 −18
Original line number Diff line number Diff line
@@ -21,10 +21,6 @@ 
#include <linux/nwpserial.h>

#include <linux/clk.h>



#ifdef CONFIG_SERIAL_8250_MODULE

#define CONFIG_SERIAL_8250 CONFIG_SERIAL_8250_MODULE

#endif



#include "8250/8250.h"



struct of_serial_info {
@@ -198,7 +194,6 @@ static int of_platform_serial_probe(struct platform_device *ofdev) 
		goto out;



	switch (port_type) {

#ifdef CONFIG_SERIAL_8250

	case PORT_8250 ... PORT_MAX_8250:

	{

		struct uart_8250_port port8250;
@@ -215,7 +210,6 @@ static int of_platform_serial_probe(struct platform_device *ofdev) 
		ret = serial8250_register_8250_port(&port8250);

		break;

	}

#endif

	default:

		/* need to add code for these */

	case PORT_UNKNOWN:
@@ -243,11 +237,9 @@ static int of_platform_serial_remove(struct platform_device *ofdev) 
{

	struct of_serial_info *info = platform_get_drvdata(ofdev);

	switch (info->type) {

#ifdef CONFIG_SERIAL_8250

	case PORT_8250 ... PORT_MAX_8250:

		serial8250_unregister_port(info->line);

		break;

#endif

	default:

		/* need to add code for these */

		break;
@@ -260,7 +252,6 @@ static int of_platform_serial_remove(struct platform_device *ofdev) 
}



#ifdef CONFIG_PM_SLEEP

#ifdef CONFIG_SERIAL_8250

static void of_serial_suspend_8250(struct of_serial_info *info)

{

	struct uart_8250_port *port8250 = serial8250_get_port(info->line);
@@ -281,15 +272,6 @@ static void of_serial_resume_8250(struct of_serial_info *info) 


	serial8250_resume_port(info->line);

}

#else

static inline void of_serial_suspend_8250(struct of_serial_info *info)

{

}



static inline void of_serial_resume_8250(struct of_serial_info *info)

{

}

#endif



static int of_serial_suspend(struct device *dev)

{