Commit 1b3ce51d authored by Tetsuo Handa's avatar Tetsuo Handa Committed by Dmitry Torokhov

Input: psmouse-smbus - avoid flush_scheduled_work() usage

Flushing system-wide workqueues is dangerous and will be forbidden.
Replace system_wq with local psmouse_wq.
Signed-off-by: default avatarTetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Link: https://lore.kernel.org/r/25e2b787-cb2c-fb0d-d62c-6577ad1cd9df@I-love.SAKURA.ne.jpSigned-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent 1922cc9c
...@@ -26,6 +26,8 @@ struct psmouse_smbus_dev { ...@@ -26,6 +26,8 @@ struct psmouse_smbus_dev {
static LIST_HEAD(psmouse_smbus_list); static LIST_HEAD(psmouse_smbus_list);
static DEFINE_MUTEX(psmouse_smbus_mutex); static DEFINE_MUTEX(psmouse_smbus_mutex);
static struct workqueue_struct *psmouse_smbus_wq;
static void psmouse_smbus_check_adapter(struct i2c_adapter *adapter) static void psmouse_smbus_check_adapter(struct i2c_adapter *adapter)
{ {
struct psmouse_smbus_dev *smbdev; struct psmouse_smbus_dev *smbdev;
...@@ -161,7 +163,7 @@ static void psmouse_smbus_schedule_remove(struct i2c_client *client) ...@@ -161,7 +163,7 @@ static void psmouse_smbus_schedule_remove(struct i2c_client *client)
INIT_WORK(&rwork->work, psmouse_smbus_remove_i2c_device); INIT_WORK(&rwork->work, psmouse_smbus_remove_i2c_device);
rwork->client = client; rwork->client = client;
schedule_work(&rwork->work); queue_work(psmouse_smbus_wq, &rwork->work);
} }
} }
...@@ -305,9 +307,14 @@ int __init psmouse_smbus_module_init(void) ...@@ -305,9 +307,14 @@ int __init psmouse_smbus_module_init(void)
{ {
int error; int error;
psmouse_smbus_wq = alloc_workqueue("psmouse-smbus", 0, 0);
if (!psmouse_smbus_wq)
return -ENOMEM;
error = bus_register_notifier(&i2c_bus_type, &psmouse_smbus_notifier); error = bus_register_notifier(&i2c_bus_type, &psmouse_smbus_notifier);
if (error) { if (error) {
pr_err("failed to register i2c bus notifier: %d\n", error); pr_err("failed to register i2c bus notifier: %d\n", error);
destroy_workqueue(psmouse_smbus_wq);
return error; return error;
} }
...@@ -317,5 +324,5 @@ int __init psmouse_smbus_module_init(void) ...@@ -317,5 +324,5 @@ int __init psmouse_smbus_module_init(void)
void psmouse_smbus_module_exit(void) void psmouse_smbus_module_exit(void)
{ {
bus_unregister_notifier(&i2c_bus_type, &psmouse_smbus_notifier); bus_unregister_notifier(&i2c_bus_type, &psmouse_smbus_notifier);
flush_scheduled_work(); destroy_workqueue(psmouse_smbus_wq);
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment