ipoctal: reset function istead of duplicate code

Signed-off-by: Federico Vaga <federico.vaga@cern.ch>
Acked-by: Samuel Iglesias Gonsalvez <siglesias@igalia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 14 insertions, 21 deletions

diff --git a/drivers/ipack/devices/ipoctal.c b/drivers/ipack/devices/ipoctal.c
index e41bef048c23..a1514a79e487 100644
--- a/drivers/ipack/devices/ipoctal.c
+++ b/drivers/ipack/devices/ipoctal.c
@@ -55,6 +55,16 @@ struct ipoctal {
         u8 __iomem                      *int_space;
 };
 
+static void ipoctal_reset_channel(struct ipoctal_channel *channel)
+{
+        iowrite8(CR_DISABLE_RX | CR_DISABLE_TX, &channel->regs->w.cr);
+        channel->rx_enable = 0;
+        iowrite8(CR_CMD_RESET_RX, &channel->regs->w.cr);
+        iowrite8(CR_CMD_RESET_TX, &channel->regs->w.cr);
+        iowrite8(CR_CMD_RESET_ERR_STATUS, &channel->regs->w.cr);
+        iowrite8(CR_CMD_RESET_MR, &channel->regs->w.cr);
+}
+
 static int ipoctal_port_activate(struct tty_port *port, struct tty_struct *tty)
 {
         struct ipoctal_channel *channel;
@@ -304,10 +314,7 @@ static int ipoctal_inst_slot(struct ipoctal *ipoctal, unsigned int bus_nr,
                         channel->isr_rx_rdy_mask = ISR_RxRDY_FFULL_A;
                 }
 
-                iowrite8(CR_DISABLE_RX | CR_DISABLE_TX, &channel->regs->w.cr);
-                channel->rx_enable = 0;
-                iowrite8(CR_CMD_RESET_RX, &channel->regs->w.cr);
-                iowrite8(CR_CMD_RESET_TX, &channel->regs->w.cr);
+                ipoctal_reset_channel(channel);
                 iowrite8(MR1_CHRL_8_BITS | MR1_ERROR_CHAR | MR1_RxINT_RxRDY,
                          &channel->regs->w.mr); /* mr1 */
                 iowrite8(0, &channel->regs->w.mr); /* mr2 */
@@ -467,11 +474,7 @@ static void ipoctal_set_termios(struct tty_struct *tty,
         cflag = tty->termios.c_cflag;
 
         /* Disable and reset everything before change the setup */
-        iowrite8(CR_DISABLE_RX | CR_DISABLE_TX, &channel->regs->w.cr);
-        iowrite8(CR_CMD_RESET_RX, &channel->regs->w.cr);
-        iowrite8(CR_CMD_RESET_TX, &channel->regs->w.cr);
-        iowrite8(CR_CMD_RESET_ERR_STATUS, &channel->regs->w.cr);
-        iowrite8(CR_CMD_RESET_MR, &channel->regs->w.cr);
+        ipoctal_reset_channel(channel);
 
         /* Set Bits per chars */
         switch (cflag & CSIZE) {
@@ -609,12 +612,7 @@ static void ipoctal_hangup(struct tty_struct *tty)
 
         tty_port_hangup(&channel->tty_port);
 
-        iowrite8(CR_DISABLE_RX | CR_DISABLE_TX, &channel->regs->w.cr);
-        channel->rx_enable = 0;
-        iowrite8(CR_CMD_RESET_RX, &channel->regs->w.cr);
-        iowrite8(CR_CMD_RESET_TX, &channel->regs->w.cr);
-        iowrite8(CR_CMD_RESET_ERR_STATUS, &channel->regs->w.cr);
-        iowrite8(CR_CMD_RESET_MR, &channel->regs->w.cr);
+        ipoctal_reset_channel(channel);
 
         clear_bit(ASYNCB_INITIALIZED, &channel->tty_port.flags);
         wake_up_interruptible(&channel->tty_port.open_wait);
@@ -627,12 +625,7 @@ static void ipoctal_shutdown(struct tty_struct *tty)
         if (channel == NULL)
                 return;
 
-        iowrite8(CR_DISABLE_RX | CR_DISABLE_TX, &channel->regs->w.cr);
-        channel->rx_enable = 0;
-        iowrite8(CR_CMD_RESET_RX, &channel->regs->w.cr);
-        iowrite8(CR_CMD_RESET_TX, &channel->regs->w.cr);
-        iowrite8(CR_CMD_RESET_ERR_STATUS, &channel->regs->w.cr);
-        iowrite8(CR_CMD_RESET_MR, &channel->regs->w.cr);
+        ipoctal_reset_channel(channel);
         clear_bit(ASYNCB_INITIALIZED, &channel->tty_port.flags);
 }