| Message ID | 20191209162144.14877-1-hslester96@gmail.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 7f8c36fe9be46862c4f3c5302f769378028a34fa |
| Headers | show |
| Series | [v4,resend] crypto: picoxcell: adjust the position of tasklet_init and fix missed tasklet_kill | expand |
On Tue, Dec 10, 2019 at 12:21:44AM +0800, Chuhong Yuan wrote: > Since tasklet is needed to be initialized before registering IRQ > handler, adjust the position of tasklet_init to fix the wrong order. > > Besides, to fix the missed tasklet_kill, this patch adds a helper > function and uses devm_add_action to kill the tasklet automatically. > > Fixes: ce92136843cb ("crypto: picoxcell - add support for the picoxcell crypto engines") > Signed-off-by: Chuhong Yuan <hslester96@gmail.com> > --- > Changes in v4: > - Use devm_add_action instead of devm_add_action_or_reset. > > drivers/crypto/picoxcell_crypto.c | 15 +++++++++++++-- > 1 file changed, 13 insertions(+), 2 deletions(-) Patch applied. Thanks.
diff --git a/drivers/crypto/picoxcell_crypto.c b/drivers/crypto/picoxcell_crypto.c index 29da449b3e9e..d187312b9864 100644 --- a/drivers/crypto/picoxcell_crypto.c +++ b/drivers/crypto/picoxcell_crypto.c @@ -1595,6 +1595,11 @@ static const struct of_device_id spacc_of_id_table[] = { MODULE_DEVICE_TABLE(of, spacc_of_id_table); #endif /* CONFIG_OF */ +static void spacc_tasklet_kill(void *data) +{ + tasklet_kill(data); +} + static int spacc_probe(struct platform_device *pdev) { int i, err, ret; @@ -1637,6 +1642,14 @@ static int spacc_probe(struct platform_device *pdev) return -ENXIO; } + tasklet_init(&engine->complete, spacc_spacc_complete, + (unsigned long)engine); + + ret = devm_add_action(&pdev->dev, spacc_tasklet_kill, + &engine->complete); + if (ret) + return ret; + if (devm_request_irq(&pdev->dev, irq->start, spacc_spacc_irq, 0, engine->name, engine)) { dev_err(engine->dev, "failed to request IRQ\n"); @@ -1694,8 +1707,6 @@ static int spacc_probe(struct platform_device *pdev) INIT_LIST_HEAD(&engine->completed); INIT_LIST_HEAD(&engine->in_progress); engine->in_flight = 0; - tasklet_init(&engine->complete, spacc_spacc_complete, - (unsigned long)engine); platform_set_drvdata(pdev, engine);
Since tasklet is needed to be initialized before registering IRQ handler, adjust the position of tasklet_init to fix the wrong order. Besides, to fix the missed tasklet_kill, this patch adds a helper function and uses devm_add_action to kill the tasklet automatically. Fixes: ce92136843cb ("crypto: picoxcell - add support for the picoxcell crypto engines") Signed-off-by: Chuhong Yuan <hslester96@gmail.com> --- Changes in v4: - Use devm_add_action instead of devm_add_action_or_reset. drivers/crypto/picoxcell_crypto.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-)