[SERIAL] Change settermios to set_termios

set_termios matches the style used for the other methods.  It should
have been this from the start.

15 files changed, 46 insertions, 46 deletions

diff --git a/Documentation/serial/driver b/Documentation/serial/driver
index 506c1d81359e..a707e5b33953 100644
--- a/Documentation/serial/driver
+++ b/Documentation/serial/driver
@@ -176,7 +176,7 @@ hardware.
 	Locking: port_sem taken.
 	Interrupts: caller dependent.
 
-  settermios(port,termios,oldtermios)
+  set_termios(port,termios,oldtermios)
 	Change the port parameters, including word length, parity, stop
 	bits.  Update read_status_mask and ignore_status_mask to indicate
 	the types of events we are interested in receiving.  Relevant
diff --git a/drivers/serial/21285.c b/drivers/serial/21285.c
index 7cc9811552dd..67d42083fcd2 100644
--- a/drivers/serial/21285.c
+++ b/drivers/serial/21285.c
@@ -233,8 +233,8 @@ static void serial21285_shutdown(struct uart_port *port)
 }
 
 static void
-serial21285_settermios(struct uart_port *port, struct termios *termios,
-		       struct termios *old)
+serial21285_set_termios(struct uart_port *port, struct termios *termios,
+			struct termios *old)
 {
 	unsigned long flags;
 	unsigned int quot, h_lcr;
@@ -369,7 +369,7 @@ static struct uart_ops serial21285_ops = {
 	.break_ctl	= serial21285_break_ctl,
 	.startup	= serial21285_startup,
 	.shutdown	= serial21285_shutdown,
-	.settermios	= serial21285_settermios,
+	.set_termios	= serial21285_set_termios,
 	.type		= serial21285_type,
 	.release_port	= serial21285_release_port,
 	.request_port	= serial21285_request_port,
diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c
index d64ba26df47c..d71cbbfe13e9 100644
--- a/drivers/serial/8250.c
+++ b/drivers/serial/8250.c
@@ -1174,7 +1174,7 @@ static int serial8250_startup(struct uart_port *port)
 
 	/*
 	 * Clear the FIFO buffers and disable them.
-	 * (they will be reeanbled in settermios())
+	 * (they will be reeanbled in set_termios())
 	 */
 	if (uart_config[up->port.type].flags & UART_CLEAR_FIFO) {
 		serial_outp(up, UART_FCR, UART_FCR_ENABLE_FIFO);
@@ -1241,7 +1241,7 @@ static int serial8250_startup(struct uart_port *port)
 
 	/*
 	 * Finally, enable interrupts.  Note: Modem status interrupts
-	 * are set via settermios(), which will be occuring imminently
+	 * are set via set_termios(), which will be occuring imminently
 	 * anyway, so we don't enable them here.
 	 */
 	up->ier = UART_IER_RLSI | UART_IER_RDI;
@@ -1319,8 +1319,8 @@ static void serial8250_shutdown(struct uart_port *port)
 }
 
 static void
-serial8250_settermios(struct uart_port *port, struct termios *termios,
-		      struct termios *old)
+serial8250_set_termios(struct uart_port *port, struct termios *termios,
+		       struct termios *old)
 {
 	struct uart_8250_port *up = (struct uart_8250_port *)port;
 	unsigned char cval, fcr = 0;
@@ -1740,7 +1740,7 @@ static struct uart_ops serial8250_pops = {
 	.break_ctl	= serial8250_break_ctl,
 	.startup	= serial8250_startup,
 	.shutdown	= serial8250_shutdown,
-	.settermios	= serial8250_settermios,
+	.set_termios	= serial8250_set_termios,
 	.pm		= serial8250_pm,
 	.type		= serial8250_type,
 	.release_port	= serial8250_release_port,
diff --git a/drivers/serial/amba.c b/drivers/serial/amba.c
index 713065c6d945..9b04883f2f6b 100644
--- a/drivers/serial/amba.c
+++ b/drivers/serial/amba.c
@@ -403,8 +403,8 @@ static void ambauart_shutdown(struct uart_port *port)
 }
 
 static void
-ambauart_settermios(struct uart_port *port, struct termios *termios,
-		    struct termios *old)
+ambauart_set_termios(struct uart_port *port, struct termios *termios,
+		     struct termios *old)
 {
 	unsigned int lcr_h, old_cr;
 	unsigned long flags;
@@ -557,7 +557,7 @@ static struct uart_ops amba_pops = {
 	.break_ctl	= ambauart_break_ctl,
 	.startup	= ambauart_startup,
 	.shutdown	= ambauart_shutdown,
-	.settermios	= ambauart_settermios,
+	.set_termios	= ambauart_set_termios,
 	.type		= ambauart_type,
 	.release_port	= ambauart_release_port,
 	.request_port	= ambauart_request_port,
diff --git a/drivers/serial/anakin.c b/drivers/serial/anakin.c
index a2009bc1cc76..1d8902171f74 100644
--- a/drivers/serial/anakin.c
+++ b/drivers/serial/anakin.c
@@ -283,8 +283,8 @@ static void anakin_shutdown(struct uart_port *port)
 }
 
 static void
-anakin_settermios(struct uart_port *port, struct termios *termios,
-		  struct termios *old)
+anakin_set_termios(struct uart_port *port, struct termios *termios,
+		   struct termios *old)
 {
 	unsigned long flags;
 	unsigned int quot;
@@ -337,7 +337,7 @@ static struct uart_ops anakin_pops = {
 	.break_ctl	= anakin_break_ctl,
 	.startup	= anakin_startup,
 	.shutdown	= anakin_shutdown,
-	.settermios	= anakin_settermios,
+	.set_termios	= anakin_set_termios,
 	.type		= anakin_type,
 };
 
diff --git a/drivers/serial/clps711x.c b/drivers/serial/clps711x.c
index 74ba93d18438..e2bfd6d5e50f 100644
--- a/drivers/serial/clps711x.c
+++ b/drivers/serial/clps711x.c
@@ -317,8 +317,8 @@ static void clps711xuart_shutdown(struct uart_port *port)
 }
 
 static void
-clps711xuart_settermios(struct uart_port *port, struct termios *termios,
-			struct termios *old)
+clps711xuart_set_termios(struct uart_port *port, struct termios *termios,
+			 struct termios *old)
 {
 	unsigned int ubrlcr, quot;
 	unsigned long flags;
@@ -424,7 +424,7 @@ static struct uart_ops clps711x_pops = {
 	.break_ctl	= clps711xuart_break_ctl,
 	.startup	= clps711xuart_startup,
 	.shutdown	= clps711xuart_shutdown,
-	.settermios	= clps711xuart_settermios,
+	.set_termios	= clps711xuart_set_termios,
 	.type		= clps711xuart_type,
 	.config_port	= clps711xuart_config_port,
 	.release_port	= clps711xuart_release_port,
diff --git a/drivers/serial/core.c b/drivers/serial/core.c
index 979a4b51f149..4d6d0e72954b 100644
--- a/drivers/serial/core.c
+++ b/drivers/serial/core.c
@@ -451,7 +451,7 @@ uart_change_speed(struct uart_info *info, struct termios *old_termios)
 	else
 		info->flags |= UIF_CHECK_CD;
 
-	port->ops->settermios(port, termios, old_termios);
+	port->ops->set_termios(port, termios, old_termios);
 }
 
 static inline void
@@ -1887,7 +1887,7 @@ uart_set_options(struct uart_port *port, struct console *co,
 	if (flow == 'r')
 		termios.c_cflag |= CRTSCTS;
 
-	port->ops->settermios(port, &termios, NULL);
+	port->ops->set_termios(port, &termios, NULL);
 	co->cflag = termios.c_cflag;
 
 	return 0;
diff --git a/drivers/serial/mux.c b/drivers/serial/mux.c
index a71049bd8aa1..3ef15146632e 100644
--- a/drivers/serial/mux.c
+++ b/drivers/serial/mux.c
@@ -268,7 +268,7 @@ static void mux_shutdown(struct uart_port *port)
 }
 
 /**
- * mux_settermios - Chane port parameters.
+ * mux_set_termios - Chane port parameters.
  * @port: Ptr to the uart_port.
  * @termios: new termios settings.
  * @old: old termios settings.
@@ -276,8 +276,8 @@ static void mux_shutdown(struct uart_port *port)
  * The Serial Mux does not support this function.
  */
 static void
-mux_settermios(struct uart_port *port, struct termios *termios,
-	       struct termios *old)
+mux_set_termios(struct uart_port *port, struct termios *termios,
+	        struct termios *old)
 {
 }
 
@@ -387,7 +387,7 @@ static struct uart_ops mux_pops = {
 	.break_ctl =		mux_break_ctl,
 	.startup =		mux_startup,
 	.shutdown =		mux_shutdown,
-	.settermios =		mux_settermios,
+	.set_termios =		mux_set_termios,
 	.type =			mux_type,
 	.release_port =		mux_release_port,
 	.request_port =		mux_request_port,
diff --git a/drivers/serial/nb85e_uart.c b/drivers/serial/nb85e_uart.c
index c9c1dc28057c..03c6b15e89cb 100644
--- a/drivers/serial/nb85e_uart.c
+++ b/drivers/serial/nb85e_uart.c
@@ -440,8 +440,8 @@ static void nb85e_uart_shutdown (struct uart_port *port)
 }
 
 static void
-nb85e_uart_settermios (struct uart_port *port, struct termios *termios,
-		       struct termios *old)
+nb85e_uart_set_termios (struct uart_port *port, struct termios *termios,
+		        struct termios *old)
 {
 	/* FIXME: Which termios flags does this driver support? --rmk */
 
@@ -481,7 +481,7 @@ static struct uart_ops nb85e_uart_ops = {
 	.break_ctl	= nb85e_uart_break_ctl,
 	.startup	= nb85e_uart_startup,
 	.shutdown	= nb85e_uart_shutdown,
-	.settermios	= nb85e_uart_settermios,
+	.set_termios	= nb85e_uart_set_termios,
 	.type		= nb85e_uart_type,
 	.release_port	= nb85e_uart_nop,
 	.request_port	= nb85e_uart_success,
diff --git a/drivers/serial/sa1100.c b/drivers/serial/sa1100.c
index 22cc19c65d9a..52377d5c9038 100644
--- a/drivers/serial/sa1100.c
+++ b/drivers/serial/sa1100.c
@@ -436,8 +436,8 @@ static void sa1100_shutdown(struct uart_port *port)
 }
 
 static void
-sa1100_settermios(struct uart_port *port, struct termios *termios,
-		  struct termios *old)
+sa1100_set_termios(struct uart_port *port, struct termios *termios,
+		   struct termios *old)
 {
 	struct sa1100_port *sport = (struct sa1100_port *)port;
 	unsigned long flags;
@@ -618,7 +618,7 @@ static struct uart_ops sa1100_pops = {
 	.break_ctl	= sa1100_break_ctl,
 	.startup	= sa1100_startup,
 	.shutdown	= sa1100_shutdown,
-	.settermios	= sa1100_settermios,
+	.set_termios	= sa1100_set_termios,
 	.type		= sa1100_type,
 	.release_port	= sa1100_release_port,
 	.request_port	= sa1100_request_port,
diff --git a/drivers/serial/sunsab.c b/drivers/serial/sunsab.c
index b00b3d4546d0..68d1d8ba55bd 100644
--- a/drivers/serial/sunsab.c
+++ b/drivers/serial/sunsab.c
@@ -777,8 +777,8 @@ static void sunsab_convert_to_sab(struct uart_sunsab_port *up, unsigned int cfla
 }
 
 /* port->lock is not held.  */
-static void sunsab_settermios(struct uart_port *port, struct termios *termios,
-			      struct termios *old)
+static void sunsab_set_termios(struct uart_port *port, struct termios *termios,
+			       struct termios *old)
 {
 	struct uart_sunsab_port *up = (struct uart_sunsab_port *) port;
 	unsigned long flags;
@@ -824,7 +824,7 @@ static struct uart_ops sunsab_pops = {
 	.break_ctl	= sunsab_break_ctl,
 	.startup	= sunsab_startup,
 	.shutdown	= sunsab_shutdown,
-	.settermios	= sunsab_settermios,
+	.set_termios	= sunsab_set_termios,
 	.type		= sunsab_type,
 	.release_port	= sunsab_release_port,
 	.request_port	= sunsab_request_port,
diff --git a/drivers/serial/sunsu.c b/drivers/serial/sunsu.c
index c9b21f0cd3ef..4879bfd96356 100644
--- a/drivers/serial/sunsu.c
+++ b/drivers/serial/sunsu.c
@@ -660,7 +660,7 @@ static int sunsu_startup(struct uart_port *port)
 
 	/*
 	 * Clear the FIFO buffers and disable them.
-	 * (they will be reeanbled in settermios())
+	 * (they will be reeanbled in set_termios())
 	 */
 	if (uart_config[up->port.type].flags & UART_CLEAR_FIFO) {
 		serial_outp(up, UART_FCR, UART_FCR_ENABLE_FIFO);
@@ -714,7 +714,7 @@ static int sunsu_startup(struct uart_port *port)
 
 	/*
 	 * Finally, enable interrupts.  Note: Modem status interrupts
-	 * are set via settermios(), which will be occuring imminently
+	 * are set via set_termios(), which will be occuring imminently
 	 * anyway, so we don't enable them here.
 	 */
 	up->ier = UART_IER_RLSI | UART_IER_RDI;
@@ -917,8 +917,8 @@ sunsu_change_speed(struct uart_port *port, unsigned int cflag,
 }
 
 static void
-sunsu_settermios(struct uart_port *port, struct termios *termios,
-		 struct termios *old)
+sunsu_set_termios(struct uart_port *port, struct termios *termios,
+		  struct termios *old)
 {
 	unsigned int quot;
 
@@ -980,7 +980,7 @@ static struct uart_ops sunsu_pops = {
 	.break_ctl	= sunsu_break_ctl,
 	.startup	= sunsu_startup,
 	.shutdown	= sunsu_shutdown,
-	.settermios	= sunsu_settermios,
+	.set_termios	= sunsu_set_termios,
 	.type		= sunsu_type,
 	.release_port	= sunsu_release_port,
 	.request_port	= sunsu_request_port,
diff --git a/drivers/serial/sunzilog.c b/drivers/serial/sunzilog.c
index 50fcfe491504..22c3442431b4 100644
--- a/drivers/serial/sunzilog.c
+++ b/drivers/serial/sunzilog.c
@@ -917,8 +917,8 @@ sunzilog_convert_to_zs(struct uart_sunzilog_port *up, unsigned int cflag,
 
 /* The port lock is not held.  */
 static void
-sunzilog_settermios(struct uart_port *port, struct termios *termios,
-		    struct termios *old)
+sunzilog_set_termios(struct uart_port *port, struct termios *termios,
+		     struct termios *old)
 {
 	struct uart_sunzilog_port *up = (struct uart_sunzilog_port *) port;
 	unsigned long flags;
@@ -983,7 +983,7 @@ static struct uart_ops sunzilog_pops = {
 	.break_ctl	=	sunzilog_break_ctl,
 	.startup	=	sunzilog_startup,
 	.shutdown	=	sunzilog_shutdown,
-	.settermios	=	sunzilog_settermios,
+	.set_termios	=	sunzilog_set_termios,
 	.type		=	sunzilog_type,
 	.release_port	=	sunzilog_release_port,
 	.request_port	=	sunzilog_request_port,
diff --git a/drivers/serial/uart00.c b/drivers/serial/uart00.c
index d44ac871f08c..8b53824b0ee0 100644
--- a/drivers/serial/uart00.c
+++ b/drivers/serial/uart00.c
@@ -314,8 +314,8 @@ static void uart00_break_ctl(struct uart_port *port, int break_state)
 }
 
 static void
-uart00_settermios(struct uart_port *port, struct termios *termios,
-		  struct termios *old)
+uart00_set_termios(struct uart_port *port, struct termios *termios,
+		   struct termios *old)
 {
 	unsigned int uart_mc, old_ies, quot;
 	unsigned long flags;
@@ -511,7 +511,7 @@ static struct uart_ops uart00_pops = {
 	.break_ctl	= uart00_break_ctl,
 	.startup	= uart00_startup,
 	.shutdown	= uart00_shutdown,
-	.settermios	= uart00_settermios,
+	.set_termios	= uart00_set_termios,
 	.type		= uart00_type,
 	.release_port	= uart00_release_port,
 	.request_port	= uart00_request_port,
diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h
index e4d689578c6f..58fe38afbd8e 100644
--- a/include/linux/serial_core.h
+++ b/include/linux/serial_core.h
@@ -86,8 +86,8 @@ struct uart_ops {
 	void		(*break_ctl)(struct uart_port *, int ctl);
 	int		(*startup)(struct uart_port *);
 	void		(*shutdown)(struct uart_port *);
-	void		(*settermios)(struct uart_port *, struct termios *new,
-				      struct termios *old);
+	void		(*set_termios)(struct uart_port *, struct termios *new,
+				       struct termios *old);
 	void		(*pm)(struct uart_port *, unsigned int state,
 			      unsigned int oldstate);
 	int		(*set_wake)(struct uart_port *, unsigned int state);