Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-10-30 00:32:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

TTY: rfcomm/tty, remove work for tty_wakeup

Browse Source 
tty_wakeup is safe to be called from all contexts. No need to schedule
a work for that. Let us call it directly like in other drivers.

This allows us to kill another member of rfcomm_dev structure.

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jiri Slaby 2012-04-02 13:54:52 +02:00 committed by Greg Kroah-Hartman
parent 6705401928
commit b2c4be398b
1 changed files with 3 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
net/bluetooth/rfcomm/tty.c
View File

@ -65,7 +65,6 @@ struct rfcomm_dev {
struct rfcomm_dlc *dlc; struct rfcomm_dlc *dlc;
wait_queue_head_t wait; wait_queue_head_t wait;
struct work_struct wakeup_task;
struct device *tty_dev; struct device *tty_dev;
@ -81,8 +80,6 @@ static void rfcomm_dev_data_ready(struct rfcomm_dlc *dlc, struct sk_buff *skb);
static void rfcomm_dev_state_change(struct rfcomm_dlc *dlc, int err); static void rfcomm_dev_state_change(struct rfcomm_dlc *dlc, int err);
static void rfcomm_dev_modem_status(struct rfcomm_dlc *dlc, u8 v24_sig); static void rfcomm_dev_modem_status(struct rfcomm_dlc *dlc, u8 v24_sig);
static void rfcomm_tty_wakeup(struct work_struct *work);
/* ---- Device functions ---- */ /* ---- Device functions ---- */
/* /*
@ -248,7 +245,6 @@ static int rfcomm_dev_add(struct rfcomm_dev_req *req, struct rfcomm_dlc *dlc)
tty_port_init(&dev->port); tty_port_init(&dev->port);
dev->port.ops = &rfcomm_port_ops; dev->port.ops = &rfcomm_port_ops;
init_waitqueue_head(&dev->wait); init_waitqueue_head(&dev->wait);
INIT_WORK(&dev->wakeup_task, rfcomm_tty_wakeup);
skb_queue_head_init(&dev->pending); skb_queue_head_init(&dev->pending);
@ -340,9 +336,10 @@ static inline unsigned int rfcomm_room(struct rfcomm_dlc *dlc)
static void rfcomm_wfree(struct sk_buff *skb) static void rfcomm_wfree(struct sk_buff *skb)
{ {
struct rfcomm_dev *dev = (void *) skb->sk; struct rfcomm_dev *dev = (void *) skb->sk;
struct tty_struct *tty = dev->port.tty;
atomic_sub(skb->truesize, &dev->wmem_alloc); atomic_sub(skb->truesize, &dev->wmem_alloc);
if (test_bit(RFCOMM_TTY_ATTACHED, &dev->flags)) if (test_bit(RFCOMM_TTY_ATTACHED, &dev->flags) && tty)
queue_work(system_nrt_wq, &dev->wakeup_task); tty_wakeup(tty);
tty_port_put(&dev->port); tty_port_put(&dev->port);
} }
@ -625,18 +622,6 @@ static void rfcomm_dev_modem_status(struct rfcomm_dlc *dlc, u8 v24_sig)
} }
/* ---- TTY functions ---- */ /* ---- TTY functions ---- */
static void rfcomm_tty_wakeup(struct work_struct *work)
{
struct rfcomm_dev *dev = container_of(work, struct rfcomm_dev,
wakeup_task);
struct tty_struct *tty = dev->port.tty;
if (!tty)
return;
BT_DBG("dev %p tty %p", dev, tty);
tty_wakeup(tty);
}
static void rfcomm_tty_copy_pending(struct rfcomm_dev *dev) static void rfcomm_tty_copy_pending(struct rfcomm_dev *dev)
{ {
struct tty_struct *tty = dev->port.tty; struct tty_struct *tty = dev->port.tty;
@ -753,7 +738,6 @@ static void rfcomm_tty_close(struct tty_struct *tty, struct file *filp)
rfcomm_dlc_close(dev->dlc, 0); rfcomm_dlc_close(dev->dlc, 0);
clear_bit(RFCOMM_TTY_ATTACHED, &dev->flags); clear_bit(RFCOMM_TTY_ATTACHED, &dev->flags);
cancel_work_sync(&dev->wakeup_task);
rfcomm_dlc_lock(dev->dlc); rfcomm_dlc_lock(dev->dlc);
tty->driver_data = NULL; tty->driver_data = NULL;