lkml.org 
[lkml]   [2013]   [Jan]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH v2 4/4] input: twl6040-vibra: Use system workqueue
Date
It is time to switch to system wq instead creating a queue for the driver.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
---
drivers/input/misc/twl6040-vibra.c | 16 +++-------------
1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/drivers/input/misc/twl6040-vibra.c b/drivers/input/misc/twl6040-vibra.c
index f6c0f58..160f0a2 100644
--- a/drivers/input/misc/twl6040-vibra.c
+++ b/drivers/input/misc/twl6040-vibra.c
@@ -45,7 +45,6 @@
struct vibra_info {
struct device *dev;
struct input_dev *input_dev;
- struct workqueue_struct *workqueue;
struct work_struct play_work;
struct mutex mutex;
int irq;
@@ -213,7 +212,7 @@ static int vibra_play(struct input_dev *input, void *data,
info->strong_speed = effect->u.rumble.strong_magnitude;
info->direction = effect->direction < EFFECT_DIR_180_DEG ? 1 : -1;

- ret = queue_work(info->workqueue, &info->play_work);
+ ret = schedule_work(&info->play_work);
if (!ret) {
dev_info(&input->dev, "work is already on queue\n");
return ret;
@@ -361,19 +360,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 = devm_input_allocate_device(&pdev->dev);
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);
@@ -387,7 +380,7 @@ static int twl6040_vibra_probe(struct platform_device *pdev)
ret = input_ff_create_memless(info->input_dev, NULL, vibra_play);
if (ret < 0) {
dev_err(info->dev, "couldn't register vibrator to FF\n");
- goto err_wq;
+ goto err_regulator;
}

ret = input_register_device(info->input_dev);
@@ -402,8 +395,6 @@ static int twl6040_vibra_probe(struct platform_device *pdev)

err_iff:
input_ff_destroy(info->input_dev);
-err_wq:
- destroy_workqueue(info->workqueue);
err_regulator:
regulator_bulk_free(ARRAY_SIZE(info->supplies), info->supplies);
return ret;
@@ -414,7 +405,6 @@ static int twl6040_vibra_remove(struct platform_device *pdev)
struct vibra_info *info = platform_get_drvdata(pdev);

regulator_bulk_free(ARRAY_SIZE(info->supplies), info->supplies);
- destroy_workqueue(info->workqueue);

return 0;
}
--
1.8.1


\
 
 \ /
  Last update: 2013-01-11 11:01    [W:0.067 / U:0.356 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site