Skip to content

Commit

Permalink
TTY: serial/m32r_sio, disband m32r_sio.h
Browse files Browse the repository at this point in the history
The only needed information from the header is struct old_serial_port.
Move it to m32r_sio.c, make it const and anonymous. And kill the rest
from the header as it is dead stuff.

Given m32r_sio_suspend_port and m32r_sio_resume_port are local to
m32r_sio.c and unused, kill them from .c too.

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Jiri Slaby authored and Greg Kroah-Hartman committed Feb 7, 2016
1 parent e57c253 commit d4dbe37
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 76 deletions.
37 changes: 10 additions & 27 deletions drivers/tty/serial/m32r_sio.c
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@
#define BAUD_RATE 115200

#include <linux/serial_core.h>
#include "m32r_sio.h"
#include "m32r_sio_reg.h"

/*
Expand Down Expand Up @@ -98,7 +97,16 @@

#endif /* !CONFIG_PLAT_USRV */

static struct old_serial_port old_serial_port[] = {
static const struct {
unsigned int uart;
unsigned int baud_base;
unsigned int port;
unsigned int irq;
unsigned int flags;
unsigned char io_type;
unsigned char __iomem *iomem_base;
unsigned short iomem_reg_shift;
} old_serial_port[] = {
SERIAL_PORT_DFNS
};

Expand Down Expand Up @@ -1112,28 +1120,6 @@ static struct uart_driver m32r_sio_reg = {
.cons = M32R_SIO_CONSOLE,
};

/**
* m32r_sio_suspend_port - suspend one serial port
* @line: serial line number
*
* Suspend one serial port.
*/
void m32r_sio_suspend_port(int line)
{
uart_suspend_port(&m32r_sio_reg, &m32r_sio_ports[line].port);
}

/**
* m32r_sio_resume_port - resume one serial port
* @line: serial line number
*
* Resume one serial port.
*/
void m32r_sio_resume_port(int line)
{
uart_resume_port(&m32r_sio_reg, &m32r_sio_ports[line].port);
}

static int __init m32r_sio_init(void)
{
int ret, i;
Expand Down Expand Up @@ -1163,8 +1149,5 @@ static void __exit m32r_sio_exit(void)
module_init(m32r_sio_init);
module_exit(m32r_sio_exit);

EXPORT_SYMBOL(m32r_sio_suspend_port);
EXPORT_SYMBOL(m32r_sio_resume_port);

MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("Generic M32R SIO serial driver");
49 changes: 0 additions & 49 deletions drivers/tty/serial/m32r_sio.h

This file was deleted.

0 comments on commit d4dbe37

Please sign in to comment.