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

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

TTY: isdn, remove callout 



I wonder how this survived there during the whole 2.6 series until now
:D.

Callouts are not used for a decade, so let us remove it also from
isdn. This means removal of ISDN_ASYNC_CALLOUT_ACTIVE which is never
raised in info->flags and callout_termios which are never used.

This will help us to get rid of ISDN_ASYNC_* flags and use ASYNC ones
from serial.h. And then we will switch to tty_port.

Signed-off-by: default avatarJiri Slaby <jslaby@suse.cz>
Cc: Karsten Keil <isdn@linux-pingi.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1ca6711e

drivers/isdn/i4l/isdn_tty.c

+6 −26
Original line number Original line Diff line number Diff line
@@ -1504,18 +1504,11 @@ isdn_tty_block_til_ready(struct tty_struct *tty, struct file *filp, modem_info * 
	 */

	 */

	if ((filp->f_flags & O_NONBLOCK) ||

	if ((filp->f_flags & O_NONBLOCK) ||

	    (tty->flags & (1 << TTY_IO_ERROR))) {

	    (tty->flags & (1 << TTY_IO_ERROR))) {

		if (info->flags & ISDN_ASYNC_CALLOUT_ACTIVE)

			return -EBUSY;

		info->flags |= ISDN_ASYNC_NORMAL_ACTIVE;

		info->flags |= ISDN_ASYNC_NORMAL_ACTIVE;

		return 0;

		return 0;

	}

	}

	if (info->flags & ISDN_ASYNC_CALLOUT_ACTIVE) {

		if (info->normal_termios.c_cflag & CLOCAL)

			do_clocal = 1;

	} else {

	if (tty->termios->c_cflag & CLOCAL)

	if (tty->termios->c_cflag & CLOCAL)

		do_clocal = 1;

		do_clocal = 1;

	}

	/*

	/*

	 * Block waiting for the carrier detect and the line to become

	 * Block waiting for the carrier detect and the line to become

	 * free (i.e., not in use by the callout).  While we are in

	 * free (i.e., not in use by the callout).  While we are in
@@ -1546,8 +1539,7 @@ isdn_tty_block_til_ready(struct tty_struct *tty, struct file *filp, modem_info * 
#endif

#endif

			break;

			break;

		}

		}

		if (!(info->flags & ISDN_ASYNC_CALLOUT_ACTIVE) &&

		if (!(info->flags & ISDN_ASYNC_CLOSING) &&

		    !(info->flags & ISDN_ASYNC_CLOSING) &&

		    (do_clocal || (info->msr & UART_MSR_DCD))) {

		    (do_clocal || (info->msr & UART_MSR_DCD))) {

			break;

			break;

		}

		}
@@ -1670,14 +1662,6 @@ isdn_tty_close(struct tty_struct *tty, struct file *filp) 
		return;

		return;

	}

	}

	info->flags |= ISDN_ASYNC_CLOSING;

	info->flags |= ISDN_ASYNC_CLOSING;

	/*

	 * Save the termios structure, since this port may have

	 * separate termios for callout and dialin.

	 */

	if (info->flags & ISDN_ASYNC_NORMAL_ACTIVE)

		info->normal_termios = *tty->termios;

	if (info->flags & ISDN_ASYNC_CALLOUT_ACTIVE)

		info->callout_termios = *tty->termios;





	tty->closing = 1;

	tty->closing = 1;

	/*

	/*
@@ -1731,7 +1715,7 @@ isdn_tty_hangup(struct tty_struct *tty) 
		return;

		return;

	isdn_tty_shutdown(info);

	isdn_tty_shutdown(info);

	info->count = 0;

	info->count = 0;

	info->flags &= ~(ISDN_ASYNC_NORMAL_ACTIVE | ISDN_ASYNC_CALLOUT_ACTIVE);

	info->flags &= ~ISDN_ASYNC_NORMAL_ACTIVE;

	info->tty = NULL;

	info->tty = NULL;

	wake_up_interruptible(&info->open_wait);

	wake_up_interruptible(&info->open_wait);

}

}
@@ -2116,8 +2100,7 @@ isdn_tty_find_icall(int di, int ch, setup_parm *setup) 
	return (wret == 2) ? 3 : 0;

	return (wret == 2) ? 3 : 0;

}

}





#define TTY_IS_ACTIVE(info)						\

#define TTY_IS_ACTIVE(info)	(info->flags & ISDN_ASYNC_NORMAL_ACTIVE)

	(info->flags & (ISDN_ASYNC_NORMAL_ACTIVE | ISDN_ASYNC_CALLOUT_ACTIVE))





int

int

isdn_tty_stat_callback(int i, isdn_ctrl *c)

isdn_tty_stat_callback(int i, isdn_ctrl *c)
@@ -2628,13 +2611,10 @@ isdn_tty_modem_result(int code, modem_info *info) 
		if ((info->flags & ISDN_ASYNC_CLOSING) || (!info->tty)) {

		if ((info->flags & ISDN_ASYNC_CLOSING) || (!info->tty)) {

			return;

			return;

		}

		}

		if ((info->flags & ISDN_ASYNC_CHECK_CD) &&

		if (info->flags & ISDN_ASYNC_CHECK_CD)

		    (!((info->flags & ISDN_ASYNC_CALLOUT_ACTIVE) &&

		       (info->flags & ISDN_ASYNC_CALLOUT_NOHUP)))) {

			tty_hangup(info->tty);

			tty_hangup(info->tty);

	}

	}

}

}

}









/*

/*

include/linux/isdn.h

+0 −3
Original line number Original line Diff line number Diff line
@@ -393,7 +393,6 @@ typedef struct isdn_net_dev_s { 




#define ISDN_ASYNC_MAGIC          0x49344C01 /* for paranoia-checking        */

#define ISDN_ASYNC_MAGIC          0x49344C01 /* for paranoia-checking        */

#define ISDN_ASYNC_INITIALIZED	  0x80000000 /* port was initialized         */

#define ISDN_ASYNC_INITIALIZED	  0x80000000 /* port was initialized         */

#define ISDN_ASYNC_CALLOUT_ACTIVE 0x40000000 /* Call out device active       */

#define ISDN_ASYNC_NORMAL_ACTIVE  0x20000000 /* Normal device active         */

#define ISDN_ASYNC_NORMAL_ACTIVE  0x20000000 /* Normal device active         */

#define ISDN_ASYNC_CLOSING	  0x08000000 /* Serial port is closing       */

#define ISDN_ASYNC_CLOSING	  0x08000000 /* Serial port is closing       */

#define ISDN_ASYNC_CTS_FLOW	  0x04000000 /* Do CTS flow control          */

#define ISDN_ASYNC_CTS_FLOW	  0x04000000 /* Do CTS flow control          */
@@ -498,8 +497,6 @@ typedef struct modem_info { 
#endif

#endif

  struct tty_struct 	*tty;            /* Pointer to corresponding tty   */

  struct tty_struct 	*tty;            /* Pointer to corresponding tty   */

  atemu                 emu;             /* AT-emulator data               */

  atemu                 emu;             /* AT-emulator data               */

  struct ktermios	normal_termios;  /* For saving termios structs     */

  struct ktermios	callout_termios;

  wait_queue_head_t	open_wait, close_wait;

  wait_queue_head_t	open_wait, close_wait;

  spinlock_t	        readlock;

  spinlock_t	        readlock;

} modem_info;

} modem_info;