hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

drivers/char: use __set_current_state() 

use __set_current_state(TASK_*) instead of current->state = TASK_*,

Signed-off-by: Milind Arun Choudhary <milindchoudhary@gmail.com>
Cc: Jiri Slaby <jirislaby@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Milind Arun Choudhary 2007-05-08 00:30:52 -07:00 committed by Linus Torvalds
parent 5ab2f7e0fd
commit cc0a8fbb7c
11 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/char/amiserial.c
View File

@ -1574,7 +1574,7 @@ static void rs_wait_until_sent(struct tty_struct *tty, int timeout)
if (timeout && time_after(jiffies, orig_jiffies + timeout)) if (timeout && time_after(jiffies, orig_jiffies + timeout))
break; break;
} }
current->state = TASK_RUNNING; __set_current_state(TASK_RUNNING);
#ifdef SERIAL_DEBUG_RS_WAIT_UNTIL_SENT #ifdef SERIAL_DEBUG_RS_WAIT_UNTIL_SENT
printk("lsr = %d (jiff=%lu)...done\n", lsr, jiffies); printk("lsr = %d (jiff=%lu)...done\n", lsr, jiffies);
#endif #endif
@ -1700,7 +1700,7 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
#endif #endif
schedule(); schedule();
} }
current->state = TASK_RUNNING; __set_current_state(TASK_RUNNING);
remove_wait_queue(&info->open_wait, &wait); remove_wait_queue(&info->open_wait, &wait);
if (extra_count) if (extra_count)
state->count++; state->count++;

4
drivers/char/cyclades.c
View File

@ -2445,7 +2445,7 @@ block_til_ready(struct tty_struct *tty, struct file *filp,
base_addr = cinfo->base_addr; base_addr = cinfo->base_addr;
firm_id = base_addr + ID_ADDRESS; firm_id = base_addr + ID_ADDRESS;
if (!ISZLOADED(*cinfo)) { if (!ISZLOADED(*cinfo)) {
current->state = TASK_RUNNING; __set_current_state(TASK_RUNNING);
remove_wait_queue(&info->open_wait, &wait); remove_wait_queue(&info->open_wait, &wait);
return -EINVAL; return -EINVAL;
} }
@ -2498,7 +2498,7 @@ block_til_ready(struct tty_struct *tty, struct file *filp,
schedule(); schedule();
} }
} }
current->state = TASK_RUNNING; __set_current_state(TASK_RUNNING);
remove_wait_queue(&info->open_wait, &wait); remove_wait_queue(&info->open_wait, &wait);
if (!tty_hung_up_p(filp)) { if (!tty_hung_up_p(filp)) {
info->count++; info->count++;

2
drivers/char/epca.c
View File

@ -949,7 +949,7 @@ static int block_til_ready(struct tty_struct *tty,
} /* End forever while */ } /* End forever while */
current->state = TASK_RUNNING; __set_current_state(TASK_RUNNING);
remove_wait_queue(&ch->open_wait, &wait); remove_wait_queue(&ch->open_wait, &wait);
if (!tty_hung_up_p(filp)) if (!tty_hung_up_p(filp))
ch->count++; ch->count++;

2
drivers/char/genrtc.c
View File

@ -207,7 +207,7 @@ static ssize_t gen_rtc_read(struct file *file, char __user *buf,
sizeof(unsigned long); sizeof(unsigned long);
} }
out: out:
current->state = TASK_RUNNING; __set_current_state(TASK_RUNNING);
remove_wait_queue(&gen_rtc_wait, &wait); remove_wait_queue(&gen_rtc_wait, &wait);
return retval; return retval;

4
drivers/char/n_r3964.c
View File

