Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 29712
b: refs/heads/master
c: 56e139f
h: refs/heads/master
v: v3
  • Loading branch information
Jesper Juhl authored and Linus Torvalds committed Jun 25, 2006
1 parent c4f62b6 commit 055858b
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 22 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: d2e5b13c4a7c68fdbcf389c9fffc12cfa2c185af
refs/heads/master: 56e139f62bd7b82430cfcf01fcbd42e1d84fb738
42 changes: 21 additions & 21 deletions trunk/drivers/char/mxser.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -877,7 +877,7 @@ static int mxser_init(void)

static void mxser_do_softint(void *private_)
{
struct mxser_struct *info = (struct mxser_struct *) private_;
struct mxser_struct *info = private_;
struct tty_struct *tty;

tty = info->tty;
Expand Down Expand Up @@ -972,7 +972,7 @@ static int mxser_open(struct tty_struct *tty, struct file *filp)
*/
static void mxser_close(struct tty_struct *tty, struct file *filp)
{
struct mxser_struct *info = (struct mxser_struct *) tty->driver_data;
struct mxser_struct *info = tty->driver_data;

unsigned long timeout;
unsigned long flags;
Expand Down Expand Up @@ -1078,7 +1078,7 @@ static void mxser_close(struct tty_struct *tty, struct file *filp)
static int mxser_write(struct tty_struct *tty, const unsigned char *buf, int count)
{
int c, total = 0;
struct mxser_struct *info = (struct mxser_struct *) tty->driver_data;
struct mxser_struct *info = tty->driver_data;
unsigned long flags;

if (!tty || !info->xmit_buf)
Expand Down Expand Up @@ -1114,7 +1114,7 @@ static int mxser_write(struct tty_struct *tty, const unsigned char *buf, int cou

static void mxser_put_char(struct tty_struct *tty, unsigned char ch)
{
struct mxser_struct *info = (struct mxser_struct *) tty->driver_data;
struct mxser_struct *info = tty->driver_data;
unsigned long flags;

if (!tty || !info->xmit_buf)
Expand All @@ -1141,7 +1141,7 @@ static void mxser_put_char(struct tty_struct *tty, unsigned char ch)

static void mxser_flush_chars(struct tty_struct *tty)
{
struct mxser_struct *info = (struct mxser_struct *) tty->driver_data;
struct mxser_struct *info = tty->driver_data;
unsigned long flags;

if (info->xmit_cnt <= 0 || tty->stopped || !info->xmit_buf || (tty->hw_stopped && (info->type != PORT_16550A) && (!info->IsMoxaMustChipFlag)))
Expand All @@ -1157,7 +1157,7 @@ static void mxser_flush_chars(struct tty_struct *tty)

static int mxser_write_room(struct tty_struct *tty)
{
struct mxser_struct *info = (struct mxser_struct *) tty->driver_data;
struct mxser_struct *info = tty->driver_data;
int ret;

ret = SERIAL_XMIT_SIZE - info->xmit_cnt - 1;
Expand All @@ -1168,13 +1168,13 @@ static int mxser_write_room(struct tty_struct *tty)

static int mxser_chars_in_buffer(struct tty_struct *tty)
{
struct mxser_struct *info = (struct mxser_struct *) tty->driver_data;
struct mxser_struct *info = tty->driver_data;
return info->xmit_cnt;
}

static void mxser_flush_buffer(struct tty_struct *tty)
{
struct mxser_struct *info = (struct mxser_struct *) tty->driver_data;
struct mxser_struct *info = tty->driver_data;
char fcr;
unsigned long flags;

Expand All @@ -1197,7 +1197,7 @@ static void mxser_flush_buffer(struct tty_struct *tty)

static int mxser_ioctl(struct tty_struct *tty, struct file *file, unsigned int cmd, unsigned long arg)
{
struct mxser_struct *info = (struct mxser_struct *) tty->driver_data;
struct mxser_struct *info = tty->driver_data;
int retval;
struct async_icount cprev, cnow; /* kernel counter temps */
struct serial_icounter_struct __user *p_cuser;
Expand Down Expand Up @@ -1581,7 +1581,7 @@ static int mxser_ioctl_special(unsigned int cmd, void __user *argp)

static void mxser_stoprx(struct tty_struct *tty)
{
struct mxser_struct *info = (struct mxser_struct *) tty->driver_data;
struct mxser_struct *info = tty->driver_data;
//unsigned long flags;


Expand Down Expand Up @@ -1615,7 +1615,7 @@ static void mxser_stoprx(struct tty_struct *tty)

static void mxser_startrx(struct tty_struct *tty)
{
struct mxser_struct *info = (struct mxser_struct *) tty->driver_data;
struct mxser_struct *info = tty->driver_data;
//unsigned long flags;

info->ldisc_stop_rx = 0;
Expand Down Expand Up @@ -1656,7 +1656,7 @@ static void mxser_startrx(struct tty_struct *tty)
*/
static void mxser_throttle(struct tty_struct *tty)
{
//struct mxser_struct *info = (struct mxser_struct *)tty->driver_data;
//struct mxser_struct *info = tty->driver_data;
//unsigned long flags;
//MX_LOCK(&info->slock);
mxser_stoprx(tty);
Expand All @@ -1665,7 +1665,7 @@ static void mxser_throttle(struct tty_struct *tty)

static void mxser_unthrottle(struct tty_struct *tty)
{
//struct mxser_struct *info = (struct mxser_struct *)tty->driver_data;
//struct mxser_struct *info = tty->driver_data;
//unsigned long flags;
//MX_LOCK(&info->slock);
mxser_startrx(tty);
Expand All @@ -1674,7 +1674,7 @@ static void mxser_unthrottle(struct tty_struct *tty)

static void mxser_set_termios(struct tty_struct *tty, struct termios *old_termios)
{
struct mxser_struct *info = (struct mxser_struct *) tty->driver_data;
struct mxser_struct *info = tty->driver_data;
unsigned long flags;

if ((tty->termios->c_cflag != old_termios->c_cflag) || (RELEVANT_IFLAG(tty->termios->c_iflag) != RELEVANT_IFLAG(old_termios->c_iflag))) {
Expand Down Expand Up @@ -1711,7 +1711,7 @@ static void mxser_set_termios(struct tty_struct *tty, struct termios *old_termio
*/
static void mxser_stop(struct tty_struct *tty)
{
struct mxser_struct *info = (struct mxser_struct *) tty->driver_data;
struct mxser_struct *info = tty->driver_data;
unsigned long flags;

spin_lock_irqsave(&info->slock, flags);
Expand All @@ -1724,7 +1724,7 @@ static void mxser_stop(struct tty_struct *tty)

static void mxser_start(struct tty_struct *tty)
{
struct mxser_struct *info = (struct mxser_struct *) tty->driver_data;
struct mxser_struct *info = tty->driver_data;
unsigned long flags;

spin_lock_irqsave(&info->slock, flags);
Expand All @@ -1740,7 +1740,7 @@ static void mxser_start(struct tty_struct *tty)
*/
static void mxser_wait_until_sent(struct tty_struct *tty, int timeout)
{
struct mxser_struct *info = (struct mxser_struct *) tty->driver_data;
struct mxser_struct *info = tty->driver_data;
unsigned long orig_jiffies, char_time;
int lsr;

Expand Down Expand Up @@ -1803,7 +1803,7 @@ static void mxser_wait_until_sent(struct tty_struct *tty, int timeout)
*/
void mxser_hangup(struct tty_struct *tty)
{
struct mxser_struct *info = (struct mxser_struct *) tty->driver_data;
struct mxser_struct *info = tty->driver_data;

mxser_flush_buffer(tty);
mxser_shutdown(info);
Expand All @@ -1821,7 +1821,7 @@ void mxser_hangup(struct tty_struct *tty)
*/
static void mxser_rs_break(struct tty_struct *tty, int break_state)
{
struct mxser_struct *info = (struct mxser_struct *) tty->driver_data;
struct mxser_struct *info = tty->driver_data;
unsigned long flags;

spin_lock_irqsave(&info->slock, flags);
Expand Down Expand Up @@ -2886,7 +2886,7 @@ static void mxser_send_break(struct mxser_struct *info, int duration)

static int mxser_tiocmget(struct tty_struct *tty, struct file *file)
{
struct mxser_struct *info = (struct mxser_struct *) tty->driver_data;
struct mxser_struct *info = tty->driver_data;
unsigned char control, status;
unsigned long flags;

Expand All @@ -2909,7 +2909,7 @@ static int mxser_tiocmget(struct tty_struct *tty, struct file *file)

static int mxser_tiocmset(struct tty_struct *tty, struct file *file, unsigned int set, unsigned int clear)
{
struct mxser_struct *info = (struct mxser_struct *) tty->driver_data;
struct mxser_struct *info = tty->driver_data;
unsigned long flags;


Expand Down

0 comments on commit 055858b

Please sign in to comment.