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

Commit f66279cd authored by Jiri Slaby's avatar Jiri Slaby Committed by Greg Kroah-Hartman
Browse files

TTY: simserial, reindent some code 



Make the code to conform to the standard. Also make it readable.

Signed-off-by: default avatarJiri Slaby <jslaby@suse.cz>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8b916330

arch/ia64/hp/sim/simserial.c

+44 −76
Original line number Diff line number Diff line
@@ -65,8 +65,7 @@ static void receive_chars(struct tty_struct *tty) 
		if (ch == 27 && seen_esc == 0) {

			seen_esc = 1;

			continue;

		} else {

			if ( seen_esc==1 && ch == 'O' ) {

		} else if (seen_esc == 1 && ch == 'O') {

			seen_esc = 2;

			continue;

		} else if (seen_esc == 2) {
@@ -74,17 +73,15 @@ static void receive_chars(struct tty_struct *tty) 
				show_state();

#ifdef CONFIG_MAGIC_SYSRQ

			if (ch == 'S') { /* F4 */

					do

						ch = ia64_ssc(0, 0, 0, 0,

							      SSC_GETCHAR);

					while (!ch);

				do {

					ch = ia64_ssc(0, 0, 0, 0, SSC_GETCHAR);

				} while (!ch);

				handle_sysrq(ch);

			}

#endif

			seen_esc = 0;

			continue;

		}

		}

		seen_esc = 0;



		if (tty_insert_flip_char(tty, ch, TTY_NORMAL) == 0)
@@ -195,8 +192,8 @@ static void rs_flush_chars(struct tty_struct *tty) 
{

	struct serial_state *info = tty->driver_data;



	if (info->xmit.head == info->xmit.tail || tty->stopped || tty->hw_stopped ||

	    !info->xmit.buf)

	if (info->xmit.head == info->xmit.tail || tty->stopped ||

			tty->hw_stopped || !info->xmit.buf)

		return;



	transmit_chars(tty, info, NULL);
@@ -232,10 +229,10 @@ static int rs_write(struct tty_struct * tty, 
	/*

	 * Hey, we transmit directly from here in our case

	 */

	if (CIRC_CNT(info->xmit.head, info->xmit.tail, SERIAL_XMIT_SIZE)

	    && !tty->stopped && !tty->hw_stopped) {

	if (CIRC_CNT(info->xmit.head, info->xmit.tail, SERIAL_XMIT_SIZE) &&

			!tty->stopped && !tty->hw_stopped)

		transmit_chars(tty, info, NULL);

	}



	return ret;

}
@@ -293,7 +290,8 @@ static void rs_send_xchar(struct tty_struct *tty, char ch) 
 */

static void rs_throttle(struct tty_struct * tty)

{

	if (I_IXOFF(tty)) rs_send_xchar(tty, STOP_CHAR(tty));

	if (I_IXOFF(tty))

		rs_send_xchar(tty, STOP_CHAR(tty));



	printk(KERN_INFO "simrs_throttle called\n");

}
@@ -323,47 +321,20 @@ static int rs_ioctl(struct tty_struct *tty, unsigned int cmd, unsigned long arg) 


	switch (cmd) {

	case TIOCGSERIAL:

			printk(KERN_INFO "simrs_ioctl TIOCGSERIAL called\n");

			return 0;

	case TIOCSSERIAL:

			printk(KERN_INFO "simrs_ioctl TIOCSSERIAL called\n");

	case TIOCSERGSTRUCT:

	case TIOCMIWAIT:

		return 0;

	case TIOCSERCONFIG:

			printk(KERN_INFO "rs_ioctl: TIOCSERCONFIG called\n");

			return -EINVAL;



	case TIOCSERGETLSR: /* Get line status register */

			printk(KERN_INFO "rs_ioctl: TIOCSERGETLSR called\n");

		return -EINVAL;



		case TIOCSERGSTRUCT:

			printk(KERN_INFO "rs_ioctl: TIOCSERGSTRUCT called\n");

#if 0

			if (copy_to_user((struct async_struct *) arg,

					 info, sizeof(struct async_struct)))

				return -EFAULT;

#endif

			return 0;



		/*

		 * Wait for any of the 4 modem inputs (DCD,RI,DSR,CTS) to change

		 * - mask passed in arg for lines of interest

		 *   (use |'ed TIOCM_RNG/DSR/CD/CTS for masking)

		 * Caller should use TIOCGICOUNT to see which one it was

		 */

		case TIOCMIWAIT:

			printk(KERN_INFO "rs_ioctl: TIOCMIWAIT: called\n");

			return 0;

	case TIOCSERGWILD:

	case TIOCSERSWILD:

		/* "setserial -W" is called in Debian boot */

		printk (KERN_INFO "TIOCSER?WILD ioctl obsolete, ignored.\n");

		return 0;



		default:

			return -ENOIOCTLCMD;

	}

	return 0;

	return -ENOIOCTLCMD;

}



#define RELEVANT_IFLAG(iflag) (iflag & (IGNBRK|BRKINT|IGNPAR|PARMRK|INPCK))
@@ -387,7 +358,6 @@ static void shutdown(struct tty_port *port) 
	unsigned long flags;



	local_irq_save(flags);

	{

	if (info->irq)

		free_irq(info->irq, info);
@@ -395,7 +365,6 @@ static void shutdown(struct tty_port *port) 
		free_page((unsigned long) info->xmit.buf);

		info->xmit.buf = NULL;

	}

	}

	local_irq_restore(flags);

}
@@ -418,9 +387,8 @@ static int activate(struct tty_port *port, struct tty_struct *tty) 
{

	struct serial_state *state = container_of(port, struct serial_state,

			port);

	unsigned long flags;

	unsigned long flags, page;

	int retval = 0;

	unsigned long page;



	page = get_zeroed_page(GFP_KERNEL);

	if (!page)