@ -1088,13 +1088,13 @@ static ssize_t r3964_read(struct tty_struct *tty, struct file *file,
/* block until there is a message: */ /* block until there is a message: */
add_wait_queue(&pInfo->read_wait, &wait); add_wait_queue(&pInfo->read_wait, &wait);
repeat: repeat:
current->state = TASK_INTERRUPTIBLE; __set_current_state(TASK_INTERRUPTIBLE);
pMsg = remove_msg(pInfo, pClient); pMsg = remove_msg(pInfo, pClient);
if (!pMsg && !signal_pending(current)) { if (!pMsg && !signal_pending(current)) {
schedule(); schedule();
goto repeat; goto repeat;
} }
current->state = TASK_RUNNING; __set_current_state(TASK_RUNNING);
remove_wait_queue(&pInfo->read_wait, &wait); remove_wait_queue(&pInfo->read_wait, &wait);
} }

2
drivers/char/riscom8.c
View File

@ -980,7 +980,7 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
} }
schedule(); schedule();
} }
current->state = TASK_RUNNING; __set_current_state(TASK_RUNNING);
remove_wait_queue(&port->open_wait, &wait); remove_wait_queue(&port->open_wait, &wait);
if (!tty_hung_up_p(filp)) if (!tty_hung_up_p(filp))
port->count++; port->count++;

4
drivers/char/rocket.c
View File

@ -943,7 +943,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
#endif #endif
schedule(); /* Don't hold spinlock here, will hang PC */ schedule(); /* Don't hold spinlock here, will hang PC */
} }
current->state = TASK_RUNNING; __set_current_state(TASK_RUNNING);
remove_wait_queue(&info->open_wait, &wait); remove_wait_queue(&info->open_wait, &wait);
spin_lock_irqsave(&info->slock, flags); spin_lock_irqsave(&info->slock, flags);
@ -1598,7 +1598,7 @@ static void rp_wait_until_sent(struct tty_struct *tty, int timeout)
if (signal_pending(current)) if (signal_pending(current))
break; break;
} }
current->state = TASK_RUNNING; __set_current_state(TASK_RUNNING);
#ifdef ROCKET_DEBUG_WAIT_UNTIL_SENT #ifdef ROCKET_DEBUG_WAIT_UNTIL_SENT
printk(KERN_INFO "txcnt = %d (jiff=%lu)...done\n", txcnt, jiffies); printk(KERN_INFO "txcnt = %d (jiff=%lu)...done\n", txcnt, jiffies);
#endif #endif

2
drivers/char/rtc.c
View File

@ -388,7 +388,7 @@ static ssize_t rtc_read(struct file *file, char __user *buf,
if (!retval) if (!retval)
retval = count; retval = count;
out: out:
current->state = TASK_RUNNING; __set_current_state(TASK_RUNNING);
remove_wait_queue(&rtc_wait, &wait); remove_wait_queue(&rtc_wait, &wait);
return retval; return retval;

2
drivers/char/selection.c
View File

@ -299,7 +299,7 @@ int paste_selection(struct tty_struct *tty)
pasted += count; pasted += count;
} }
remove_wait_queue(&vc->paste_wait, &wait); remove_wait_queue(&vc->paste_wait, &wait);
current->state = TASK_RUNNING; __set_current_state(TASK_RUNNING);
tty_ldisc_deref(ld); tty_ldisc_deref(ld);
return 0; return 0;

2
drivers/char/serial167.c
View File

@ -1892,7 +1892,7 @@ block_til_ready(struct tty_struct *tty, struct file *filp,
#endif #endif
schedule(); schedule();
} }
current->state = TASK_RUNNING; __set_current_state(TASK_RUNNING);
remove_wait_queue(&info->open_wait, &wait); remove_wait_queue(&info->open_wait, &wait);
if (!tty_hung_up_p(filp)) { if (!tty_hung_up_p(filp)) {
info->count++; info->count++;

2
drivers/char/vt_ioctl.c
View File

@ -1061,7 +1061,7 @@ int vt_waitactive(int vt)
schedule(); schedule();
} }
remove_wait_queue(&vt_activate_queue, &wait); remove_wait_queue(&vt_activate_queue, &wait);
current->state = TASK_RUNNING; __set_current_state(TASK_RUNNING);
return retval; return retval;
} }