summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Ujfalusi <peter.ujfalusi@ti.com>2013-01-25 00:03:54 -0800
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2013-01-25 00:06:53 -0800
commit21fb9f0d5e91152066c9be801b44a7c592fd3fa2 (patch)
treef2503fe4fb3d5aac97a15ee2fe199d0845e6ad8c
parentb2ebcc1be96ee6dd5481697b421447e5a3f61d76 (diff)
Input: twl6040-vibra - use system workqueue
It is time to switch to system wq instead creating a queue for the driver. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
-rw-r--r--drivers/input/misc/twl6040-vibra.c11
1 files changed, 1 insertions, 10 deletions
diff --git a/drivers/input/misc/twl6040-vibra.c b/drivers/input/misc/twl6040-vibra.c
index d1e31b8eb121..0c2dfc8e9691 100644
--- a/drivers/input/misc/twl6040-vibra.c
+++ b/drivers/input/misc/twl6040-vibra.c
@@ -361,19 +361,13 @@ static int twl6040_vibra_probe(struct platform_device *pdev)
}
}
- info->workqueue = alloc_workqueue("twl6040-vibra", 0, 0);
- if (info->workqueue == NULL) {
- dev_err(info->dev, "couldn't create workqueue\n");
- ret = -ENOMEM;
- goto err_regulator;
- }
INIT_WORK(&info->play_work, vibra_play_work);
info->input_dev = input_allocate_device();
if (info->input_dev == NULL) {
dev_err(info->dev, "couldn't allocate input device\n");
ret = -ENOMEM;
- goto err_wq;
+ goto err_regulator;
}
input_set_drvdata(info->input_dev, info);
@@ -404,8 +398,6 @@ err_iff:
input_ff_destroy(info->input_dev);
err_ialloc:
input_free_device(info->input_dev);
-err_wq:
- destroy_workqueue(info->workqueue);
err_regulator:
regulator_bulk_free(ARRAY_SIZE(info->supplies), info->supplies);
return ret;
@@ -417,7 +409,6 @@ static int twl6040_vibra_remove(struct platform_device *pdev)
input_unregister_device(info->input_dev);
regulator_bulk_free(ARRAY_SIZE(info->supplies), info->supplies);
- destroy_workqueue(info->workqueue);
return 0;
}