Skip to content

Commit dccfaf6

Browse files
author
Kirt Hsieh
committed
Revert "hci ldisc: Add single thread workqueue instead of system_wq"
This reverts commit 6137b92. Change-Id: I9c8b52d71a857b2753042c39535a56522c1ff0d3
1 parent 47a0131 commit dccfaf6

2 files changed

Lines changed: 1 addition & 15 deletions

File tree

drivers/bluetooth/hci_ldisc.c

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ int hci_uart_tx_wakeup(struct hci_uart *hu)
134134

135135
BT_DBG("");
136136

137-
queue_work(hu->hci_uart_wq, &hu->write_work);
137+
schedule_work(&hu->write_work);
138138

139139
return 0;
140140
}
@@ -474,15 +474,6 @@ static int hci_uart_tty_open(struct tty_struct *tty)
474474
return -ENFILE;
475475
}
476476

477-
BT_INFO("Create singlethread HCI UART tx wq");
478-
hu->hci_uart_wq = create_singlethread_workqueue("hci_uart_tx_wq");
479-
if (!hu->hci_uart_wq) {
480-
BT_ERR("Can't create single wq for hci uart tx");
481-
kfree(hu);
482-
hu = NULL;
483-
return -EINVAL;
484-
}
485-
486477
tty->disc_data = hu;
487478
hu->tty = tty;
488479
tty->receive_room = 65536;
@@ -536,9 +527,6 @@ static void hci_uart_tty_close(struct tty_struct *tty)
536527
}
537528
clear_bit(HCI_UART_PROTO_SET, &hu->flags);
538529

539-
flush_workqueue(hu->hci_uart_wq);
540-
destroy_workqueue(hu->hci_uart_wq);
541-
542530
kfree(hu);
543531
}
544532

drivers/bluetooth/hci_uart.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,6 @@ struct hci_uart {
9191

9292
unsigned int init_speed;
9393
unsigned int oper_speed;
94-
95-
struct workqueue_struct *hci_uart_wq;
9694
};
9795

9896
/* HCI_UART proto flag bits */

0 commit comments

Comments
 (0)