Skip to content

Commit

Permalink
Input: twl6040-vibra - use system workqueue
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Peter Ujfalusi authored and Dmitry Torokhov committed Jan 25, 2013
1 parent b2ebcc1 commit 21fb9f0
Showing 1 changed file with 1 addition and 10 deletions.
11 changes: 1 addition & 10 deletions drivers/input/misc/twl6040-vibra.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -404,8 +398,6 @@ static int twl6040_vibra_probe(struct platform_device *pdev)
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;
Expand All @@ -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;
}
Expand Down

0 comments on commit 21fb9f0

Please sign in to comment.