diff options
| author | Srinivas Kandagatla <srinivas.kandagatla@linaro.org> | 2016-11-10 13:22:29 +0000 |
|---|---|---|
| committer | Srinivas Kandagatla <srinivas.kandagatla@linaro.org> | 2016-11-16 18:01:22 +0000 |
| commit | 7a3b66775ff6d0bd4c8de46b86533cf1b6f7afff (patch) | |
| tree | 45d7b5fe3e6982fcdd5b27be38e03dab7451a6d5 | |
| parent | b213a759936023aef9d0dca91a253481ef63e832 (diff) | |
glink: update to new kthread api names on 4.9legacy/tracking-qcomlt-glink
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
| -rw-r--r-- | drivers/soc/qcom/glink_smem_native_xprt.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/soc/qcom/glink_smem_native_xprt.c b/drivers/soc/qcom/glink_smem_native_xprt.c index 2796493dfee2..2d854c059c00 100644 --- a/drivers/soc/qcom/glink_smem_native_xprt.c +++ b/drivers/soc/qcom/glink_smem_native_xprt.c @@ -713,7 +713,7 @@ static bool queue_cmd(struct edge_info *einfo, void *cmd, void *data) d_cmd->param2 = _cmd->param2; d_cmd->data = data; list_add_tail(&d_cmd->list_node, &einfo->deferred_cmds); - queue_kthread_work(&einfo->kworker, &einfo->kwork); + kthread_queue_work(&einfo->kworker, &einfo->kwork); return true; } @@ -1093,7 +1093,7 @@ irqreturn_t irq_handler(int irq, void *priv) if (einfo->rx_reset_reg) writel_relaxed(einfo->out_irq_mask, einfo->rx_reset_reg); - queue_kthread_work(&einfo->kworker, &einfo->kwork); + kthread_queue_work(&einfo->kworker, &einfo->kwork); einfo->rx_irq_count++; return IRQ_HANDLED; @@ -2136,8 +2136,8 @@ static int glink_edge_parse(struct device_node *node, const char *edge_name) init_xprt_if(einfo); spin_lock_init(&einfo->write_lock); init_waitqueue_head(&einfo->tx_blocked_queue); - init_kthread_work(&einfo->kwork, rx_worker); - init_kthread_worker(&einfo->kworker); + kthread_init_work(&einfo->kwork, rx_worker); + kthread_init_worker(&einfo->kworker); einfo->intentless = true; einfo->read_from_fifo = memcpy32_fromio; einfo->write_to_fifo = memcpy32_toio; @@ -2290,7 +2290,7 @@ request_irq_fail: glink_core_unregister_transport(&einfo->xprt_if); reg_xprt_fail: toc_init_fail: - flush_kthread_worker(&einfo->kworker); + kthread_flush_worker(&einfo->kworker); kthread_stop(einfo->task); einfo->task = NULL; kthread_fail: @@ -2327,7 +2327,7 @@ static int glink_native_probe(struct platform_device *pdev) return 0; } - + #if defined(CONFIG_DEBUG_FS) /** * debug_edge() - generates formatted text output displaying current edge state |